diff --git a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c
index 31775f453df66..bab862be6bd4e 100644
--- a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c
+++ b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/timers/oneshot.h>
diff --git a/arch/risc-v/src/bl602/bl602_os_hal.c b/arch/risc-v/src/bl602/bl602_os_hal.c
index 3f4f74134b40b..375140f3c8391 100644
--- a/arch/risc-v/src/bl602/bl602_os_hal.c
+++ b/arch/risc-v/src/bl602/bl602_os_hal.c
@@ -48,6 +48,7 @@
 #include <syslog.h>
 
 #include <nuttx/config.h>
+#include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/kthread.h>
 #include <nuttx/mqueue.h>
diff --git a/arch/risc-v/src/common/riscv_mtimer.c b/arch/risc-v/src/common/riscv_mtimer.c
index b611c3dd99914..fd134425c987e 100644
--- a/arch/risc-v/src/common/riscv_mtimer.c
+++ b/arch/risc-v/src/common/riscv_mtimer.c
@@ -22,6 +22,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 
diff --git a/arch/x86_64/src/intel64/intel64_oneshot.h b/arch/x86_64/src/intel64/intel64_oneshot.h
index db4b0859aa418..37072457eaacd 100644
--- a/arch/x86_64/src/intel64/intel64_oneshot.h
+++ b/arch/x86_64/src/intel64/intel64_oneshot.h
@@ -28,6 +28,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/compiler.h>
+#include <nuttx/clock.h>
 
 #include <intel64_hpet.h>
 
diff --git a/binfmt/binfmt_unloadmodule.c b/binfmt/binfmt_unloadmodule.c
index c8e51adb9435e..50eaf4294b1f2 100644
--- a/binfmt/binfmt_unloadmodule.c
+++ b/binfmt/binfmt_unloadmodule.c
@@ -32,6 +32,7 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/addrenv.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/binfmt/binfmt.h>
diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
index 8f89166dd303f..d94e61da8901f 100644
--- a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
index 83407a4053da5..142051853c4d0 100644
--- a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
index 4193f03be0ba3..fb069feeca429 100644
--- a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c
index 137d27c490d23..7a26aad8a5ae7 100644
--- a/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
index ebae176799af5..2a895df2e6119 100644
--- a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
+++ b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
index 32c9a6cb1a579..0214b2b904820 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
index cc7dc0496d259..f8bbf062cf5d2 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
index 5232a63fe5c2a..155659881ce9c 100644
--- a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
index e540c3b5dccb5..0caf83347c41d 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/mps/mps2-an500/kernel/mps_userspace.c b/boards/arm/mps/mps2-an500/kernel/mps_userspace.c
index f4de8d9c1dd50..715c2c06a6ef8 100644
--- a/boards/arm/mps/mps2-an500/kernel/mps_userspace.c
+++ b/boards/arm/mps/mps2-an500/kernel/mps_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c b/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c
index 5979f18a867bb..0d1132010940b 100644
--- a/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c
+++ b/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
index e6176e2b20665..46ae5fa617508 100644
--- a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
+++ b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
index 24e8f62b007e6..d4960e2abe54d 100644
--- a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
+++ b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
index 3d9ec313edd9a..9b8652d55fb0b 100644
--- a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
+++ b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
index 58af2e3c04aba..8d77f415c8aca 100644
--- a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
+++ b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
index 9fa444c201d67..9526679013d94 100644
--- a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
index 95772dfab76d7..b4610bbb35376 100644
--- a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
+++ b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 
diff --git a/crypto/cryptosoft.c b/crypto/cryptosoft.c
index f9aa1e53472bf..61fa4b34aaeb0 100644
--- a/crypto/cryptosoft.c
+++ b/crypto/cryptosoft.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <endian.h>
+#include <strings.h>
 #include <nuttx/kmalloc.h>
 #include <crypto/bn.h>
 #include <crypto/cryptodev.h>
diff --git a/drivers/input/goldfish_events.c b/drivers/input/goldfish_events.c
index f7885a5bf1da0..f52503d5c82be 100644
--- a/drivers/input/goldfish_events.c
+++ b/drivers/input/goldfish_events.c
@@ -24,6 +24,7 @@
 
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/queue.h>
 #include <nuttx/kmalloc.h>
