diff --git a/arch/arm/src/common/arm_exit.c b/arch/arm/src/common/arm_exit.c
index a8689672ea2..70e51692844 100644
--- a/arch/arm/src/common/arm_exit.c
+++ b/arch/arm/src/common/arm_exit.c
@@ -24,8 +24,9 @@
 
 #include <nuttx/config.h>
 
-#include <sched.h>
+#include <assert.h>
 #include <debug.h>
+#include <sched.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
diff --git a/arch/arm64/src/common/arm64_cache.c b/arch/arm64/src/common/arm64_cache.c
index 92a0dca7dc2..ca7569b3db5 100644
--- a/arch/arm64/src/common/arm64_cache.c
+++ b/arch/arm64/src/common/arm64_cache.c
@@ -30,6 +30,7 @@
 #include <arch/irq.h>
 #include <arch/chip/chip.h>
 #include <nuttx/spinlock.h>
+#include <assert.h>
 
 #include "arm64_arch.h"
 #include "arm64_internal.h"
diff --git a/drivers/power/relay/relay.c b/drivers/power/relay/relay.c
index b688e591cc1..dc7786a07cc 100644
--- a/drivers/power/relay/relay.c
+++ b/drivers/power/relay/relay.c
@@ -26,6 +26,7 @@
 
 #include <sys/types.h>
 
+#include <assert.h>
 #include <errno.h>
 
 #include <nuttx/mutex.h>
diff --git a/drivers/power/relay/relay_gpio.c b/drivers/power/relay/relay_gpio.c
index 6cc870099a7..6e468734a92 100644
--- a/drivers/power/relay/relay_gpio.c
+++ b/drivers/power/relay/relay_gpio.c
@@ -24,6 +24,7 @@
 
 #include <nuttx/config.h>
 
+#include <assert.h>
 #include <errno.h>
 
 #include <nuttx/ioexpander/ioexpander.h>
diff --git a/fs/mmap/fs_anonmap.c b/fs/mmap/fs_anonmap.c
index 595fcbf2027..f1dc78f614a 100644
--- a/fs/mmap/fs_anonmap.c
+++ b/fs/mmap/fs_anonmap.c
@@ -24,6 +24,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/kmalloc.h>
+#include <assert.h>
 #include <debug.h>
 
 /****************************************************************************
diff --git a/fs/mmap/fs_rammap.c b/fs/mmap/fs_rammap.c
index f497a0b71ba..31ee8f20cfe 100644
--- a/fs/mmap/fs_rammap.c
+++ b/fs/mmap/fs_rammap.c
@@ -25,10 +25,11 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 
+#include <assert.h>
+#include <debug.h>
+#include <errno.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
-#include <debug.h>
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
diff --git a/fs/partition/fs_partition.c b/fs/partition/fs_partition.c
index cb2a3d44476..3f86a645f6f 100644
--- a/fs/partition/fs_partition.c
+++ b/fs/partition/fs_partition.c
@@ -24,6 +24,8 @@
 
 #include <sys/mount.h>
 
+#include <assert.h>
+
 #include "partition.h"
 
 /****************************************************************************
diff --git a/include/nuttx/timers/oneshot.h b/include/nuttx/timers/oneshot.h
index 0a18aee2879..6c486ca1cf2 100644
--- a/include/nuttx/timers/oneshot.h
+++ b/include/nuttx/timers/oneshot.h
@@ -27,6 +27,7 @@
 
 #include <nuttx/config.h>
 
+#include <assert.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdint.h>
diff --git a/mm/mempool/mempool.c b/mm/mempool/mempool.c
index 3921352914b..22aa61ca276 100644
--- a/mm/mempool/mempool.c
+++ b/mm/mempool/mempool.c
@@ -22,6 +22,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <assert.h>
 #include <execinfo.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/mm/mempool/mempool_multiple.c b/mm/mempool/mempool_multiple.c
index 3af1605b43e..e80cb8c2fb7 100644
--- a/mm/mempool/mempool_multiple.c
+++ b/mm/mempool/mempool_multiple.c
@@ -29,6 +29,8 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/mm/mempool.h>
 
+#include <assert.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/mm/mm_gran/mm_granfree.c b/mm/mm_gran/mm_granfree.c
index 2303d4ecedf..5f2d4b2f4eb 100644
--- a/mm/mm_gran/mm_granfree.c
+++ b/mm/mm_gran/mm_granfree.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
+#include <errno.h>
 
 #include <nuttx/mm/gran.h>
 
diff --git a/mm/mm_gran/mm_graninfo.c b/mm/mm_gran/mm_graninfo.c
index 64bb0f026f6..bf3d0cc3e28 100644
--- a/mm/mm_gran/mm_graninfo.c
+++ b/mm/mm_gran/mm_graninfo.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
+#include <errno.h>
 
 #include <nuttx/mm/gran.h>
 
diff --git a/net/utils/net_snoop.c b/net/utils/net_snoop.c
index 82b84d8c279..f0da6cb368e 100644
--- a/net/utils/net_snoop.c
+++ b/net/utils/net_snoop.c
@@ -22,6 +22,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <assert.h>
 #include <endian.h>
 #include <fcntl.h>
 #include <stdint.h>
diff --git a/sched/group/group_killchildren.c b/sched/group/group_killchildren.c
index fa5a98d65c8..32df7026cc3 100644
--- a/sched/group/group_killchildren.c
+++ b/sched/group/group_killchildren.c
@@ -24,11 +24,12 @@
 
 #include <nuttx/config.h>
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <sched.h>
-#include <pthread.h>
+#include <assert.h>
 #include <debug.h>
+#include <pthread.h>
+#include <sched.h>
+#include <stdint.h>
+#include <sys/types.h>
 
 #include <nuttx/sched.h>
 
diff --git a/sched/mqueue/mq_send.c b/sched/mqueue/mq_send.c
index fca28a581b8..0df8c7b2b8a 100644
--- a/sched/mqueue/mq_send.c
+++ b/sched/mqueue/mq_send.c
@@ -22,18 +22,19 @@
  * Included Files
  ****************************************************************************/
 
-#include  <nuttx/config.h>
+#include <nuttx/config.h>
 
-#include  <sys/types.h>
-#include  <mqueue.h>
-#include  <errno.h>
-#include  <debug.h>
+#include <assert.h>
+#include <debug.h>
+#include <errno.h>
+#include <mqueue.h>
+#include <sys/types.h>
 
-#include  <nuttx/irq.h>
-#include  <nuttx/arch.h>
-#include  <nuttx/cancelpt.h>
+#include <nuttx/arch.h>
+#include <nuttx/cancelpt.h>
+#include <nuttx/irq.h>
 
-#include  "mqueue/mqueue.h"
+#include "mqueue/mqueue.h"
 
 /****************************************************************************
  * Public Functions