diff --git a/arch/arm/src/armv7-a/arm_cpustart.c b/arch/arm/src/armv7-a/arm_cpustart.c
index 7e86312f98..e1b46c8f18 100644
--- a/arch/arm/src/armv7-a/arm_cpustart.c
+++ b/arch/arm/src/armv7-a/arm_cpustart.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
diff --git a/arch/arm/src/armv7-a/arm_doirq.c b/arch/arm/src/armv7-a/arm_doirq.c
index 6bb476d029..932de45c91 100644
--- a/arch/arm/src/armv7-a/arm_doirq.c
+++ b/arch/arm/src/armv7-a/arm_doirq.c
@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <assert.h>
+#include <debug.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_idle.c b/arch/arm/src/cxd56xx/cxd56_idle.c
index 41f21f7a2a..8ca9b30729 100644
--- a/arch/arm/src/cxd56xx/cxd56_idle.c
+++ b/arch/arm/src/cxd56xx/cxd56_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c
index 7880a5afa3..8fcf5ad518 100644
--- a/arch/arm/src/cxd56xx/cxd56_rtc.c
+++ b/arch/arm/src/cxd56xx/cxd56_rtc.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_sfc.c b/arch/arm/src/cxd56xx/cxd56_sfc.c
index 3f4e7f79d9..2fd185b428 100644
--- a/arch/arm/src/cxd56xx/cxd56_sfc.c
+++ b/arch/arm/src/cxd56xx/cxd56_sfc.c
@@ -30,6 +30,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>
+#include <debug.h>
 #include <errno.h>
 
 /* Prototypes for Remote API */
diff --git a/arch/arm/src/cxd56xx/cxd56_udmac.c b/arch/arm/src/cxd56xx/cxd56_udmac.c
index ac3d3b0970..b6f88e108b 100644
--- a/arch/arm/src/cxd56xx/cxd56_udmac.c
+++ b/arch/arm/src/cxd56xx/cxd56_udmac.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_wdt.c b/arch/arm/src/cxd56xx/cxd56_wdt.c
index 7cf97dd890..a523285cf9 100644
--- a/arch/arm/src/cxd56xx/cxd56_wdt.c
+++ b/arch/arm/src/cxd56xx/cxd56_wdt.c
@@ -23,13 +23,11 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#ifdef CONFIG_DEBUG_FEATURES
-#include <debug.h>
-#endif
 #include <nuttx/arch.h>
 
 #include <inttypes.h>
 #include <stdint.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c
index e2a48fd1e5..c3a8494e1c 100644
--- a/arch/arm/src/efm32/efm32_dma.c
+++ b/arch/arm/src/efm32/efm32_dma.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/imxrt/imxrt_idle.c b/arch/arm/src/imxrt/imxrt_idle.c
index 4eaf00a18d..4e8e5c8725 100644
--- a/arch/arm/src/imxrt/imxrt_idle.c
+++ b/arch/arm/src/imxrt/imxrt_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/kinetis/kinetis_rtc.c b/arch/arm/src/kinetis/kinetis_rtc.c
index bf4666e37c..6883b00497 100644
--- a/arch/arm/src/kinetis/kinetis_rtc.c
+++ b/arch/arm/src/kinetis/kinetis_rtc.c
@@ -32,6 +32,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <debug.h>
 #include <errno.h>
 
 #include "arm_arch.h"
diff --git a/arch/arm/src/kl/kl_idle.c b/arch/arm/src/kl/kl_idle.c
index c82adfe7df..f0d78a6b7c 100644
--- a/arch/arm/src/kl/kl_idle.c
+++ b/arch/arm/src/kl/kl_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_idle.c b/arch/arm/src/lpc43xx/lpc43_idle.c
index f82cc838bf..0c01ef16a9 100644
--- a/arch/arm/src/lpc43xx/lpc43_idle.c
+++ b/arch/arm/src/lpc43xx/lpc43_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/lpc54xx/lpc54_idle.c b/arch/arm/src/lpc54xx/lpc54_idle.c
index 9e061ea79b..9669375633 100644
--- a/arch/arm/src/lpc54xx/lpc54_idle.c
+++ b/arch/arm/src/lpc54xx/lpc54_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/max326xx/common/max326_idle.c b/arch/arm/src/max326xx/common/max326_idle.c
index b4bd1e154a..224d1a104c 100644
--- a/arch/arm/src/max326xx/common/max326_idle.c
+++ b/arch/arm/src/max326xx/common/max326_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/nrf52/nrf52_idle.c b/arch/arm/src/nrf52/nrf52_idle.c
index 28ec6d2d92..3fe3c4456a 100644
--- a/arch/arm/src/nrf52/nrf52_idle.c
+++ b/arch/arm/src/nrf52/nrf52_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/nrf52/nrf52_sdc.c b/arch/arm/src/nrf52/nrf52_sdc.c
index 4ed107f449..c250265423 100644
--- a/arch/arm/src/nrf52/nrf52_sdc.c
+++ b/arch/arm/src/nrf52/nrf52_sdc.c
@@ -23,6 +23,9 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
+#include <debug.h>
+
 #include <nuttx/net/bluetooth.h>
 #include <nuttx/wireless/bluetooth/bt_hci.h>
 #include <nuttx/wireless/bluetooth/bt_driver.h>
