diff --git a/examples/foc/foc_fixed16_thr.c b/examples/foc/foc_fixed16_thr.c
index e507b2a15..5735adf29 100644
--- a/examples/foc/foc_fixed16_thr.c
+++ b/examples/foc/foc_fixed16_thr.c
@@ -24,12 +24,12 @@
 
 #include <nuttx/config.h>
 
-#include <stdio.h>
-#include <fcntl.h>
 #include <assert.h>
-#include <unistd.h>
-
 #include <dspb16.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "foc_cfg.h"
 #include "foc_debug.h"
diff --git a/examples/foc/foc_float_thr.c b/examples/foc/foc_float_thr.c
index 7d26687bb..131d3c8e4 100644
--- a/examples/foc/foc_float_thr.c
+++ b/examples/foc/foc_float_thr.c
@@ -24,12 +24,12 @@
 
 #include <nuttx/config.h>
 
-#include <stdio.h>
-#include <fcntl.h>
 #include <assert.h>
-#include <unistd.h>
-
 #include <dsp.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "foc_cfg.h"
 #include "foc_debug.h"
diff --git a/examples/foc/foc_motor_b16.c b/examples/foc/foc_motor_b16.c
index b2a8ef5cf..5c030b48c 100644
--- a/examples/foc/foc_motor_b16.c
+++ b/examples/foc/foc_motor_b16.c
@@ -25,11 +25,11 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-
-#include "foc_motor_b16.h"
+#include <string.h>
 
 #include "foc_cfg.h"
 #include "foc_debug.h"
+#include "foc_motor_b16.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/examples/foc/foc_motor_f32.c b/examples/foc/foc_motor_f32.c
index 37103e0d2..b1ccc6153 100644
--- a/examples/foc/foc_motor_f32.c
+++ b/examples/foc/foc_motor_f32.c
@@ -25,11 +25,11 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-
-#include "foc_motor_f32.h"
+#include <string.h>
 
 #include "foc_cfg.h"
 #include "foc_debug.h"
+#include "foc_motor_f32.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/examples/foc/foc_thr.c b/examples/foc/foc_thr.c
index 11cb71711..debec1529 100644
--- a/examples/foc/foc_thr.c
+++ b/examples/foc/foc_thr.c
@@ -24,9 +24,10 @@
 
 #include <nuttx/config.h>
 
-#include <fcntl.h>
 #include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
 
 #include "foc_mq.h"
 #include "foc_thr.h"
diff --git a/examples/pipe/interlock_test.c b/examples/pipe/interlock_test.c
index cddda2df2..cb00bd268 100644
--- a/examples/pipe/interlock_test.c
+++ b/examples/pipe/interlock_test.c
@@ -23,14 +23,14 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <sys/stat.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "pipe.h"
 
diff --git a/examples/pipe/transfer_test.c b/examples/pipe/transfer_test.c
index 1fe5ec03f..fc379c02b 100644
--- a/examples/pipe/transfer_test.c
+++ b/examples/pipe/transfer_test.c
@@ -24,9 +24,10 @@
 
 #include <nuttx/config.h>
 
+#include <errno.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include "pipe.h"
 
diff --git a/examples/popen/popen_main.c b/examples/popen/popen_main.c
index 1a6f35117..d9ef10c51 100644
--- a/examples/popen/popen_main.c
+++ b/examples/popen/popen_main.c
@@ -24,10 +24,11 @@
 
 #include <nuttx/config.h>
 
+#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <errno.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/examples/watchdog/watchdog_main.c b/examples/watchdog/watchdog_main.c
index 5a8cefcbb..611088702 100644
--- a/examples/watchdog/watchdog_main.c
+++ b/examples/watchdog/watchdog_main.c
@@ -24,15 +24,15 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
+#include <debug.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <debug.h>
 
 #include <nuttx/timers/watchdog.h>
 
