diff --git a/include/nuttx/streams.h b/include/nuttx/streams.h
index ee5decc083e..db4f7ba3bb5 100644
--- a/include/nuttx/streams.h
+++ b/include/nuttx/streams.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
+#include <nuttx/compiler.h>
 
 #ifdef CONFIG_LIBC_LZF
 #include <lzf.h>
diff --git a/libs/libc/libc.h b/libs/libc/libc.h
index b531fa87ff7..540c8055951 100644
--- a/libs/libc/libc.h
+++ b/libs/libc/libc.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
 #ifndef __ASSEMBLY__
 #  include <sys/types.h>
 #  include <stdbool.h>
diff --git a/libs/libc/stdio/lib_asprintf.c b/libs/libc/stdio/lib_asprintf.c
index 3a45aea6607..ce062d6fdc6 100644
--- a/libs/libc/stdio/lib_asprintf.c
+++ b/libs/libc/stdio/lib_asprintf.c
@@ -23,9 +23,6 @@
  ****************************************************************************/
 
 #include <stdio.h>
-#include <stdarg.h>
-
-#include "libc.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/lib_dtoa_engine.h b/libs/libc/stdio/lib_dtoa_engine.h
index a60e9398759..d09e1dff1e7 100644
--- a/libs/libc/stdio/lib_dtoa_engine.h
+++ b/libs/libc/stdio/lib_dtoa_engine.h
@@ -40,6 +40,8 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/compiler.h>
+
 #include <stdint.h>
 #include <float.h>
 
diff --git a/libs/libc/stdio/lib_libbsprintf.c b/libs/libc/stdio/lib_libbsprintf.c
index 2acd27e6525..714d561d4d9 100644
--- a/libs/libc/stdio/lib_libbsprintf.c
+++ b/libs/libc/stdio/lib_libbsprintf.c
@@ -22,14 +22,11 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
 #include <nuttx/streams.h>
-#include <nuttx/compiler.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/lib_libsprintf.c b/libs/libc/stdio/lib_libsprintf.c
index 1408d119b66..5b16b48c09b 100644
--- a/libs/libc/stdio/lib_libsprintf.c
+++ b/libs/libc/stdio/lib_libsprintf.c
@@ -22,8 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <stdio.h>
-#include "libc.h"
+#include <nuttx/streams.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/lib_libvsprintf.c b/libs/libc/stdio/lib_libvsprintf.c
index fef65a2535a..34911c09117 100644
--- a/libs/libc/stdio/lib_libvsprintf.c
+++ b/libs/libc/stdio/lib_libvsprintf.c
@@ -40,18 +40,14 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#include <nuttx/compiler.h>
 #include <nuttx/streams.h>
+#ifdef CONFIG_ALLSYMS
 #include <nuttx/allsyms.h>
 #include <nuttx/symtab.h>
+#endif
+
+#include <assert.h>
+#include <string.h>
 
 #include "lib_dtoa_engine.h"
 #include "lib_ultoa_invert.h"
diff --git a/libs/libc/stdio/lib_printf.c b/libs/libc/stdio/lib_printf.c
index fa12bacbc18..2d93482598d 100644
--- a/libs/libc/stdio/lib_printf.c
+++ b/libs/libc/stdio/lib_printf.c
@@ -23,8 +23,6 @@
  ****************************************************************************/
 
 #include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/lib_snprintf.c b/libs/libc/stdio/lib_snprintf.c
index a8152d4ec78..6884f36f73b 100644
--- a/libs/libc/stdio/lib_snprintf.c
+++ b/libs/libc/stdio/lib_snprintf.c
@@ -22,12 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/lib_ultoa_invert.h b/libs/libc/stdio/lib_ultoa_invert.h
index 7f7d3fb86a9..b297a2f9506 100644
--- a/libs/libc/stdio/lib_ultoa_invert.h
+++ b/libs/libc/stdio/lib_ultoa_invert.h
@@ -42,8 +42,6 @@
 
 #include <nuttx/compiler.h>
 
-#include <nuttx/config.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/libs/libc/stdio/lib_vasprintf.c b/libs/libc/stdio/lib_vasprintf.c
index efaed060aac..257640a788c 100644
--- a/libs/libc/stdio/lib_vasprintf.c
+++ b/libs/libc/stdio/lib_vasprintf.c
@@ -22,12 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/stdio/lib_vdprintf.c b/libs/libc/stdio/lib_vdprintf.c
index b04b044e08c..aef59231569 100644
--- a/libs/libc/stdio/lib_vdprintf.c
+++ b/libs/libc/stdio/lib_vdprintf.c
@@ -38,11 +38,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <stdio.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/lib_vfprintf.c b/libs/libc/stdio/lib_vfprintf.c
index 3595f80f81f..511acccc6e9 100644
--- a/libs/libc/stdio/lib_vfprintf.c
+++ b/libs/libc/stdio/lib_vfprintf.c
@@ -22,11 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <stdio.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/lib_vprintf.c b/libs/libc/stdio/lib_vprintf.c
index 1f5c9c43ff2..eeb0e1652e8 100644
--- a/libs/libc/stdio/lib_vprintf.c
+++ b/libs/libc/stdio/lib_vprintf.c
@@ -23,8 +23,6 @@
  ****************************************************************************/
 
 #include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/lib_vsnprintf.c b/libs/libc/stdio/lib_vsnprintf.c
index f7450b3a58f..292056ce76e 100644
--- a/libs/libc/stdio/lib_vsnprintf.c
+++ b/libs/libc/stdio/lib_vsnprintf.c
@@ -22,12 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stream/lib_libnoflush.c b/libs/libc/stream/lib_libnoflush.c
index 6aa9c172a86..61dc0bc0b64 100644
--- a/libs/libc/stream/lib_libnoflush.c
+++ b/libs/libc/stream/lib_libnoflush.c
@@ -22,18 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <nuttx/fs/fs.h>
 #include <nuttx/streams.h>
 
-#include "libc.h"
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/