diff --git a/arch/arm/src/nuc1xx/nuc_idle.c b/arch/arm/src/nuc1xx/nuc_idle.c
index d5bbf293b0..acbd88dcae 100644
--- a/arch/arm/src/nuc1xx/nuc_idle.c
+++ b/arch/arm/src/nuc1xx/nuc_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/rp2040/rp2040_dmac.c b/arch/arm/src/rp2040/rp2040_dmac.c
index b50423fb26..d68ae2e453 100644
--- a/arch/arm/src/rp2040/rp2040_dmac.c
+++ b/arch/arm/src/rp2040/rp2040_dmac.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/samd2l2/sam_idle.c b/arch/arm/src/samd2l2/sam_idle.c
index a89cd819c6..7bb728db1f 100644
--- a/arch/arm/src/samd2l2/sam_idle.c
+++ b/arch/arm/src/samd2l2/sam_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/samd5e5/sam_idle.c b/arch/arm/src/samd5e5/sam_idle.c
index 3bed171f58..03af3e34bd 100644
--- a/arch/arm/src/samd5e5/sam_idle.c
+++ b/arch/arm/src/samd5e5/sam_idle.c
@@ -25,6 +25,8 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
diff --git a/arch/arm/src/stm32/stm32l15xx_flash.c b/arch/arm/src/stm32/stm32l15xx_flash.c
index 7dce1ff32f..ec0fb3edcb 100644
--- a/arch/arm/src/stm32/stm32l15xx_flash.c
+++ b/arch/arm/src/stm32/stm32l15xx_flash.c
@@ -38,6 +38,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include "stm32_flash.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_flash.c b/arch/arm/src/stm32l4/stm32l4_flash.c
index 6445b7d924..041ad5f5c2 100644
--- a/arch/arm/src/stm32l4/stm32l4_flash.c
+++ b/arch/arm/src/stm32l4/stm32l4_flash.c
@@ -54,6 +54,7 @@
 #include <nuttx/semaphore.h>
 
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <string.h>
diff --git a/arch/arm/src/stm32l5/stm32l5_flash.c b/arch/arm/src/stm32l5/stm32l5_flash.c
index e0b76f02c6..91aa0df3e8 100644
--- a/arch/arm/src/stm32l5/stm32l5_flash.c
+++ b/arch/arm/src/stm32l5/stm32l5_flash.c
@@ -37,6 +37,7 @@
 
 #include <semaphore.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/arch/risc-v/src/bl602/bl602_i2c.c b/arch/risc-v/src/bl602/bl602_i2c.c
index efc817e467..2b61511f6d 100644
--- a/arch/risc-v/src/bl602/bl602_i2c.c
+++ b/arch/risc-v/src/bl602/bl602_i2c.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/arch.h>
diff --git a/arch/risc-v/src/bl602/bl602_spi.c b/arch/risc-v/src/bl602/bl602_spi.c
index e05c294501..49adb3f57f 100644
--- a/arch/risc-v/src/bl602/bl602_spi.c
+++ b/arch/risc-v/src/bl602/bl602_spi.c
@@ -24,6 +24,7 @@
 
 #include <nuttx/config.h>
 
+#include <debug.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/arch/risc-v/src/esp32c3/esp32c3_idle.c b/arch/risc-v/src/esp32c3/esp32c3_idle.c
index 057aa2fa6c..cc5f6b9b4e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_idle.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_idle.c
@@ -23,6 +23,7 @@
  ****************************************************************************/
 
 #include <stdint.h>
+#include <debug.h>
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 #include <nuttx/spinlock.h>
diff --git a/arch/risc-v/src/esp32c3/esp32c3_pm.c b/arch/risc-v/src/esp32c3/esp32c3_pm.c
index bc8377849b..3ea3f637b8 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_pm.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_pm.c
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <debug.h>
 #include <errno.h>
 #include <sys/types.h>
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_spi.c b/arch/risc-v/src/esp32c3/esp32c3_spi.c
index 6010d25a0a..ab5f54cc69 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spi.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_spi.c
@@ -27,6 +27,7 @@
 #ifdef CONFIG_ESP32C3_SPI
 
 #include <assert.h>
+#include <debug.h>
 #include <sys/types.h>
 #include <inttypes.h>
 #include <stdint.h>
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wdt.c b/arch/risc-v/src/esp32c3/esp32c3_wdt.c
index 319e0f5801..2d22afc191 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wdt.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wdt.c
@@ -26,6 +26,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <stdbool.h>
+#include <debug.h>
 
 #include "riscv_arch.h"
 #include "hardware/esp32c3_rtccntl.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c b/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c
index cdf7db8081..4af766801f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <debug.h>
 #include <pthread.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c b/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c