diff --git a/drivers/input/mouse_upper.c b/drivers/input/mouse_upper.c
index 22caee8702b75..dc1b61baef858 100644
--- a/drivers/input/mouse_upper.c
+++ b/drivers/input/mouse_upper.c
@@ -29,6 +29,7 @@
 #include <poll.h>
 
 #include <nuttx/input/mouse.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <nuttx/list.h>
diff --git a/drivers/misc/goldfish_pipe.c b/drivers/misc/goldfish_pipe.c
index 7482b011a131c..5070c4bb388a0 100644
--- a/drivers/misc/goldfish_pipe.c
+++ b/drivers/misc/goldfish_pipe.c
@@ -43,6 +43,7 @@
 #include <fcntl.h>
 #include <poll.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
diff --git a/drivers/misc/mkrd.c b/drivers/misc/mkrd.c
index d80cfd5970723..bf2f69ba30710 100644
--- a/drivers/misc/mkrd.c
+++ b/drivers/misc/mkrd.c
@@ -24,6 +24,7 @@
 
 #include <nuttx/config.h>
 
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
 #include <debug.h>
diff --git a/drivers/misc/optee.c b/drivers/misc/optee.c
index b934a2097d4d9..6eb13d43b51c4 100644
--- a/drivers/misc/optee.c
+++ b/drivers/misc/optee.c
@@ -27,6 +27,8 @@
 #include <fcntl.h>
 #include <netpacket/rpmsg.h>
 #include <nuttx/drivers/optee.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/net/net.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <sys/mman.h>
diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c
index 264b340fc1c77..faae742a2344d 100644
--- a/drivers/mtd/rammtd.c
+++ b/drivers/mtd/rammtd.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index c0b9abaeced72..54da2c6cb0fa5 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -28,6 +28,7 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/addrenv.h>
diff --git a/drivers/net/igc.c b/drivers/net/igc.c
index 86df007952459..1dbaec901ef56 100644
--- a/drivers/net/igc.c
+++ b/drivers/net/igc.c
@@ -28,6 +28,7 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/addrenv.h>
diff --git a/drivers/pci/pci_ivshmem.c b/drivers/pci/pci_ivshmem.c
index e2d04d546eea2..2a0d7eb84e002 100644
--- a/drivers/pci/pci_ivshmem.c
+++ b/drivers/pci/pci_ivshmem.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/list.h>
 #include <nuttx/mutex.h>
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index fd9a085b34775..f84b39711ef4f 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -38,6 +38,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/fs/fs.h>
diff --git a/drivers/power/battery/goldfish_battery.c b/drivers/power/battery/goldfish_battery.c
index fbec7bba24c4f..3b51ad9f7a4bb 100644
--- a/drivers/power/battery/goldfish_battery.c
+++ b/drivers/power/battery/goldfish_battery.c
@@ -25,8 +25,10 @@
 #include <stdint.h>
 #include <errno.h>
 #include <debug.h>
-#include <nuttx/nuttx.h>
+
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/nuttx.h>
 #include <nuttx/power/battery_gauge.h>
 #include <nuttx/power/battery_ioctl.h>
 
diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c
index 1aae588932571..994f65349d297 100644
--- a/drivers/rc/lirc_dev.c
+++ b/drivers/rc/lirc_dev.c
@@ -32,6 +32,7 @@
 #include <poll.h>
 #include <fcntl.h>
 
+#include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <nuttx/circbuf.h>
diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c
index 89d2cfa7763d6..12f13a67406fc 100644
--- a/drivers/serial/uart_16550.c
+++ b/drivers/serial/uart_16550.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/spinlock.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/clk/clk.h>
diff --git a/drivers/serial/uart_bth4.c b/drivers/serial/uart_bth4.c
index 88301a68d8bf0..13df068fc939f 100644
--- a/drivers/serial/uart_bth4.c
+++ b/drivers/serial/uart_bth4.c
@@ -22,6 +22,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/irq.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
diff --git a/drivers/timers/pl031.c b/drivers/timers/pl031.c
index 58c58d8bb5e18..e2414540c5dad 100644
--- a/drivers/timers/pl031.c
+++ b/drivers/timers/pl031.c
@@ -24,9 +24,12 @@
 
 #include <nuttx/config.h>
 
+#include <stdio.h>
+
+#include <nuttx/arch.h>
+#include <nuttx/irq.h>
 #include <nuttx/timers/rtc.h>
 #include <nuttx/timers/pl031.h>
