diff --git a/components/fs/fatfs/3rdparty/fatfs_drv.h b/components/fs/fatfs/3rdparty/fatfs_drv.h
index b158872e..bb1f4360 100644
--- a/components/fs/fatfs/3rdparty/fatfs_drv.h
+++ b/components/fs/fatfs/3rdparty/fatfs_drv.h
@@ -1,5 +1,5 @@
-#ifndef _TOS_FATFS_DRV_H_
-#define _TOS_FATFS_DRV_H_
+#ifndef _FATFS_DRV_H_
+#define _FATFS_DRV_H_
 
 #include "tos_hal.h"
 
@@ -13,5 +13,4 @@ int MMC_disk_status(hal_sd_state_t *sd_state);
 
 int MMC_disk_ioctl(BYTE cmd, void *buff);
 
-#endif
-
+#endif /*_FATFS_DRV_H_*/
diff --git a/components/fs/fatfs/wrapper/include/tos_ffconf.h b/components/fs/fatfs/wrapper/include/tos_ffconf.h
index 2906aeac..8138a989 100644
--- a/components/fs/fatfs/wrapper/include/tos_ffconf.h
+++ b/components/fs/fatfs/wrapper/include/tos_ffconf.h
@@ -1,7 +1,13 @@
 /*---------------------------------------------------------------------------/
 /  FatFs Functional Configurations
 /---------------------------------------------------------------------------*/
+#ifndef _FFCONF_DEFINED
+#define _FFCONF_DEFINED
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
 #define FFCONF_DEF	86604	/* Revision ID */
 
 /*---------------------------------------------------------------------------/
@@ -284,5 +290,9 @@
 /  included somewhere in the scope of ff.h. */
 
 
+#ifdef __cplusplus
+}
+#endif
 
+#endif/* _FFCONF_DEFINED */
 /*--- End of configuration options ---*/