diff --git a/include/wctype.h b/include/wctype.h
index 6336292b88e..20f03cf98e1 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -27,7 +27,6 @@
 
 #include <sys/types.h>
 #include <stddef.h>
-#include <wchar.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/wchar/lib_btowc.c b/libs/libc/wchar/lib_btowc.c
index 30bfab6438f..48ddff6cd6f 100644
--- a/libs/libc/wchar/lib_btowc.c
+++ b/libs/libc/wchar/lib_btowc.c
@@ -33,8 +33,6 @@
  ****************************************************************************/
 
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_mbrlen.c b/libs/libc/wchar/lib_mbrlen.c
index 152ad18e9ad..60b327a33fd 100644
--- a/libs/libc/wchar/lib_mbrlen.c
+++ b/libs/libc/wchar/lib_mbrlen.c
@@ -38,10 +38,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_mbsrtowcs.c b/libs/libc/wchar/lib_mbsrtowcs.c
index 8a4ccc640f4..947477b79a3 100644
--- a/libs/libc/wchar/lib_mbsrtowcs.c
+++ b/libs/libc/wchar/lib_mbsrtowcs.c
@@ -38,12 +38,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
 #include <wchar.h>
-#include <stdint.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/wchar/lib_wcscmp.c b/libs/libc/wchar/lib_wcscmp.c
index e2d36a36b73..a41a051c542 100644
--- a/libs/libc/wchar/lib_wcscmp.c
+++ b/libs/libc/wchar/lib_wcscmp.c
@@ -34,7 +34,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_wcscoll.c b/libs/libc/wchar/lib_wcscoll.c
index d5a434c3196..153f3dabedd 100644
--- a/libs/libc/wchar/lib_wcscoll.c
+++ b/libs/libc/wchar/lib_wcscoll.c
@@ -34,7 +34,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_wcsftime.c b/libs/libc/wchar/lib_wcsftime.c
index 5ee3b5234d7..e156172ddf4 100644
--- a/libs/libc/wchar/lib_wcsftime.c
+++ b/libs/libc/wchar/lib_wcsftime.c
@@ -23,6 +23,7 @@
  ****************************************************************************/
 
 #include <time.h>
+#include <wchar.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/wchar/lib_wcslcpy.c b/libs/libc/wchar/lib_wcslcpy.c
index 2944a66579e..ece59aea213 100644
--- a/libs/libc/wchar/lib_wcslcpy.c
+++ b/libs/libc/wchar/lib_wcslcpy.c
@@ -33,7 +33,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_wcslen.c b/libs/libc/wchar/lib_wcslen.c
index 1811e797431..c510e48f7f0 100644
--- a/libs/libc/wchar/lib_wcslen.c
+++ b/libs/libc/wchar/lib_wcslen.c
@@ -34,7 +34,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_wcsxfrm.c b/libs/libc/wchar/lib_wcsxfrm.c
index 7ca9836a007..9d89be974c9 100644
--- a/libs/libc/wchar/lib_wcsxfrm.c
+++ b/libs/libc/wchar/lib_wcsxfrm.c
@@ -32,8 +32,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <stddef.h>
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_wctob.c b/libs/libc/wchar/lib_wctob.c
index 7a4c16d3cc5..3ceae8f149f 100644
--- a/libs/libc/wchar/lib_wctob.c
+++ b/libs/libc/wchar/lib_wctob.c
@@ -34,9 +34,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <wchar.h>
 #include <limits.h>
 
diff --git a/libs/libc/wchar/lib_wmemchr.c b/libs/libc/wchar/lib_wmemchr.c
index 6ab64e2a231..e2d061413a3 100644
--- a/libs/libc/wchar/lib_wmemchr.c
+++ b/libs/libc/wchar/lib_wmemchr.c
@@ -32,7 +32,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_wmemcmp.c b/libs/libc/wchar/lib_wmemcmp.c
index b086788f9ad..d4e52d453c1 100644
--- a/libs/libc/wchar/lib_wmemcmp.c
+++ b/libs/libc/wchar/lib_wmemcmp.c
@@ -32,7 +32,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wchar/lib_wmemset.c b/libs/libc/wchar/lib_wmemset.c
index bdb4001df62..8871ac9bd82 100644
--- a/libs/libc/wchar/lib_wmemset.c
+++ b/libs/libc/wchar/lib_wmemset.c
@@ -32,7 +32,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
 #include <wchar.h>
 
 /****************************************************************************
diff --git a/libs/libc/wctype/lib_iswctype.c b/libs/libc/wctype/lib_iswctype.c
index 0ea4bbf44bd..235b8e18eca 100644
--- a/libs/libc/wctype/lib_iswctype.c
+++ b/libs/libc/wctype/lib_iswctype.c
@@ -37,12 +37,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <string.h>
 #include <ctype.h>
 #include <wctype.h>
-#include <errno.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/wctype/lib_towlower.c b/libs/libc/wctype/lib_towlower.c
index 93edf1f926c..a73aba896b5 100644
--- a/libs/libc/wctype/lib_towlower.c
+++ b/libs/libc/wctype/lib_towlower.c
@@ -37,10 +37,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <string.h>
-#include <wchar.h>
 #include <ctype.h>
 #include <wctype.h>
 
diff --git a/libs/libc/wctype/lib_towupper.c b/libs/libc/wctype/lib_towupper.c
index f8a94418472..230cbc79bc3 100644
--- a/libs/libc/wctype/lib_towupper.c
+++ b/libs/libc/wctype/lib_towupper.c
@@ -37,10 +37,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <string.h>
-#include <wchar.h>
 #include <ctype.h>
 #include <wctype.h>
 
diff --git a/libs/libc/wctype/lib_wctype.c b/libs/libc/wctype/lib_wctype.c
index c2199e037aa..08338380b2c 100644
--- a/libs/libc/wctype/lib_wctype.c
+++ b/libs/libc/wctype/lib_wctype.c
@@ -37,11 +37,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
 #include <string.h>
 #include <wctype.h>
-#include <errno.h>
 
 /****************************************************************************
  * Public Functions