index d91b9f2595..be45650435 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c
@@ -24,6 +24,8 @@
 
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/wireless/wireless.h>
diff --git a/arch/sim/src/sim/up_alsa.c b/arch/sim/src/sim/up_alsa.c
index 5700d79a88..5f45b346bd 100644
--- a/arch/sim/src/sim/up_alsa.c
+++ b/arch/sim/src/sim/up_alsa.c
@@ -27,6 +27,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/nuttx.h>
 
+#include <debug.h>
 #include <queue.h>
 
 #include <alsa/asoundlib.h>
diff --git a/arch/sim/src/sim/up_assert.c b/arch/sim/src/sim/up_assert.c
index 8f12dbe4c9..1b725ecd32 100644
--- a/arch/sim/src/sim/up_assert.c
+++ b/arch/sim/src/sim/up_assert.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 #include <sched/sched.h>
 #include <stdlib.h>
+#include <syslog.h>
 #include <nuttx/board.h>
 #include "up_internal.h"
 
diff --git a/arch/sim/src/sim/up_hcisocket.c b/arch/sim/src/sim/up_hcisocket.c
index f1eda8e4b2..edeed513e0 100644
--- a/arch/sim/src/sim/up_hcisocket.c
+++ b/arch/sim/src/sim/up_hcisocket.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <debug.h>
 #include <errno.h>
 #include <queue.h>
 
diff --git a/arch/xtensa/src/esp32/esp32_idle.c b/arch/xtensa/src/esp32/esp32_idle.c
index 0dcbc3d06c..2c119462f4 100644
--- a/arch/xtensa/src/esp32/esp32_idle.c
+++ b/arch/xtensa/src/esp32/esp32_idle.c
@@ -23,6 +23,7 @@
  ****************************************************************************/
 
 #include <stdint.h>
+#include <debug.h>
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 #include <nuttx/spinlock.h>
diff --git a/arch/xtensa/src/esp32/esp32_pm.c b/arch/xtensa/src/esp32/esp32_pm.c
index 3c4c5480fd..dfe8e47e35 100644
--- a/arch/xtensa/src/esp32/esp32_pm.c
+++ b/arch/xtensa/src/esp32/esp32_pm.c
@@ -31,6 +31,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <debug.h>
 #include <errno.h>
 #include <sys/time.h>
 #include "hardware/esp32_rtccntl.h"
diff --git a/arch/xtensa/src/esp32/esp32_psram.c b/arch/xtensa/src/esp32/esp32_psram.c
index 9f2e4f6c09..f7e97443f0 100644
--- a/arch/xtensa/src/esp32/esp32_psram.c
+++ b/arch/xtensa/src/esp32/esp32_psram.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <strings.h>
+#include <debug.h>
 #include <nuttx/config.h>
 #include <nuttx/signal.h>
 
diff --git a/arch/xtensa/src/esp32/esp32_spi.c b/arch/xtensa/src/esp32/esp32_spi.c
index 623de9c6c3..1b429b596a 100644
--- a/arch/xtensa/src/esp32/esp32_spi.c
+++ b/arch/xtensa/src/esp32/esp32_spi.c
@@ -26,6 +26,7 @@
 
 #ifdef CONFIG_ESP32_SPI
 
+#include <debug.h>
 #include <sys/types.h>
 #include <inttypes.h>
 #include <stdint.h>
diff --git a/arch/xtensa/src/esp32/esp32_wdt.c b/arch/xtensa/src/esp32/esp32_wdt.c
index 8942cc2867..1fc318d125 100644
--- a/arch/xtensa/src/esp32/esp32_wdt.c
+++ b/arch/xtensa/src/esp32/esp32_wdt.c
@@ -25,6 +25,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <stdbool.h>
+#include <debug.h>
 #include "xtensa.h"
 #include "hardware/esp32_tim.h"
 #include "hardware/esp32_rtccntl.h"
diff --git a/arch/xtensa/src/esp32/esp32_wifi_adapter.c b/arch/xtensa/src/esp32/esp32_wifi_adapter.c
index a562ea8fb3..3e50fc711a 100644
--- a/arch/xtensa/src/esp32/esp32_wifi_adapter.c
+++ b/arch/xtensa/src/esp32/esp32_wifi_adapter.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <debug.h>
 #include <pthread.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/arch/xtensa/src/esp32/esp32_wifi_utils.c b/arch/xtensa/src/esp32/esp32_wifi_utils.c
index 5290cfebc8..342d93e4d4 100644
--- a/arch/xtensa/src/esp32/esp32_wifi_utils.c
+++ b/arch/xtensa/src/esp32/esp32_wifi_utils.c
@@ -24,6 +24,8 @@
 
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/wireless/wireless.h>
diff --git a/binfmt/binfmt_initialize.c b/binfmt/binfmt_initialize.c
index ccdad71449..c660ad121c 100644
--- a/binfmt/binfmt_initialize.c
+++ b/binfmt/binfmt_initialize.c
@@ -29,6 +29,8 @@
 #include <nuttx/binfmt/nxflat.h>
 #include <nuttx/lib/builtin.h>
 