-#include <stdio.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/usbdev/usbdev_fs.c b/drivers/usbdev/usbdev_fs.c
index c6b334213eda0..99646cab598de 100644
--- a/drivers/usbdev/usbdev_fs.c
+++ b/drivers/usbdev/usbdev_fs.c
@@ -29,6 +29,7 @@
 #include <poll.h>
 #include <stdio.h>
 
+#include <nuttx/irq.h>
 #include <nuttx/nuttx.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/queue.h>
diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index d17c36eafefe6..94c63cb17112e 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <poll.h>
 
+#include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
diff --git a/drivers/video/mipidsi/mipi_dsi_host.c b/drivers/video/mipidsi/mipi_dsi_host.c
index 547398852c13f..b443a1560f806 100644
--- a/drivers/video/mipidsi/mipi_dsi_host.c
+++ b/drivers/video/mipidsi/mipi_dsi_host.c
@@ -24,6 +24,8 @@
 
 #include <nuttx/config.h>
 
+#include <assert.h>
+#include <errno.h>
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/drivers/video/v4l2_m2m.c b/drivers/video/v4l2_m2m.c
index f08f61cadf8c1..951cc4ca4e7e1 100644
--- a/drivers/video/v4l2_m2m.c
+++ b/drivers/video/v4l2_m2m.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <poll.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/video/v4l2_m2m.h>
 #include <nuttx/video/video.h>
 
diff --git a/drivers/virtio/virtio-mmio.c b/drivers/virtio/virtio-mmio.c
index c5fb423f2808e..efa62e13fdb04 100644
--- a/drivers/virtio/virtio-mmio.c
+++ b/drivers/virtio/virtio-mmio.c
@@ -29,6 +29,7 @@
 #include <stdint.h>
 #include <sys/param.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/virtio/virtio.h>
 #include <nuttx/virtio/virtio-mmio.h>
 
diff --git a/drivers/virtio/virtio-pci.h b/drivers/virtio/virtio-pci.h
index 67334f7b5e9a3..70d3c544e25f1 100644
--- a/drivers/virtio/virtio-pci.h
+++ b/drivers/virtio/virtio-pci.h
@@ -29,6 +29,7 @@
 
 #ifdef CONFIG_DRIVERS_VIRTIO_PCI
 
+#include <nuttx/arch.h>
 #include <nuttx/pci/pci.h>
 #include <nuttx/virtio/virtio.h>
 #include <nuttx/wdog.h>
diff --git a/drivers/wireless/bluetooth/bt_bridge.c b/drivers/wireless/bluetooth/bt_bridge.c
index b82764c56270b..a0733201d2ac4 100644
--- a/drivers/wireless/bluetooth/bt_bridge.c
+++ b/drivers/wireless/bluetooth/bt_bridge.c
@@ -25,6 +25,7 @@
 #include <debug.h>
 #include <string.h>
 
+#include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/atomic.h>
 #include <nuttx/net/snoop.h>
diff --git a/fs/fs_heap.c b/fs/fs_heap.c
index 78b0bcece02a2..5e4903bc2284f 100644
--- a/fs/fs_heap.c
+++ b/fs/fs_heap.c
@@ -22,6 +22,8 @@
  * Included Files
  ****************************************************************************/
 
+#include <assert.h>
+
 #include "fs_heap.h"
 
 #if defined(CONFIG_FS_HEAPSIZE) && CONFIG_FS_HEAPSIZE > 0
diff --git a/fs/mmap/fs_munmap.c b/fs/mmap/fs_munmap.c
index 4d8b68bcd3de8..e07fdf4469c69 100644
--- a/fs/mmap/fs_munmap.c
+++ b/fs/mmap/fs_munmap.c
@@ -33,6 +33,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/kmalloc.h>
 
 #include "inode/inode.h"
diff --git a/fs/procfs/fs_procfscritmon.c b/fs/procfs/fs_procfscritmon.c
index 089738f5eae9e..741706797dd4a 100644
--- a/fs/procfs/fs_procfscritmon.c
+++ b/fs/procfs/fs_procfscritmon.c
@@ -42,6 +42,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/procfs.h>
+#include <nuttx/sched.h>
 
 #include "fs_heap.h"
 
diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c
index d1e2fd05285d1..f5dcabdc1151e 100644
--- a/fs/procfs/fs_procfsproc.c
+++ b/fs/procfs/fs_procfsproc.c
@@ -44,6 +44,7 @@
 #  include <time.h>
 #endif
 
+#include <nuttx/arch.h>
 #include <nuttx/nuttx.h>
 #include <nuttx/irq.h>
 #include <nuttx/tls.h>
