diff --git a/include/dirent.h b/include/dirent.h
index 1eea999a12..82381189c4 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -93,21 +93,22 @@ typedef void DIR;
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
 
 /* POSIX-like File System Interfaces */
 
-EXTERN int        closedir(FAR DIR *dirp);
-EXTERN FAR DIR   *opendir(FAR const char *path);
-EXTERN FAR struct dirent *readdir(FAR DIR *dirp);
-EXTERN int        readdir_r(FAR DIR *dirp, FAR struct dirent *entry,
-                            FAR struct dirent **result);
-EXTERN void       rewinddir(FAR DIR *dirp);
-EXTERN void       seekdir(FAR DIR *dirp, off_t loc);
-EXTERN off_t      telldir(FAR DIR *dirp);
+int        closedir(FAR DIR *dirp);
+FAR DIR   *opendir(FAR const char *path);
+FAR struct dirent *readdir(FAR DIR *dirp);
+int        readdir_r(FAR DIR *dirp, FAR struct dirent *entry,
+                     FAR struct dirent **result);
+void       rewinddir(FAR DIR *dirp);
+void       seekdir(FAR DIR *dirp, off_t loc);
+off_t      telldir(FAR DIR *dirp);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/include/libgen.h b/include/libgen.h
index 0d42dc7782..295cd9b936 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -50,13 +50,14 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
 
-EXTERN FAR char *basename(FAR char *path);
-EXTERN FAR char *dirname(FAR char *path);
+FAR char *basename(FAR char *path);
+FAR char *dirname(FAR char *path);
 
 #undef EXTERN
 #ifdef __cplusplus