+#include <debug.h>
+
 #include "binfmt.h"
 
 #ifndef CONFIG_BINFMT_DISABLE
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ubxmdm.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ubxmdm.c
index edc2d1cc7e..fb411a1dae 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ubxmdm.c
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ubxmdm.c
@@ -43,6 +43,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <poll.h>
+#include <debug.h>
 #include <errno.h>
 #include <unistd.h>
 
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_composite.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_composite.c
index 17b8e9fb34..04c50cdb58 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_composite.c
+++ b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_composite.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/rp2040/common/src/rp2040_bmp180.c b/boards/arm/rp2040/common/src/rp2040_bmp180.c
index 8e95a53308..59bea0afae 100644
--- a/boards/arm/rp2040/common/src/rp2040_bmp180.c
+++ b/boards/arm/rp2040/common/src/rp2040_bmp180.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdio.h>
+#include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/sensors/bmp180.h>
diff --git a/boards/arm/stm32/common/src/stm32_bmp180.c b/boards/arm/stm32/common/src/stm32_bmp180.c
index 84b625ca58..7725f504b0 100644
--- a/boards/arm/stm32/common/src/stm32_bmp180.c
+++ b/boards/arm/stm32/common/src/stm32_bmp180.c
@@ -27,6 +27,7 @@
 #include <nuttx/sensors/bmp180.h>
 #include <nuttx/i2c/i2c_master.h>
 #include <stdio.h>
+#include <debug.h>
 #include "stm32_i2c.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/common/src/stm32_max6675.c b/boards/arm/stm32/common/src/stm32_max6675.c
index fe3987902a..d290d50859 100644
--- a/boards/arm/stm32/common/src/stm32_max6675.c
+++ b/boards/arm/stm32/common/src/stm32_max6675.c
@@ -27,6 +27,7 @@
 #include <nuttx/sensors/max6675.h>
 #include <nuttx/spi/spi.h>
 #include <stdio.h>
+#include <debug.h>
 #include "stm32_spi.h"
 
 #ifdef CONFIG_SENSORS_MAX6675
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_appinit.c b/boards/arm/stm32/fire-stm32v2/src/stm32_appinit.c
index 12d61b6e79..c1f5f8c7d3 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_appinit.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_appinit.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_appinit.c b/boards/arm/stm32/hymini-stm32v/src/stm32_appinit.c
index 4ddc445277..f8137ccf29 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_appinit.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_appinit.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c
index 95838ac86d..a8e4e18291 100644
--- a/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c
+++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
+#include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/signal.h>
diff --git a/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c
index 37430be327..a46742ade5 100644
--- a/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c
+++ b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
+#include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/signal.h>
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
index 99fe8ee47c..68cf2bc510 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/olimexino-stm32/src/stm32_composite.c b/boards/arm/stm32/olimexino-stm32/src/stm32_composite.c
index fba5b4a93d..e65e07ade1 100644
--- a/boards/arm/stm32/olimexino-stm32/src/stm32_composite.c
+++ b/boards/arm/stm32/olimexino-stm32/src/stm32_composite.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c b/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c
index 3f9d3e7dc2..ac137847f5 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_appinit.c b/boards/arm/stm32/stm3220g-eval/src/stm32_appinit.c
index e00b4b2c5c..77a27737b0 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_appinit.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_appinit.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c b/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c
index aea590f3d1..68a5336027 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c
index cbafe5653b..31d1e1fc38 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c
index 656edba9b0..3c7444e2d0 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
+#include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/signal.h>
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c
index b08cafd001..f76db4d243 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c
@@ -25,7 +25,6 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <syslog.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
index 7824d50045..c8e9ec3e48 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/arch.h>
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c
index 7478af2d80..968fc280d3 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/arch.h>
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c
index 2c1d0c63be..e6b14ba9a1 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c
@@ -26,7 +26,6 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <syslog.h>
 #include <errno.h>
 #include <debug.h>
 #include <string.h>
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c
index 9dcabb6c01..9455a1c230 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c
@@ -26,7 +26,6 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <syslog.h>
 #include <errno.h>
 #include <debug.h>
 #include <string.h>
diff --git a/boards/mips/pic32mx/mirtoo/src/pic32_appinit.c b/boards/mips/pic32mx/mirtoo/src/pic32_appinit.c
index b927fba194..54c7dabca8 100644
--- a/boards/mips/pic32mx/mirtoo/src/pic32_appinit.c
+++ b/boards/mips/pic32mx/mirtoo/src/pic32_appinit.c
@@ -26,8 +26,8 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <debug.h>
 #include <errno.h>
-#include <syslog.h>
 
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
index 2749e2fe87..6eb5fd2efc 100644
--- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
+++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
@@ -27,7 +27,6 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <syslog.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
index b1987e069e..f93d3b8c59 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
@@ -27,7 +27,6 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <syslog.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/boards/risc-v/c906/smartl-c906/src/c906_bringup.c b/boards/risc-v/c906/smartl-c906/src/c906_bringup.c
index 71cf487f71..2231938fb0 100644
--- a/boards/risc-v/c906/smartl-c906/src/c906_bringup.c
+++ b/boards/risc-v/c906/smartl-c906/src/c906_bringup.c
@@ -27,7 +27,7 @@
 #include <sys/mount.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bmp180.c b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bmp180.c