diff --git a/fs/procfs/fs_procfstcbinfo.c b/fs/procfs/fs_procfstcbinfo.c
index 23cc918a3d7ff..e3253582733c6 100644
--- a/fs/procfs/fs_procfstcbinfo.c
+++ b/fs/procfs/fs_procfstcbinfo.c
@@ -36,6 +36,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/procfs.h>
diff --git a/fs/shm/shmfs.c b/fs/shm/shmfs.c
index f73dc35969837..18ce172359b3a 100644
--- a/fs/shm/shmfs.c
+++ b/fs/shm/shmfs.c
@@ -26,12 +26,9 @@
 
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mm/map.h>
-
-#if defined (CONFIG_BUILD_KERNEL)
 #include <nuttx/arch.h>
 #include <nuttx/pgalloc.h>
 #include <nuttx/sched.h>
-#endif
 
 #include "shm/shmfs.h"
 #include "inode/inode.h"
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index 286bd2137241b..f08dea1c6cb6c 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -33,6 +33,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
diff --git a/fs/vfs/fs_fstat.c b/fs/vfs/fs_fstat.c
index a3cb38df7b96d..09d8ed425d78b 100644
--- a/fs/vfs/fs_fstat.c
+++ b/fs/vfs/fs_fstat.c
@@ -32,6 +32,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/mtd/mtd.h>
+#include <nuttx/net/net.h>
 #include "inode/inode.h"
 
 /****************************************************************************
diff --git a/fs/vfs/fs_open.c b/fs/vfs/fs_open.c
index a8f1f4691048b..c76d3f4c99f4e 100644
--- a/fs/vfs/fs_open.c
+++ b/fs/vfs/fs_open.c
@@ -33,6 +33,7 @@
 #include <assert.h>
 #include <stdarg.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/cancelpt.h>
 #include <nuttx/fs/fs.h>
 
diff --git a/fs/vfs/fs_pseudofile.c b/fs/vfs/fs_pseudofile.c
index a430b6dd2580f..1cfe0a9cf4705 100644
--- a/fs/vfs/fs_pseudofile.c
+++ b/fs/vfs/fs_pseudofile.c
@@ -31,6 +31,7 @@
 #include <fcntl.h>
 #include <sys/param.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
diff --git a/fs/vfs/fs_sendfile.c b/fs/vfs/fs_sendfile.c
index ed283a7416a17..75eb1fe666671 100644
--- a/fs/vfs/fs_sendfile.c
+++ b/fs/vfs/fs_sendfile.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/net.h>
 #include "fs_heap.h"
diff --git a/fs/vfs/fs_timerfd.c b/fs/vfs/fs_timerfd.c
index 42a5786208a91..f5252caf19a6e 100644
--- a/fs/vfs/fs_timerfd.c
+++ b/fs/vfs/fs_timerfd.c
@@ -31,6 +31,7 @@
 
 #include <debug.h>
 
+#include <nuttx/irq.h>
 #include <nuttx/wdog.h>
 #include <nuttx/mutex.h>
 
diff --git a/include/nuttx/kmalloc.h b/include/nuttx/kmalloc.h
index 2eefa61c79184..0aca383d4ed61 100644
--- a/include/nuttx/kmalloc.h
+++ b/include/nuttx/kmalloc.h
@@ -34,7 +34,10 @@
 #include <stdlib.h>
 
 #include <nuttx/mm/mm.h>
-#include <nuttx/userspace.h>
+
+#ifdef CONFIG_MM_KERNEL_HEAP
+#include <nuttx/sched.h>
+#endif
 
 /****************************************************************************
  * Public Types
diff --git a/include/nuttx/net/snoop.h b/include/nuttx/net/snoop.h
index d579c126856b1..69d0025ff5fc8 100644
--- a/include/nuttx/net/snoop.h
+++ b/include/nuttx/net/snoop.h
@@ -29,6 +29,7 @@
 
 #include <stdint.h>
 
+#include <nuttx/fs/fs.h>
 #include <nuttx/mutex.h>
 #include <nuttx/wqueue.h>
 
diff --git a/include/nuttx/notifier.h b/include/nuttx/notifier.h
index eb67b37809056..87ebdb78abc5e 100644
--- a/include/nuttx/notifier.h
+++ b/include/nuttx/notifier.h
@@ -30,6 +30,7 @@
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 #include <nuttx/mutex.h>
+#include <nuttx/spinlock.h>
 
 #include <debug.h>
 #include <errno.h>
diff --git a/include/nuttx/pci/pci_ivshmem.h b/include/nuttx/pci/pci_ivshmem.h
index 07251a4c455f3..fad7a54a16abe 100644
--- a/include/nuttx/pci/pci_ivshmem.h
+++ b/include/nuttx/pci/pci_ivshmem.h
@@ -31,6 +31,7 @@
 
 #ifdef CONFIG_PCI_IVSHMEM
 
+#include <nuttx/irq.h>
 #include <nuttx/list.h>
 
 /****************************************************************************
diff --git a/include/nuttx/userspace.h b/include/nuttx/userspace.h
index 59285ac9605dc..2166c89e680e8 100644
--- a/include/nuttx/userspace.h
+++ b/include/nuttx/userspace.h
@@ -34,8 +34,6 @@
 #include <signal.h>
 #include <pthread.h>
 
-#include <nuttx/arch.h>
-
 #ifdef CONFIG_BUILD_PROTECTED
 
 /****************************************************************************
diff --git a/include/syslog.h b/include/syslog.h
index 37e4487c2fb5b..66936e034d7cb 100644
--- a/include/syslog.h
+++ b/include/syslog.h
@@ -29,6 +29,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
+
 #ifdef CONFIG_SYSLOG_TO_SCHED_NOTE
 #include <nuttx/sched_note.h>
 #endif
diff --git a/libs/libc/misc/lib_cxx_initialize.c b/libs/libc/misc/lib_cxx_initialize.c
index 0d7aaaaa080ba..4db113fcd10fd 100644
--- a/libs/libc/misc/lib_cxx_initialize.c
+++ b/libs/libc/misc/lib_cxx_initialize.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/arch.h>
 
 #include <assert.h>
 #include <debug.h>
diff --git a/libs/libc/modlib/modlib_bind.c b/libs/libc/modlib/modlib_bind.c
index c136ea3f53a32..eca81ee74531d 100644
--- a/libs/libc/modlib/modlib_bind.c
+++ b/libs/libc/modlib/modlib_bind.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/cache.h>
 #include <nuttx/elf.h>
 #include <nuttx/lib/modlib.h>
 
diff --git a/libs/libc/modlib/modlib_load.c b/libs/libc/modlib/modlib_load.c
index 63e12ab382a76..889c0c98b2c38 100644
--- a/libs/libc/modlib/modlib_load.c
+++ b/libs/libc/modlib/modlib_load.c
@@ -37,6 +37,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/lib/modlib.h>
 
 #include "libc.h"
diff --git a/libs/libc/modlib/modlib_unload.c b/libs/libc/modlib/modlib_unload.c
index 5fde605d2b0a8..b5ac20ecae207 100644
--- a/libs/libc/modlib/modlib_unload.c
+++ b/libs/libc/modlib/modlib_unload.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/lib/modlib.h>
 
 #include "libc.h"
diff --git a/libs/libc/stdio/lib_freopen.c b/libs/libc/stdio/lib_freopen.c
index cefb5660e20be..2297bfbdc06fd 100644
--- a/libs/libc/stdio/lib_freopen.c
+++ b/libs/libc/stdio/lib_freopen.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include "libc.h"
 
diff --git a/libs/libc/time/lib_localtime.c b/libs/libc/time/lib_localtime.c
index 8be9d17258be4..8dd6f5f3d277e 100644
--- a/libs/libc/time/lib_localtime.c
+++ b/libs/libc/time/lib_localtime.c
@@ -53,7 +53,7 @@
 
 #include <sys/param.h>
 
-#include <nuttx/arch.h>
+#include <nuttx/irq.h>
 #include <nuttx/clock.h>
 #include <nuttx/init.h>
 #include <nuttx/fs/fs.h>
diff --git a/mm/umm_heap/umm_calloc.c b/mm/umm_heap/umm_calloc.c
index 3c16fa56dbd72..7c782c979090d 100644
--- a/mm/umm_heap/umm_calloc.c
+++ b/mm/umm_heap/umm_calloc.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 
+#include <errno.h>
 #include <stdlib.h>
 
 #include <nuttx/mm/mm.h>
diff --git a/mm/umm_heap/umm_heap.h b/mm/umm_heap/umm_heap.h
index 2e23941e8de9b..c2b5de12c18d6 100644
--- a/mm/umm_heap/umm_heap.h
+++ b/mm/umm_heap/umm_heap.h
@@ -29,6 +29,7 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/addrenv.h>
 #include <nuttx/mm/mm.h>
 
 /****************************************************************************
diff --git a/mm/umm_heap/umm_initialize.c b/mm/umm_heap/umm_initialize.c
index 9ddd8f8933930..f38db4a852c20 100644
--- a/mm/umm_heap/umm_initialize.c
+++ b/mm/umm_heap/umm_initialize.c
@@ -28,6 +28,7 @@
 
 #include <assert.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/mm/mm.h>
 
 #include "umm_heap/umm_heap.h"
diff --git a/mm/umm_heap/umm_sbrk.c b/mm/umm_heap/umm_sbrk.c
index 351e0e7761326..5d338b5f43177 100644
--- a/mm/umm_heap/umm_sbrk.c
+++ b/mm/umm_heap/umm_sbrk.c
@@ -32,6 +32,7 @@
 
 #include <nuttx/mm/mm.h>
 #include <nuttx/addrenv.h>
+#include <nuttx/arch.h>
 #include <nuttx/pgalloc.h>
 
 #include "umm_heap/umm_heap.h"
diff --git a/net/local/local_conn.c b/net/local/local_conn.c
index f6fcd8294dbe0..720d09083d6ae 100644
--- a/net/local/local_conn.c
+++ b/net/local/local_conn.c
@@ -32,6 +32,7 @@
 #include <debug.h>
 #include <unistd.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/queue.h>
 
diff --git a/net/netlink/netlink_sockif.c b/net/netlink/netlink_sockif.c
index f5d6b112dd659..5ce00c7586174 100644
--- a/net/netlink/netlink_sockif.c
+++ b/net/netlink/netlink_sockif.c
@@ -36,6 +36,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/wqueue.h>
diff --git a/net/socket/socket.h b/net/socket/socket.h
index 89f15284b75f3..d05c66c83bec9 100644
--- a/net/socket/socket.h
+++ b/net/socket/socket.h
@@ -34,6 +34,7 @@
 #include <stdint.h>
 #include <time.h>
 
+#include <nuttx/fs/fs.h>
 #include <nuttx/clock.h>
 #include <nuttx/net/net.h>
 
diff --git a/net/socket/socketpair.c b/net/socket/socketpair.c
index fb06d06daf5da..e167b53eba4f8 100644
--- a/net/socket/socketpair.c
+++ b/net/socket/socketpair.c
@@ -33,6 +33,7 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/net.h>
 
diff --git a/net/utils/net_snoop.c b/net/utils/net_snoop.c
index 38c16c9ff43da..dd234c6a19f14 100644
--- a/net/utils/net_snoop.c
+++ b/net/utils/net_snoop.c
@@ -35,6 +35,7 @@
 #include <sys/param.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/irq.h>
 #include <nuttx/net/snoop.h>
 
 /****************************************************************************
diff --git a/sched/misc/reboot_notifier.c b/sched/misc/reboot_notifier.c
index 9f77a0088d3b4..e1f2cfab46d71 100644
--- a/sched/misc/reboot_notifier.c
+++ b/sched/misc/reboot_notifier.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/arch.h>
+#include <nuttx/spinlock.h>
 #include <nuttx/notifier.h>
 #include <nuttx/reboot_notifier.h>
 
diff --git a/sched/signal/sig_findaction.c b/sched/signal/sig_findaction.c
index 42176fdc65688..f8c4391ed097f 100644
--- a/sched/signal/sig_findaction.c
+++ b/sched/signal/sig_findaction.c
@@ -26,7 +26,9 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/spinlock.h>
+
 #include "signal/signal.h"
 
 /****************************************************************************
diff --git a/sched/signal/signal.h b/sched/signal/signal.h
index 7fef91d116d4c..c43c793c4aa79 100644
--- a/sched/signal/signal.h
+++ b/sched/signal/signal.h
@@ -33,6 +33,7 @@
 #include <stdbool.h>
 #include <sched.h>
 
+#include <nuttx/sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/queue.h>
 
diff --git a/sched/wqueue/kwork_notifier.c b/sched/wqueue/kwork_notifier.c
index 37bb6d16f10c5..f915cfa3e7267 100644
--- a/sched/wqueue/kwork_notifier.c
+++ b/sched/wqueue/kwork_notifier.c
@@ -34,6 +34,7 @@
 #include <sched.h>
 #include <assert.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>