diff --git a/industry/foc/fixed16/foc_ang_openloop.c b/industry/foc/fixed16/foc_ang_openloop.c
index d428c84e9..64f8194b8 100644
--- a/industry/foc/fixed16/foc_ang_openloop.c
+++ b/industry/foc/fixed16/foc_ang_openloop.c
@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/fixed16/foc_angle.h"
diff --git a/industry/foc/fixed16/foc_angle.c b/industry/foc/fixed16/foc_angle.c
index ee5ad8e03..d6428acfc 100644
--- a/industry/foc/fixed16/foc_angle.c
+++ b/industry/foc/fixed16/foc_angle.c
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/fixed16/foc_angle.h"
diff --git a/industry/foc/fixed16/foc_handler.c b/industry/foc/fixed16/foc_handler.c
index 536d4e712..976904846 100644
--- a/industry/foc/fixed16/foc_handler.c
+++ b/industry/foc/fixed16/foc_handler.c
@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "industry/foc/foc_log.h"
diff --git a/industry/foc/fixed16/foc_model.c b/industry/foc/fixed16/foc_model.c
index 8540dee6a..2351e0b75 100644
--- a/industry/foc/fixed16/foc_model.c
+++ b/industry/foc/fixed16/foc_model.c
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/foc_common.h"
diff --git a/industry/foc/fixed16/foc_routine.c b/industry/foc/fixed16/foc_routine.c
index bba1e614e..0a41e2760 100644
--- a/industry/foc/fixed16/foc_routine.c
+++ b/industry/foc/fixed16/foc_routine.c
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/fixed16/foc_routine.h"
diff --git a/industry/foc/fixed16/foc_velocity.c b/industry/foc/fixed16/foc_velocity.c
index 59b0679ba..74d34454c 100644
--- a/industry/foc/fixed16/foc_velocity.c
+++ b/industry/foc/fixed16/foc_velocity.c
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/fixed16/foc_velocity.h"
diff --git a/industry/foc/float/foc_ang_openloop.c b/industry/foc/float/foc_ang_openloop.c
index fe75dbf9a..44122025a 100644
--- a/industry/foc/float/foc_ang_openloop.c
+++ b/industry/foc/float/foc_ang_openloop.c
@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/float/foc_angle.h"
diff --git a/industry/foc/float/foc_angle.c b/industry/foc/float/foc_angle.c
index bbc0bd643..05f4db16f 100644
--- a/industry/foc/float/foc_angle.c
+++ b/industry/foc/float/foc_angle.c
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/float/foc_angle.h"
diff --git a/industry/foc/float/foc_handler.c b/industry/foc/float/foc_handler.c
index a446537f9..8d8703ef2 100644
--- a/industry/foc/float/foc_handler.c
+++ b/industry/foc/float/foc_handler.c
@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "industry/foc/foc_log.h"
diff --git a/industry/foc/float/foc_model.c b/industry/foc/float/foc_model.c
index d46e0b474..97e0b2a86 100644
--- a/industry/foc/float/foc_model.c
+++ b/industry/foc/float/foc_model.c
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/foc_common.h"
diff --git a/industry/foc/float/foc_routine.c b/industry/foc/float/foc_routine.c
index 767fb1873..2e6081379 100644
--- a/industry/foc/float/foc_routine.c
+++ b/industry/foc/float/foc_routine.c
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/float/foc_routine.h"
diff --git a/industry/foc/float/foc_velocity.c b/industry/foc/float/foc_velocity.c
index 4a5b7ca86..0ffad5c54 100644
--- a/industry/foc/float/foc_velocity.c
+++ b/industry/foc/float/foc_velocity.c
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "industry/foc/foc_log.h"
 #include "industry/foc/float/foc_velocity.h"
diff --git a/system/nxlooper/nxlooper.c b/system/nxlooper/nxlooper.c
index b663b5e70..452dd6d18 100644
--- a/system/nxlooper/nxlooper.c
+++ b/system/nxlooper/nxlooper.c
@@ -24,21 +24,21 @@
 
 #include <nuttx/config.h>
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <stdint.h>
+#include <assert.h>
+#include <debug.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <errno.h>
-#include <dirent.h>
-#include <debug.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <nuttx/audio/audio.h>
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index 1e3b979c6..57d0ec71f 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -24,9 +24,21 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
+#include <assert.h>
+#include <debug.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 #include <sys/ioctl.h>
-
+#include <sys/types.h>
+#include <unistd.h>
 #ifdef CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT
 #  include <sys/time.h>
 #  include <sys/socket.h>
@@ -34,19 +46,6 @@
 #  include <netdb.h>
 #endif
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <errno.h>
-#include <dirent.h>
-#include <debug.h>
-#include <unistd.h>
-
 #include <netutils/netlib.h>
 #include <nuttx/audio/audio.h>
 
diff --git a/system/nxplayer/nxplayer_mp3.c b/system/nxplayer/nxplayer_mp3.c
index dc7f07809..7f62241a5 100644
--- a/system/nxplayer/nxplayer_mp3.c
+++ b/system/nxplayer/nxplayer_mp3.c
@@ -22,11 +22,13 @@
  * Included Files
  ****************************************************************************/
 
-#include <sys/types.h>
+#include <nuttx/config.h>
 
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <nuttx/audio/audio.h>
diff --git a/system/nxrecorder/nxrecorder.c b/system/nxrecorder/nxrecorder.c
index f85f1b5bb..fc6b21e8b 100644
--- a/system/nxrecorder/nxrecorder.c
+++ b/system/nxrecorder/nxrecorder.c
@@ -24,23 +24,24 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <stdint.h>
+#include <assert.h>
+#include <debug.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <errno.h>
-#include <dirent.h>
-#include <debug.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <nuttx/audio/audio.h>
+
 #include "system/nxrecorder.h"
 
 /****************************************************************************
diff --git a/testing/ostest/suspend.c b/testing/ostest/suspend.c
index 4236250a7..ea640fbb1 100644
--- a/testing/ostest/suspend.c
+++ b/testing/ostest/suspend.c
@@ -22,8 +22,11 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/config.h>
+
 #include <assert.h>
 #include <errno.h>
+#include <pthread.h>
 #include <sched.h>
 #include <semaphore.h>
 #include <signal.h>