index 5343f91ff5..b8532b96c1 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bmp180.c
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bmp180.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdio.h>
+#include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/sensors/bmp180.h>
diff --git a/boards/risc-v/fe310/hifive1-revb/src/fe310_bringup.c b/boards/risc-v/fe310/hifive1-revb/src/fe310_bringup.c
index 27e3e88b63..02cd3a2699 100644
--- a/boards/risc-v/fe310/hifive1-revb/src/fe310_bringup.c
+++ b/boards/risc-v/fe310/hifive1-revb/src/fe310_bringup.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/risc-v/fe310/hifive1-revb/src/fe310_buttons.c b/boards/risc-v/fe310/hifive1-revb/src/fe310_buttons.c
index 6a0e8c90e9..294d21f8ff 100644
--- a/boards/risc-v/fe310/hifive1-revb/src/fe310_buttons.c
+++ b/boards/risc-v/fe310/hifive1-revb/src/fe310_buttons.c
@@ -28,7 +28,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include "fe310_gpio.h"
diff --git a/boards/risc-v/k210/maix-bit/src/k210_bringup.c b/boards/risc-v/k210/maix-bit/src/k210_bringup.c
index 3145a00e55..2dc3d09c7b 100644
--- a/boards/risc-v/k210/maix-bit/src/k210_bringup.c
+++ b/boards/risc-v/k210/maix-bit/src/k210_bringup.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/risc-v/litex/arty_a7/src/litex_bringup.c b/boards/risc-v/litex/arty_a7/src/litex_bringup.c
index a8abf06c48..a1f8b1ab94 100644
--- a/boards/risc-v/litex/arty_a7/src/litex_bringup.c
+++ b/boards/risc-v/litex/arty_a7/src/litex_bringup.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/risc-v/mpfs/icicle/src/mpfs_bringup.c b/boards/risc-v/mpfs/icicle/src/mpfs_bringup.c
index 559901b61c..3907e10624 100755
--- a/boards/risc-v/mpfs/icicle/src/mpfs_bringup.c
+++ b/boards/risc-v/mpfs/icicle/src/mpfs_bringup.c
@@ -27,7 +27,7 @@
 #include <sys/mount.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/x86/qemu/qemu-i486/src/qemu_appinit.c b/boards/x86/qemu/qemu-i486/src/qemu_appinit.c
index 9990950caa..578e5846c6 100644
--- a/boards/x86/qemu/qemu-i486/src/qemu_appinit.c
+++ b/boards/x86/qemu/qemu-i486/src/qemu_appinit.c
@@ -27,6 +27,7 @@
 #include <nuttx/fs/fs.h>
 
 #include <stdio.h>
+#include <debug.h>
 
 #include "up_internal.h"
 
diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_bringup.c b/boards/x86_64/intel64/qemu-intel64/src/qemu_bringup.c
index 23433e0261..7cd5d55137 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/qemu_bringup.c
+++ b/boards/x86_64/intel64/qemu-intel64/src/qemu_bringup.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/board.h>
diff --git a/boards/xtensa/esp32/common/src/esp32_bmp180.c b/boards/xtensa/esp32/common/src/esp32_bmp180.c
index 37c690798a..6cf195ab83 100644
--- a/boards/xtensa/esp32/common/src/esp32_bmp180.c
+++ b/boards/xtensa/esp32/common/src/esp32_bmp180.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdio.h>
+#include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/sensors/bmp180.h>
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_buttons.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_buttons.c
index fa7b21ed20..a4f27856ff 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_buttons.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_buttons.c
@@ -24,10 +24,10 @@
 
 #include <nuttx/config.h>
 
+#include <debug.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_buttons.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_buttons.c
index 5840c74e1d..2f31dad064 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_buttons.c
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_buttons.c
@@ -24,10 +24,10 @@
 
 #include <nuttx/config.h>
 
+#include <debug.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_buttons.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_buttons.c
index 6b1594f9f9..48812ce02e 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_buttons.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_buttons.c
@@ -24,10 +24,10 @@
 
 #include <nuttx/config.h>
 
+#include <debug.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/crypto/crypto.c b/crypto/crypto.c
index 87da45b700..1b01ab547c 100644
--- a/crypto/crypto.c
+++ b/crypto/crypto.c
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <poll.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/fs/fs.h>
diff --git a/drivers/audio/audio_i2s.c b/drivers/audio/audio_i2s.c
index 1b027a6375..421e73ea88 100644
--- a/drivers/audio/audio_i2s.c
+++ b/drivers/audio/audio_i2s.c
@@ -23,6 +23,9 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
+#include <debug.h>
+
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/i2s.h>
 #include <nuttx/kmalloc.h>
diff --git a/drivers/audio/cxd56.c b/drivers/audio/cxd56.c
index bff508f435..02b32a5943 100644
--- a/drivers/audio/cxd56.c
+++ b/drivers/audio/cxd56.c
@@ -22,6 +22,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <debug.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <math.h>
diff --git a/drivers/contactless/mfrc522.c b/drivers/contactless/mfrc522.c
index 0794fa83d3..78c256510e 100644
--- a/drivers/contactless/mfrc522.c
+++ b/drivers/contactless/mfrc522.c
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
+#include <debug.h>
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/signal.h>
diff --git a/drivers/ioexpander/gpio.c b/drivers/ioexpander/gpio.c
index 2032159622..7889e63761 100644
--- a/drivers/ioexpander/gpio.c
+++ b/drivers/ioexpander/gpio.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <signal.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 #include <unistd.h>
 
diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c
index 2fb3b93ae1..ade21152dd 100644
--- a/drivers/modem/u-blox.c
+++ b/drivers/modem/u-blox.c
@@ -43,6 +43,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <poll.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/fs/fs.h>
diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c
index a7ce5cf91d..afe29d1c8c 100644
--- a/drivers/rc/lirc_dev.c
+++ b/drivers/rc/lirc_dev.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdio.h>
+#include <debug.h>
 #include <errno.h>
 #include <poll.h>
 #include <fcntl.h>
diff --git a/drivers/sensors/fxos8700cq.c b/drivers/sensors/fxos8700cq.c
index 34e2289396..a7b39af89f 100644
--- a/drivers/sensors/fxos8700cq.c
+++ b/drivers/sensors/fxos8700cq.c
@@ -26,6 +26,7 @@
 #include <nuttx/config.h>
 
 #include <stdlib.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/drivers/sensors/wtgahrs2.c b/drivers/sensors/wtgahrs2.c
index 7cad78ceb7..42d28d9961 100644
--- a/drivers/sensors/wtgahrs2.c
+++ b/drivers/sensors/wtgahrs2.c
@@ -34,6 +34,7 @@
 #include <math.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/usbdev/dfu.c b/drivers/usbdev/dfu.c
index e4f96661e4..ca27059b9c 100644
--- a/drivers/usbdev/dfu.c
+++ b/drivers/usbdev/dfu.c
@@ -39,6 +39,7 @@
 #include <nuttx/usb/dfu.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
+#include <debug.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/drivers/usbdev/rndis.c b/drivers/usbdev/rndis.c
index f76b9f8bad..44538313e0 100644
--- a/drivers/usbdev/rndis.c
+++ b/drivers/usbdev/rndis.c
@@ -28,6 +28,7 @@
  ****************************************************************************/
 
 #include <queue.h>
+#include <debug.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <string.h>
diff --git a/drivers/usbmonitor/usbmonitor.c b/drivers/usbmonitor/usbmonitor.c
index fc100211d4..209690892d 100644
--- a/drivers/usbmonitor/usbmonitor.c
+++ b/drivers/usbmonitor/usbmonitor.c
@@ -30,8 +30,8 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <sched.h>
-#include <errno.h>
 #include <debug.h>
+#include <errno.h>
 
 #include <nuttx/signal.h>
 #include <nuttx/kthread.h>
diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index d08a7b40fb..7b08543a50 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -30,6 +30,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/drivers/wireless/ieee802154/xbee/xbee_mac.c b/drivers/wireless/ieee802154/xbee/xbee_mac.c
index 8ec76f52ce..df39e8a8c1 100644
--- a/drivers/wireless/ieee802154/xbee/xbee_mac.c
+++ b/drivers/wireless/ieee802154/xbee/xbee_mac.c
@@ -40,6 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/mm/iob.h>
diff --git a/fs/littlefs/Make.defs b/fs/littlefs/Make.defs
index 7294ba9e04..7d878e2e6e 100644
--- a/fs/littlefs/Make.defs
+++ b/fs/littlefs/Make.defs
@@ -36,6 +36,7 @@ CFLAGS += -DLFS_DEBUG=finfo
 CFLAGS += -DLFS_WARN=fwarn
 CFLAGS += -DLFS_ERROR=ferr
 CFLAGS += -DLFS_ASSERT=DEBUGASSERT
+CFLAGS += -DLFS_CONFIG=../lfs_vfs.h
 
 LITTLEFS_VERSION ?= 2.4.0
 LITTLEFS_TARBALL = v$(LITTLEFS_VERSION).tar.gz
diff --git a/fs/littlefs/lfs_vfs.h b/fs/littlefs/lfs_vfs.h
new file mode 100644
index 0000000000..7b621e6f06
--- /dev/null
+++ b/fs/littlefs/lfs_vfs.h
@@ -0,0 +1,29 @@
+/****************************************************************************
+ * fs/littlefs/lfs_vfs.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#undef LFS_CONFIG
+#undef LFS_UTIL_H
+
+#include <debug.h>
+#include "littlefs/lfs_util.h"
diff --git a/fs/spiffs/src/spiffs_cache.h b/fs/spiffs/src/spiffs_cache.h
index 94ec3201cf..d4fb6f3785 100644
--- a/fs/spiffs/src/spiffs_cache.h
+++ b/fs/spiffs/src/spiffs_cache.h
@@ -32,6 +32,7 @@ extern "C"
 
 #include <nuttx/config.h>
 
+#include <debug.h>
 #include <stdint.h>
 
 /****************************************************************************
diff --git a/fs/vfs/fs_truncate.c b/fs/vfs/fs_truncate.c
index 4968023a92..17b89edab6 100644
--- a/fs/vfs/fs_truncate.c
+++ b/fs/vfs/fs_truncate.c
@@ -28,6 +28,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <assert.h>
+#include <debug.h>
 
 #include <nuttx/fs/fs.h>
 
diff --git a/graphics/nxbe/nxbe_cursor.c b/graphics/nxbe/nxbe_cursor.c
index 34f75b3639..a7f7dafbf7 100644
--- a/graphics/nxbe/nxbe_cursor.c
+++ b/graphics/nxbe/nxbe_cursor.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
+#include <debug.h>
 
 #include <nuttx/kmalloc.h>
 
diff --git a/graphics/nxbe/nxbe_setsize.c b/graphics/nxbe/nxbe_setsize.c
index cd78635fa7..5a53dd93f4 100644
--- a/graphics/nxbe/nxbe_setsize.c
+++ b/graphics/nxbe/nxbe_setsize.c
@@ -25,9 +25,9 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
+#include <debug.h>
 
 #ifdef CONFIG_NX_RAMBACKED
-#  include <debug.h>
 #  include <string.h>
 #ifdef CONFIG_BUILD_KERNEL
 #  include <nuttx/pgalloc.h>
diff --git a/graphics/nxmu/nxmu_openwindow.c b/graphics/nxmu/nxmu_openwindow.c
index 86fd07b79d..08993dd636 100644
--- a/graphics/nxmu/nxmu_openwindow.c
+++ b/graphics/nxmu/nxmu_openwindow.c
@@ -23,6 +23,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <debug.h>
 #include <errno.h>
 
 #ifdef CONFIG_NX_RAMBACKED
diff --git a/include/nuttx/crypto/crypto.h b/include/nuttx/crypto/crypto.h
index ec495720aa..46d798ab8b 100644
--- a/include/nuttx/crypto/crypto.h
+++ b/include/nuttx/crypto/crypto.h
@@ -26,7 +26,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/include/nuttx/mm/shm.h b/include/nuttx/mm/shm.h
index dbeebad3e6..0045b846b3 100644
--- a/include/nuttx/mm/shm.h
+++ b/include/nuttx/mm/shm.h
@@ -27,8 +27,6 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
-
 #include <nuttx/mm/gran.h>
 
 #ifdef CONFIG_MM_SHM
diff --git a/libs/libc/dlfcn/lib_dlclose.c b/libs/libc/dlfcn/lib_dlclose.c
index 414c32b59a..c3c7fff850 100644
--- a/libs/libc/dlfcn/lib_dlclose.c
+++ b/libs/libc/dlfcn/lib_dlclose.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <dlfcn.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/module.h>
diff --git a/libs/libc/dlfcn/lib_dlopen.c b/libs/libc/dlfcn/lib_dlopen.c
index cdeaf296db..ed51ac0418 100644
--- a/libs/libc/dlfcn/lib_dlopen.c
+++ b/libs/libc/dlfcn/lib_dlopen.c
@@ -29,6 +29,7 @@
 #include <libgen.h>
 #include <dlfcn.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/envpath.h>
diff --git a/libs/libc/dlfcn/lib_dlsym.c b/libs/libc/dlfcn/lib_dlsym.c
index cd6a6fedee..a9d71c9fb8 100644
--- a/libs/libc/dlfcn/lib_dlsym.c
+++ b/libs/libc/dlfcn/lib_dlsym.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <dlfcn.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/module.h>
diff --git a/libs/libc/hex2bin/lib_hex2bin.c b/libs/libc/hex2bin/lib_hex2bin.c
index e8ff4d2b60..e3cc3bd921 100644
--- a/libs/libc/hex2bin/lib_hex2bin.c
+++ b/libs/libc/hex2bin/lib_hex2bin.c
@@ -37,6 +37,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdint.h>
+#include <debug.h>
 #include <errno.h>
 #include <hex2bin.h>
 
diff --git a/libs/libc/netdb/lib_gethostbyaddrr.c b/libs/libc/netdb/lib_gethostbyaddrr.c
index fb503712d5..5ae644665d 100644
--- a/libs/libc/netdb/lib_gethostbyaddrr.c
+++ b/libs/libc/netdb/lib_gethostbyaddrr.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <netdb.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/libs/libc/netdb/lib_gethostentbynamer.c b/libs/libc/netdb/lib_gethostentbynamer.c
index ea1dd5f064..5b96c9d681 100644
--- a/libs/libc/netdb/lib_gethostentbynamer.c
+++ b/libs/libc/netdb/lib_gethostentbynamer.c
@@ -32,6 +32,7 @@
 #include <netdb.h>
 #include <errno.h>
 #include <assert.h>
+#include <debug.h>
 
 #include <arpa/inet.h>
 
diff --git a/net/local/local_fifo.c b/net/local/local_fifo.c
index 1dc66a17e5..905461288f 100644
--- a/net/local/local_fifo.c
+++ b/net/local/local_fifo.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+#include <debug.h>
 
 #include "local/local.h"
 
diff --git a/net/rpmsg/rpmsg_sockif.c b/net/rpmsg/rpmsg_sockif.c
index c66ec35336..3356502449 100644
--- a/net/rpmsg/rpmsg_sockif.c
+++ b/net/rpmsg/rpmsg_sockif.c
@@ -27,6 +27,7 @@
 #include <poll.h>
 #include <stdio.h>
 #include <string.h>
+#include <debug.h>
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/mm/circbuf.h>
diff --git a/net/sixlowpan/sixlowpan_reassbuf.c b/net/sixlowpan/sixlowpan_reassbuf.c
index 7ba412fcb4..2eaef67d9d 100644
--- a/net/sixlowpan/sixlowpan_reassbuf.c
+++ b/net/sixlowpan/sixlowpan_reassbuf.c
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/sched/group/group_killchildren.c b/sched/group/group_killchildren.c
index 16a8f26fbd..e06197eac7 100644
--- a/sched/group/group_killchildren.c
+++ b/sched/group/group_killchildren.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <sched.h>
 #include <pthread.h>
+#include <debug.h>
 
 #include <nuttx/sched.h>
 
diff --git a/sched/irq/irq_procfs.c b/sched/irq/irq_procfs.c
index 88b6294eef..edc4b9c1fc 100644
--- a/sched/irq/irq_procfs.c
+++ b/sched/irq/irq_procfs.c
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/sched/module/mod_modhandle.c b/sched/module/mod_modhandle.c
index abcd183884..67426b30fc 100644
--- a/sched/module/mod_modhandle.c
+++ b/sched/module/mod_modhandle.c
@@ -26,6 +26,7 @@
 
 #include <sys/types.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/module.h>
diff --git a/sched/module/mod_rmmod.c b/sched/module/mod_rmmod.c
index 61101f8b5a..6d03ef9897 100644
--- a/sched/module/mod_rmmod.c
+++ b/sched/module/mod_rmmod.c
@@ -26,6 +26,7 @@
 
 #include <sys/types.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/sched/pthread/pthread_mutexconsistent.c b/sched/pthread/pthread_mutexconsistent.c
index 2020cba30a..48fb5f52a0 100644
--- a/sched/pthread/pthread_mutexconsistent.c
+++ b/sched/pthread/pthread_mutexconsistent.c
@@ -27,6 +27,7 @@
 #include <pthread.h>
 #include <sched.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/semaphore.h>
diff --git a/sched/sched/sched_sporadic.c b/sched/sched/sched_sporadic.c
index 0beb70d0be..190412db37 100644
--- a/sched/sched/sched_sporadic.c
+++ b/sched/sched/sched_sporadic.c
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/sched.h>
diff --git a/sched/wqueue/kwork_inherit.c b/sched/wqueue/kwork_inherit.c
index e1d0762c6e..177f193f56 100644
--- a/sched/wqueue/kwork_inherit.c
+++ b/sched/wqueue/kwork_inherit.c
@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <sched.h>
+#include <debug.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/wqueue.h>
diff --git a/video/videomode/edid_parse.c b/video/videomode/edid_parse.c
index 28faefac8e..00f814721b 100644
--- a/video/videomode/edid_parse.c
+++ b/video/videomode/edid_parse.c
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <debug.h>
 #include <errno.h>
 
 #include <nuttx/video/videomode.h>
diff --git a/wireless/bluetooth/bt_smp.c b/wireless/bluetooth/bt_smp.c
index 29a8a07a1f..98f1f35fd2 100644
--- a/wireless/bluetooth/bt_smp.c
+++ b/wireless/bluetooth/bt_smp.c
@@ -47,6 +47,7 @@
 #include <nuttx/config.h>
 
 #include <stddef.h>
+#include <debug.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/wireless/ieee802154/ieee802154_primitive.c b/wireless/ieee802154/ieee802154_primitive.c
index f066414e1a..1ae5a333ec 100644
--- a/wireless/ieee802154/ieee802154_primitive.c
+++ b/wireless/ieee802154/ieee802154_primitive.c
@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <string.h>
+#include <debug.h>
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/wireless/ieee802154/ieee802154_mac.h>
diff --git a/wireless/ieee802154/mac802154_device.c b/wireless/ieee802154/mac802154_device.c
index c1e31ec566..711ab8514e 100644
--- a/wireless/ieee802154/mac802154_device.c
+++ b/wireless/ieee802154/mac802154_device.c
@@ -43,6 +43,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <debug.h>
 #include <errno.h>
 #include <time.h>
 #include <fcntl.h>