From a32451c13c6fc29d896622eedeb8b81263d72155 Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Wed, 8 Jan 2025 23:30:35 +0800
Subject: [PATCH]  Remove duplicate includes across multiple files

 This commit cleans up redundant header file includes throughout the codebase.
 The changes include:

 - Removing duplicate #include directives that were present in the same file
 - Consolidating includes that were split across multiple lines unnecessarily
 - Removing unused includes that were no longer needed
 - Fixing some formatting issues with includes

 The changes improve code organization and maintainability by:
 - Reducing unnecessary dependencies
 - Making include dependencies more explicit
 - Following consistent include patterns
 - Removing dead code

 No functional changes are made - this is purely a code cleanup commit.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 arch/arm/src/at32/at32_adc.c                               | 1 -
 arch/arm/src/at32/at32_eth.c                               | 1 -
 arch/arm/src/cxd56xx/cxd56_charger.c                       | 1 -
 arch/arm/src/cxd56xx/cxd56_gauge.c                         | 1 -
 arch/arm/src/efm32/efm32_adc.c                             | 1 -
 arch/arm/src/efm32/efm32_irq.c                             | 1 -
 arch/arm/src/eoss3/eoss3_irq.c                             | 1 -
 arch/arm/src/imx9/imx9_lowputc.c                           | 1 -
 arch/arm/src/imxrt/imxrt_iomuxc_ver1.c                     | 6 ++----
 arch/arm/src/imxrt/imxrt_iomuxc_ver2.c                     | 6 ++----
 arch/arm/src/imxrt/imxrt_lpi2c.c                           | 1 -
 arch/arm/src/kinetis/kinetis_pindma.c                      | 1 -
 arch/arm/src/kl/kl_lowputc.c                               | 1 -
 arch/arm/src/lc823450/lc823450_adc.c                       | 1 -
 arch/arm/src/lc823450/lc823450_sddrv_dep.c                 | 1 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c                   | 1 -
 arch/arm/src/max326xx/hardware/max326_gcr.h                | 6 ------
 arch/arm/src/max326xx/max32660/max32660_serial.c           | 2 --
 arch/arm/src/mps/mps_start.c                               | 1 -
 arch/arm/src/nrf52/nrf52_flash.c                           | 1 -
 arch/arm/src/nrf52/nrf52_usbd.h                            | 1 -
 arch/arm/src/nrf53/nrf53_usbd.h                            | 3 +--
 arch/arm/src/phy62xx/phyplus_stub.c                        | 1 -
 arch/arm/src/rp2040/rp2040_adc.c                           | 1 -
 arch/arm/src/rp2040/rp2040_ws2812.c                        | 1 -
 arch/arm/src/rp23xx/rp23xx_adc.c                           | 1 -
 arch/arm/src/rp23xx/rp23xx_ws2812.c                        | 1 -
 arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c                  | 1 -
 arch/arm/src/s32k1xx/s32k1xx_pindma.c                      | 1 -
 arch/arm/src/sama5/sam_rtc.c                               | 5 +----
 arch/arm/src/stm32f7/stm32_adc.c                           | 1 -
 arch/arm/src/stm32wl5/stm32wl5_allocateheap.c              | 1 -
 arch/arm/src/stm32wl5/stm32wl5_irq.c                       | 1 -
 arch/arm/src/stm32wl5/stm32wl5_lowputc.c                   | 1 -
 arch/arm/src/stm32wl5/stm32wl5_rcc.c                       | 1 -
 arch/arm/src/stm32wl5/stm32wl5_serial.c                    | 1 -
 arch/arm/src/stm32wl5/stm32wl5_start.c                     | 1 -
 arch/arm/src/stm32wl5/stm32wl5_tim.c                       | 1 -
 arch/arm/src/stm32wl5/stm32wl5_timerisr.c                  | 1 -
 arch/arm/src/tlsr82/tlsr82_spi_console.c                   | 2 --
 arch/arm/src/tlsr82/tlsr82_timer_isr.c                     | 5 +----
 arch/arm64/src/common/arm64_fatal.c                        | 1 -
 arch/risc-v/src/common/espressif/esp_efuse.c               | 2 --
 arch/risc-v/src/common/espressif/esp_temperature_sensor.c  | 1 -
 arch/risc-v/src/common/espressif/esp_ws2812.c              | 1 -
 arch/risc-v/src/common/riscv_swint.c                       | 1 -
 arch/risc-v/src/esp32c3-legacy/esp32c3_ice40.c             | 2 --
 arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c          | 1 -
 arch/risc-v/src/esp32c3/esp_wireless.c                     | 2 --
 arch/risc-v/src/hpm6000/hpm_gpio.c                         | 1 -
 arch/risc-v/src/rv32m1/rv32m1_gpio.c                       | 1 -
 arch/sim/src/sim/posix/sim_tapdev.c                        | 1 -
 arch/x86_64/src/common/x86_64_syscall.c                    | 1 -
 arch/xtensa/src/common/espressif/esp_temperature_sensor.c  | 1 -
 arch/xtensa/src/common/espressif/esp_ws2812.c              | 1 -
 arch/xtensa/src/common/xtensa_swint.c                      | 1 -
 arch/xtensa/src/esp32/esp32_spiram.c                       | 1 -
 arch/xtensa/src/esp32s2/esp32s2_spiram.c                   | 1 -
 arch/xtensa/src/esp32s3/esp32s3_spiram.c                   | 1 -
 boards/arm/a1x/pcduino-a10/src/a1x_buttons.c               | 2 --
 boards/arm/am335x/beaglebone-black/src/am335x_buttons.c    | 2 --
 .../arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c | 2 --
 boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c         | 2 --
 boards/arm/imxrt/imxrt1064-evk/src/imxrt_progmem.c         | 3 ---
 boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c            | 1 -
 boards/arm/kinetis/freedom-k28f/src/k28_sdhc.c             | 1 -
 boards/arm/kinetis/freedom-k64f/src/k64_sdhc.c             | 1 -
 boards/arm/kinetis/freedom-k66f/src/k66_sdhc.c             | 1 -
 boards/arm/kinetis/twr-k64f120m/src/k64_sdhc.c             | 1 -
 boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c         | 2 --
 boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c   | 4 ----
 .../arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c  | 1 -
 boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c | 2 --
 boards/arm/max326xx/max32660-evsys/src/max326_button.c     | 2 --
 boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c      | 1 -
 boards/arm/nrf52/common/src/nrf52_progmem.c                | 1 -
 boards/arm/nrf53/common/src/nrf53_progmem.c                | 1 -
 boards/arm/nrf91/common/src/nrf91_progmem.c                | 1 -
 boards/arm/sam34/sam3u-ek/src/sam_buttons.c                | 2 --
 boards/arm/sam34/sam4e-ek/src/sam_buttons.c                | 2 --
 boards/arm/sam34/sam4l-xplained/src/sam_buttons.c          | 2 --
 boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c      | 2 --
 boards/arm/sam34/sam4s-xplained/src/sam_buttons.c          | 2 --
 boards/arm/sama5/jupiter-nano/src/sam_buttons.c            | 2 --
 boards/arm/sama5/sama5d2-xult/src/sam_buttons.c            | 2 --
 boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c        | 2 --
 boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c             | 2 --
 boards/arm/sama5/sama5d4-ek/src/sam_buttons.c              | 2 --
 boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c       | 2 --
 boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c       | 2 --
 boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c       | 2 --
 boards/arm/samv7/same70-qmtech/src/sam_buttons.c           | 2 --
 boards/arm/samv7/same70-xplained/src/sam_buttons.c         | 2 --
 boards/arm/samv7/samv71-xult/src/sam_buttons.c             | 2 --
 boards/arm/stm32/common/src/stm32_tone.c                   | 1 -
 boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c   | 1 -
 boards/arm/stm32h7/linum-stm32h753bi/src/stm32_tone.c      | 1 -
 boards/arm/stm32h7/nucleo-h743zi/src/stm32_progmem.c       | 3 ---
 boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c        | 1 -
 boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_leds.c         | 1 -
 boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c       | 2 --
 boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c     | 2 --
 boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c   | 2 --
 boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c | 2 --
 boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c      | 2 --
 boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c      | 2 --
 .../esp32c3-devkit-rust-1/src/esp32c3_bringup.c            | 2 --
 .../esp32c3-legacy/esp32c3-devkit/src/esp32c3_bringup.c    | 2 --
 .../risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c   | 1 -
 .../risc-v/esp32c6/esp32c6-devkitm/src/esp32c6_bringup.c   | 1 -
 boards/sim/sim/sim/src/sim_bringup.c                       | 1 -
 boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c     | 3 ---
 boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c    | 5 -----
 boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c      | 6 ------
 boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c | 4 ----
 boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c        | 4 ----
 boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c     | 2 --
 boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c  | 3 ---
 boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c   | 3 ---
 .../xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c | 2 --
 boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c      | 2 --
 boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c    | 2 --
 .../xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c  | 2 --
 .../xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c  | 2 --
 .../xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c   | 2 --
 .../xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c  | 2 --
 boards/xtensa/esp32s3/common/src/esp32s3_lan9250.c         | 1 -
 boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c    | 2 --
 boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c | 2 --
 boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c    | 2 --
 .../xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c   | 2 --
 boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c | 2 --
 boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_lcd.c     | 1 -
 boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c | 2 --
 boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c | 2 --
 drivers/audio/tone.c                                       | 1 -
 drivers/input/stmpe811_tsc.c                               | 1 -
 drivers/leds/rgbled.c                                      | 1 -
 drivers/loop/losetup.c                                     | 1 -
 drivers/mtd/mx25rxx.c                                      | 1 -
 drivers/net/enc28j60.c                                     | 1 -
 drivers/net/encx24j600.c                                   | 1 -
 drivers/net/lan9250.c                                      | 1 -
 drivers/sensors/kxtj9.c                                    | 1 -
 drivers/wireless/bluetooth/bt_null.c                       | 1 -
 include/nuttx/lib/math.h                                   | 7 -------
 libs/libc/modlib/modlib_symtab.c                           | 1 -
 libs/libc/pthread/pthread_spinlock.c                       | 2 --
 net/local/local.h                                          | 1 -
 net/tcp/tcp_send_buffered.c                                | 1 -
 sched/misc/assert.c                                        | 1 -
 sched/paging/pg_worker.c                                   | 1 -
 152 files changed, 7 insertions(+), 256 deletions(-)

diff --git a/arch/arm/src/at32/at32_adc.c b/arch/arm/src/at32/at32_adc.c
index d6a1b93073181..437c46dedb28d 100644
--- a/arch/arm/src/at32/at32_adc.c
+++ b/arch/arm/src/at32/at32_adc.c
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <arch/board/board.h>
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/at32/at32_eth.c b/arch/arm/src/at32/at32_eth.c
index d231a7193a2c5..be003545f590e 100644
--- a/arch/arm/src/at32/at32_eth.c
+++ b/arch/arm/src/at32/at32_eth.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <assert.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_charger.c b/arch/arm/src/cxd56xx/cxd56_charger.c
index d26aea822912d..8d11d95de802b 100644
--- a/arch/arm/src/cxd56xx/cxd56_charger.c
+++ b/arch/arm/src/cxd56xx/cxd56_charger.c
@@ -29,7 +29,6 @@
 
 #include <nuttx/config.h>
 #include <assert.h>
-#include <debug.h>
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_gauge.c b/arch/arm/src/cxd56xx/cxd56_gauge.c
index 3faaa5a9c0bd9..58d27353133f6 100644
--- a/arch/arm/src/cxd56xx/cxd56_gauge.c
+++ b/arch/arm/src/cxd56xx/cxd56_gauge.c
@@ -27,7 +27,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <debug.h>
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
index c2bfe359ce691..977fb0eec4f43 100644
--- a/arch/arm/src/efm32/efm32_adc.c
+++ b/arch/arm/src/efm32/efm32_adc.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <arch/board/board.h>
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 5912f490900b3..990260d98c40a 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -33,7 +33,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/irq.h>
 #include <arch/armv7-m/nvicpri.h>
 
 #include "nvic.h"
diff --git a/arch/arm/src/eoss3/eoss3_irq.c b/arch/arm/src/eoss3/eoss3_irq.c
index 9ce29d95383c0..575656ee31d38 100644
--- a/arch/arm/src/eoss3/eoss3_irq.c
+++ b/arch/arm/src/eoss3/eoss3_irq.c
@@ -33,7 +33,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/irq.h>
 #include <arch/armv7-m/nvicpri.h>
 
 #include "nvic.h"
diff --git a/arch/arm/src/imx9/imx9_lowputc.c b/arch/arm/src/imx9/imx9_lowputc.c
index 496c33d0b52fc..c3d7023f59138 100644
--- a/arch/arm/src/imx9/imx9_lowputc.c
+++ b/arch/arm/src/imx9/imx9_lowputc.c
@@ -41,7 +41,6 @@
 #include "imx9_clockconfig.h"
 #include "imx9_iomuxc.h"
 #include "hardware/imx9_clock.h"
-#include "hardware/imx9_pinmux.h"
 
 #include <arch/board/board.h> /* Include last:  has dependencies */
 
diff --git a/arch/arm/src/imxrt/imxrt_iomuxc_ver1.c b/arch/arm/src/imxrt/imxrt_iomuxc_ver1.c
index edcf6e1862aaa..e47329f50cd79 100644
--- a/arch/arm/src/imxrt/imxrt_iomuxc_ver1.c
+++ b/arch/arm/src/imxrt/imxrt_iomuxc_ver1.c
@@ -24,13 +24,11 @@
  * Included Files
  ****************************************************************************/
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdbool.h>
-
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <assert.h>
 #include <errno.h>
 
diff --git a/arch/arm/src/imxrt/imxrt_iomuxc_ver2.c b/arch/arm/src/imxrt/imxrt_iomuxc_ver2.c
index df598233529c5..bf06da401f0ad 100644
--- a/arch/arm/src/imxrt/imxrt_iomuxc_ver2.c
+++ b/arch/arm/src/imxrt/imxrt_iomuxc_ver2.c
@@ -24,13 +24,11 @@
  * Included Files
  ****************************************************************************/
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdbool.h>
-
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <assert.h>
 #include <errno.h>
 
diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c
index 027a516d8287a..595eb56853785 100644
--- a/arch/arm/src/imxrt/imxrt_lpi2c.c
+++ b/arch/arm/src/imxrt/imxrt_lpi2c.c
@@ -49,7 +49,6 @@
 #include "imxrt_lpi2c.h"
 #include "imxrt_edma.h"
 #include "imxrt_gpio.h"
-#include "imxrt_lpi2c.h"
 
 #include "hardware/imxrt_dmamux.h"
 #include "hardware/imxrt_pinmux.h"
diff --git a/arch/arm/src/kinetis/kinetis_pindma.c b/arch/arm/src/kinetis/kinetis_pindma.c
index e041cfcdeed31..9686d4ea02965 100644
--- a/arch/arm/src/kinetis/kinetis_pindma.c
+++ b/arch/arm/src/kinetis/kinetis_pindma.c
@@ -34,7 +34,6 @@
 
 #include <arch/board/board.h>
 
-#include <nuttx/arch.h>
 #include <nuttx/arch.h>
 #include "arm_internal.h"
 #include "kinetis_config.h"
diff --git a/arch/arm/src/kl/kl_lowputc.c b/arch/arm/src/kl/kl_lowputc.c
index d34899ac6e6f3..e68a9f594d363 100644
--- a/arch/arm/src/kl/kl_lowputc.c
+++ b/arch/arm/src/kl/kl_lowputc.c
@@ -40,7 +40,6 @@
 #include "hardware/kl_uart.h"
 #include "hardware/kl_sim.h"
 #include "hardware/kl_port.h"
-#include "hardware/kl_uart.h"
 #include "hardware/kl_pinmux.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_adc.c b/arch/arm/src/lc823450/lc823450_adc.c
index ecec2bede92eb..0fa988693bb30 100644
--- a/arch/arm/src/lc823450/lc823450_adc.c
+++ b/arch/arm/src/lc823450/lc823450_adc.c
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/lc823450/lc823450_sddrv_dep.c b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
index ee205fb8c55ff..5f39bdf5d7abb 100644
--- a/arch/arm/src/lc823450/lc823450_sddrv_dep.c
+++ b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
@@ -59,7 +59,6 @@
 #include "arm_internal.h"
 #include "lc823450_sddrv_type.h"
 #include "lc823450_sddrv_if.h"
-#include "lc823450_dma.h"
 #include "lc823450_gpio.h"
 #include "lc823450_syscontrol.h"
 #include "lc823450_timer.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
index 85d0fe4dabb3e..642557ec6b218 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
@@ -65,7 +65,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_i2c.h"
diff --git a/arch/arm/src/max326xx/hardware/max326_gcr.h b/arch/arm/src/max326xx/hardware/max326_gcr.h
index 77d25b89f515a..689e3b93b1956 100644
--- a/arch/arm/src/max326xx/hardware/max326_gcr.h
+++ b/arch/arm/src/max326xx/hardware/max326_gcr.h
@@ -23,12 +23,6 @@
 #ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GCR_H
 #define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GCR_H
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
 /****************************************************************************
  * Included Files
  ****************************************************************************/
diff --git a/arch/arm/src/max326xx/max32660/max32660_serial.c b/arch/arm/src/max326xx/max32660/max32660_serial.c
index 8123f999c2e70..2690c39f852bc 100644
--- a/arch/arm/src/max326xx/max32660/max32660_serial.c
+++ b/arch/arm/src/max326xx/max32660/max32660_serial.c
@@ -50,8 +50,6 @@
 #include "max326_lowputc.h"
 #include "max326_serial.h"
 
-#include <arch/board/board.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/arm/src/mps/mps_start.c b/arch/arm/src/mps/mps_start.c
index 31c2741b48684..992d3d7c69755 100644
--- a/arch/arm/src/mps/mps_start.c
+++ b/arch/arm/src/mps/mps_start.c
@@ -25,7 +25,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/init.h>
 
 #include <nuttx/cache.h>
 #include <nuttx/init.h>
diff --git a/arch/arm/src/nrf52/nrf52_flash.c b/arch/arm/src/nrf52/nrf52_flash.c
index d166c8d6b8d87..8624dc2619bf7 100644
--- a/arch/arm/src/nrf52/nrf52_flash.c
+++ b/arch/arm/src/nrf52/nrf52_flash.c
@@ -45,7 +45,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/config.h>
 #include <nuttx/progmem.h>
 
 #include "chip.h"
diff --git a/arch/arm/src/nrf52/nrf52_usbd.h b/arch/arm/src/nrf52/nrf52_usbd.h
index 068a2c8eb4a5f..3966e66ab14e4 100644
--- a/arch/arm/src/nrf52/nrf52_usbd.h
+++ b/arch/arm/src/nrf52/nrf52_usbd.h
@@ -30,7 +30,6 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
-#include <nuttx/config.h>
 #include <nuttx/usb/usbdev.h>
 #include <stdint.h>
 
diff --git a/arch/arm/src/nrf53/nrf53_usbd.h b/arch/arm/src/nrf53/nrf53_usbd.h
index 3613221887d3d..87ceb86197dd1 100644
--- a/arch/arm/src/nrf53/nrf53_usbd.h
+++ b/arch/arm/src/nrf53/nrf53_usbd.h
@@ -28,9 +28,8 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <stdbool.h>
 
-#include <nuttx/config.h>
+#include <stdbool.h>
 #include <nuttx/usb/usbdev.h>
 #include <stdint.h>
 
diff --git a/arch/arm/src/phy62xx/phyplus_stub.c b/arch/arm/src/phy62xx/phyplus_stub.c
index 5c2122725d9a3..59b6d3fe5f2ce 100644
--- a/arch/arm/src/phy62xx/phyplus_stub.c
+++ b/arch/arm/src/phy62xx/phyplus_stub.c
@@ -42,7 +42,6 @@
 #include "phyplus_tim.h"
 #include "timer.h"
 #include "mcu_phy_bumbee.h"
-#include "phyplus_gpio.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/rp2040/rp2040_adc.c b/arch/arm/src/rp2040/rp2040_adc.c
index 4dd18087a0220..67bf171e8fb5f 100644
--- a/arch/arm/src/rp2040/rp2040_adc.c
+++ b/arch/arm/src/rp2040/rp2040_adc.c
@@ -63,7 +63,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/arch/arm/src/rp2040/rp2040_ws2812.c b/arch/arm/src/rp2040/rp2040_ws2812.c
index 105304bd3746e..9a033bcf64aa0 100644
--- a/arch/arm/src/rp2040/rp2040_ws2812.c
+++ b/arch/arm/src/rp2040/rp2040_ws2812.c
@@ -28,7 +28,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/rp23xx/rp23xx_adc.c b/arch/arm/src/rp23xx/rp23xx_adc.c
index 45363dd75b7dd..f7914c7b2cd63 100644
--- a/arch/arm/src/rp23xx/rp23xx_adc.c
+++ b/arch/arm/src/rp23xx/rp23xx_adc.c
@@ -63,7 +63,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/arch/arm/src/rp23xx/rp23xx_ws2812.c b/arch/arm/src/rp23xx/rp23xx_ws2812.c
index 8dc6642e18d1a..e5eac2fb4e8ee 100644
--- a/arch/arm/src/rp23xx/rp23xx_ws2812.c
+++ b/arch/arm/src/rp23xx/rp23xx_ws2812.c
@@ -28,7 +28,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c b/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
index 4fcccd885ab2d..35070dba10586 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
@@ -47,7 +47,6 @@
 
 #include "arm_internal.h"
 #include "s32k1xx_edma.h"
-#include "s32k1xx_pin.h"
 #include "hardware/s32k1xx_dmamux.h"
 #include "hardware/s32k1xx_pinmux.h"
 #include "s32k1xx_flexio_i2c.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_pindma.c b/arch/arm/src/s32k1xx/s32k1xx_pindma.c
index f67f9a247b6ce..0d9b6b699b447 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_pindma.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_pindma.c
@@ -32,7 +32,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/arch.h>
 #include <nuttx/arch.h>
 #include "arm_internal.h"
 #include "s32k1xx_pin.h"
diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c
index e852a5645f2e5..a47ed21cb99b0 100644
--- a/arch/arm/src/sama5/sam_rtc.c
+++ b/arch/arm/src/sama5/sam_rtc.c
@@ -28,16 +28,13 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/wqueue.h>
 
 #include <time.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/arch.h>
-#include <nuttx/irq.h>
-#include <nuttx/wqueue.h>
-
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
diff --git a/arch/arm/src/stm32f7/stm32_adc.c b/arch/arm/src/stm32f7/stm32_adc.c
index 1b3aaade7b18b..ec7965c869e38 100644
--- a/arch/arm/src/stm32f7/stm32_adc.c
+++ b/arch/arm/src/stm32f7/stm32_adc.c
@@ -38,7 +38,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <arch/board/board.h>
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/stm32wl5/stm32wl5_allocateheap.c b/arch/arm/src/stm32wl5/stm32wl5_allocateheap.c
index 625e396de70af..02f7e3a10a529 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_allocateheap.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_allocateheap.c
@@ -41,7 +41,6 @@
 #include "chip.h"
 #include "mpu.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 #include "stm32wl5_mpuinit.h"
 #include "stm32wl5_ipcc.h"
 
diff --git a/arch/arm/src/stm32wl5/stm32wl5_irq.c b/arch/arm/src/stm32wl5/stm32wl5_irq.c
index 11ad5cbc7c06b..32c62e4adcbaa 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_irq.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_irq.c
@@ -38,7 +38,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 #include "stm32wl5.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32wl5/stm32wl5_lowputc.c b/arch/arm/src/stm32wl5/stm32wl5_lowputc.c
index eacbe6ac86dab..06a47209fc635 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_lowputc.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_lowputc.c
@@ -30,7 +30,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_internal.h"
 #include "arm_internal.h"
 
 #include "chip.h"
diff --git a/arch/arm/src/stm32wl5/stm32wl5_rcc.c b/arch/arm/src/stm32wl5/stm32wl5_rcc.c
index dd6bf1e397fc4..e9e3b7d86371c 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_rcc.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_rcc.c
@@ -33,7 +33,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_internal.h"
 #include "arm_internal.h"
 
 #include "chip.h"
diff --git a/arch/arm/src/stm32wl5/stm32wl5_serial.c b/arch/arm/src/stm32wl5/stm32wl5_serial.c
index e9da9162ee94e..826aa39ff8599 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_serial.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_serial.c
@@ -57,7 +57,6 @@
 #endif
 #include "stm32wl5_rcc.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32wl5/stm32wl5_start.c b/arch/arm/src/stm32wl5/stm32wl5_start.c
index a5075eaac0bce..6b3370b3f5924 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_start.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_start.c
@@ -33,7 +33,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_internal.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/stm32wl5/stm32wl5_tim.c b/arch/arm/src/stm32wl5/stm32wl5_tim.c
index 8a2ff45d86636..79841b494f840 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_tim.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_tim.c
@@ -40,7 +40,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 
 #include "stm32wl5.h"
 #include "stm32wl5_gpio.h"
diff --git a/arch/arm/src/stm32wl5/stm32wl5_timerisr.c b/arch/arm/src/stm32wl5/stm32wl5_timerisr.c
index cd1efb17369d0..3f9e14d3db34e 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_timerisr.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_timerisr.c
@@ -35,7 +35,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32wl5.h"
diff --git a/arch/arm/src/tlsr82/tlsr82_spi_console.c b/arch/arm/src/tlsr82/tlsr82_spi_console.c
index 8923c28f5b59d..6de71dc6b5a18 100644
--- a/arch/arm/src/tlsr82/tlsr82_spi_console.c
+++ b/arch/arm/src/tlsr82/tlsr82_spi_console.c
@@ -26,14 +26,12 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
-#include <nuttx/arch.h>
 #include <assert.h>
 #include <debug.h>
 #include <execinfo.h>
 
 #include <nuttx/compiler.h>
 #include <nuttx/board.h>
-#include <nuttx/arch.h>
 #include <nuttx/serial/serial.h>
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/tlsr82/tlsr82_timer_isr.c b/arch/arm/src/tlsr82/tlsr82_timer_isr.c
index 052e5dab86e37..b59cb66722144 100644
--- a/arch/arm/src/tlsr82/tlsr82_timer_isr.c
+++ b/arch/arm/src/tlsr82/tlsr82_timer_isr.c
@@ -26,13 +26,10 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
-#include <nuttx/arch.h>
+#include <nuttx/board.h>
 
 #include <debug.h>
 #include <assert.h>
-
-#include <nuttx/board.h>
-#include <nuttx/irq.h>
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
diff --git a/arch/arm64/src/common/arm64_fatal.c b/arch/arm64/src/common/arm64_fatal.c
index 0fd25548df13c..a991bc7378688 100644
--- a/arch/arm64/src/common/arm64_fatal.c
+++ b/arch/arm64/src/common/arm64_fatal.c
@@ -46,7 +46,6 @@
 #include "arm64_internal.h"
 #include "arm64_fatal.h"
 #include "arm64_mmu.h"
-#include "arm64_fatal.h"
 #include "arm64_arch_timer.h"
 
 #ifdef CONFIG_ARCH_FPU
diff --git a/arch/risc-v/src/common/espressif/esp_efuse.c b/arch/risc-v/src/common/espressif/esp_efuse.c
index ce6b5cbfb55de..cc9d654fb489b 100644
--- a/arch/risc-v/src/common/espressif/esp_efuse.c
+++ b/arch/risc-v/src/common/espressif/esp_efuse.c
@@ -26,12 +26,10 @@
 
 #include <stdlib.h>
 #include <debug.h>
-#include <debug.h>
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
 #include <sys/param.h>
-#include <nuttx/efuse/efuse.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/efuse/efuse.h>
diff --git a/arch/risc-v/src/common/espressif/esp_temperature_sensor.c b/arch/risc-v/src/common/espressif/esp_temperature_sensor.c
index f256055e8c74f..a4e198c67917c 100644
--- a/arch/risc-v/src/common/espressif/esp_temperature_sensor.c
+++ b/arch/risc-v/src/common/espressif/esp_temperature_sensor.c
@@ -44,7 +44,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/can/can.h>
 #include <nuttx/signal.h>
-#include <nuttx/arch.h>
 #include <nuttx/kthread.h>
 #ifdef CONFIG_ESPRESSIF_TEMP_UORB
 #include <nuttx/sensors/sensor.h>
diff --git a/arch/risc-v/src/common/espressif/esp_ws2812.c b/arch/risc-v/src/common/espressif/esp_ws2812.c
index c94261e5adc18..642b9bf37d73a 100644
--- a/arch/risc-v/src/common/espressif/esp_ws2812.c
+++ b/arch/risc-v/src/common/espressif/esp_ws2812.c
@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/arch/risc-v/src/common/riscv_swint.c b/arch/risc-v/src/common/riscv_swint.c
index 2266cbafab7e5..9ecd4c78e0ca5 100644
--- a/arch/risc-v/src/common/riscv_swint.c
+++ b/arch/risc-v/src/common/riscv_swint.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <syscall.h>
 
 #include <arch/irq.h>
 #include <nuttx/addrenv.h>
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_ice40.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_ice40.c
index 0694e3ad5246c..42e9ef59ed932 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_ice40.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_ice40.c
@@ -55,8 +55,6 @@
 
 #include "esp32c3_gpio.h"
 
-#include <nuttx/spi/ice40.h>
-
 /****************************************************************************
  * Private Function Prototypes
  ****************************************************************************/
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c
index 9a4676be3d856..1920b82dab792 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c
@@ -39,7 +39,6 @@
 #include "esp32c3.h"
 #include "esp32c3_irq.h"
 #include "esp32c3_attr.h"
-#include "esp32c3_wireless.h"
 #include "espidf_wifi.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/esp32c3/esp_wireless.c b/arch/risc-v/src/esp32c3/esp_wireless.c
index 13893933391f0..39543689b62b2 100644
--- a/arch/risc-v/src/esp32c3/esp_wireless.c
+++ b/arch/risc-v/src/esp32c3/esp_wireless.c
@@ -39,8 +39,6 @@
 #include "esp_private/phy.h"
 #include "espressif/esp_hr_timer.h"
 
-#include "esp_private/phy.h"
-
 #include "periph_ctrl.h"
 #include "esp_phy_init.h"
 #include "phy_init_data.h"
diff --git a/arch/risc-v/src/hpm6000/hpm_gpio.c b/arch/risc-v/src/hpm6000/hpm_gpio.c
index b1016d93e54a6..38d979f74f6d0 100644
--- a/arch/risc-v/src/hpm6000/hpm_gpio.c
+++ b/arch/risc-v/src/hpm6000/hpm_gpio.c
@@ -41,7 +41,6 @@
 #include "hardware/hpm_gpio.h"
 #include "hpm_gpio.h"
 #include "riscv_internal.h"
-#include "hpm_gpio.h"
 #include "hpm_ioc.h"
 
 /***************************************************************************
diff --git a/arch/risc-v/src/rv32m1/rv32m1_gpio.c b/arch/risc-v/src/rv32m1/rv32m1_gpio.c
index 3e6f42f0a49bd..e53eb70bc7ced 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_gpio.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_gpio.c
@@ -34,7 +34,6 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include <nuttx/nuttx.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/queue.h>
 
diff --git a/arch/sim/src/sim/posix/sim_tapdev.c b/arch/sim/src/sim/posix/sim_tapdev.c
index 48d8fba1b6b2d..569a7a9e3faaa 100644
--- a/arch/sim/src/sim/posix/sim_tapdev.c
+++ b/arch/sim/src/sim/posix/sim_tapdev.c
@@ -64,7 +64,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/uio.h>
-#include <sys/socket.h>
 
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/arch/x86_64/src/common/x86_64_syscall.c b/arch/x86_64/src/common/x86_64_syscall.c
index a9412ed2bc919..960b992bb0210 100644
--- a/arch/x86_64/src/common/x86_64_syscall.c
+++ b/arch/x86_64/src/common/x86_64_syscall.c
@@ -36,7 +36,6 @@
 #include <nuttx/addrenv.h>
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
-#include <nuttx/addrenv.h>
 
 #include "x86_64_internal.h"
 
diff --git a/arch/xtensa/src/common/espressif/esp_temperature_sensor.c b/arch/xtensa/src/common/espressif/esp_temperature_sensor.c
index 5cf6d62358acd..6c72db256210d 100644
--- a/arch/xtensa/src/common/espressif/esp_temperature_sensor.c
+++ b/arch/xtensa/src/common/espressif/esp_temperature_sensor.c
@@ -44,7 +44,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/can/can.h>
 #include <nuttx/signal.h>
-#include <nuttx/arch.h>
 #include <nuttx/kthread.h>
 #ifdef CONFIG_ESPRESSIF_TEMP_UORB
 #include <nuttx/sensors/sensor.h>
diff --git a/arch/xtensa/src/common/espressif/esp_ws2812.c b/arch/xtensa/src/common/espressif/esp_ws2812.c
index 10a25428fc639..681feab6a5867 100644
--- a/arch/xtensa/src/common/espressif/esp_ws2812.c
+++ b/arch/xtensa/src/common/espressif/esp_ws2812.c
@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/arch/xtensa/src/common/xtensa_swint.c b/arch/xtensa/src/common/xtensa_swint.c
index 5a356a8bcbcad..f357b5a4795b0 100644
--- a/arch/xtensa/src/common/xtensa_swint.c
+++ b/arch/xtensa/src/common/xtensa_swint.c
@@ -37,7 +37,6 @@
 #include "sched/sched.h"
 #include "chip.h"
 #include "signal/signal.h"
-#include "sched/sched.h"
 #include "xtensa.h"
 
 /****************************************************************************
diff --git a/arch/xtensa/src/esp32/esp32_spiram.c b/arch/xtensa/src/esp32/esp32_spiram.c
index 2e9f6d6a85fd2..0b94d27490715 100644
--- a/arch/xtensa/src/esp32/esp32_spiram.c
+++ b/arch/xtensa/src/esp32/esp32_spiram.c
@@ -32,7 +32,6 @@
 #include <debug.h>
 #include <string.h>
 #include <sys/param.h>
-#include <nuttx/config.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/init.h>
 
diff --git a/arch/xtensa/src/esp32s2/esp32s2_spiram.c b/arch/xtensa/src/esp32s2/esp32s2_spiram.c
index b02b7c48bd4f8..8a8c09357b0ce 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_spiram.c
+++ b/arch/xtensa/src/esp32s2/esp32s2_spiram.c
@@ -31,7 +31,6 @@
 #include <debug.h>
 #include <string.h>
 #include <sys/param.h>
-#include <nuttx/config.h>
 #include <nuttx/spinlock.h>
 
 #include "xtensa.h"
diff --git a/arch/xtensa/src/esp32s3/esp32s3_spiram.c b/arch/xtensa/src/esp32s3/esp32s3_spiram.c
index c8ee1c57a8c80..d8b6259610db3 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_spiram.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_spiram.c
@@ -31,7 +31,6 @@
 #include <debug.h>
 #include <string.h>
 #include <sys/param.h>
-#include <nuttx/config.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/init.h>
 #include <assert.h>
diff --git a/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c b/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c
index 0b134907d47b0..9f524a278255b 100644
--- a/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c
+++ b/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c b/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c
index 11887b9d0f282..e77667709f69f 100644
--- a/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c
+++ b/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c
index 443ba01a32b03..62cc2779f78c6 100644
--- a/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c
+++ b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c
@@ -44,8 +44,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c
index 6acfa52986c44..de5db6144cb78 100644
--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c
@@ -55,8 +55,6 @@
 #  include <imxrt_lpspi.h>
 #endif
 
-#include "imxrt1020-evk.h"
-
 #include <arch/board/board.h>  /* Must always be included last */
 
 /****************************************************************************
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_progmem.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_progmem.c
index 36573ef9289bf..0d95f53bdc190 100644
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_progmem.c
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_progmem.c
@@ -40,9 +40,6 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mtd/mtd.h>
-#ifdef CONFIG_BCH
-#include <nuttx/drivers/drivers.h>
-#endif
 
 #include "imxrt1064-evk.h"
 
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c
index 0db8b1aa772c5..051a6eb4502f9 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c
@@ -32,7 +32,6 @@
 #include <syslog.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/i2c/i2c_master.h>
-#include <nuttx/video/fb.h>
 #include <imxrt_lpi2c.h>
 #include <imxrt_lpspi.h>
 #include <nuttx/input/buttons.h>
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_sdhc.c b/boards/arm/kinetis/freedom-k28f/src/k28_sdhc.c
index 8abbef4894e4b..f44f65050f2d0 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_sdhc.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_sdhc.c
@@ -51,7 +51,6 @@
 #include <stdio.h>
 #include <debug.h>
 #include <errno.h>
-#include <debug.h>
 
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_sdhc.c b/boards/arm/kinetis/freedom-k64f/src/k64_sdhc.c
index 67d30fbdbab03..18121fdc7f21d 100644
--- a/boards/arm/kinetis/freedom-k64f/src/k64_sdhc.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_sdhc.c
@@ -51,7 +51,6 @@
 #include <stdio.h>
 #include <debug.h>
 #include <errno.h>
-#include <debug.h>
 
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_sdhc.c b/boards/arm/kinetis/freedom-k66f/src/k66_sdhc.c
index 8748b6dc9a3c4..c08e1d1dda1d7 100644
--- a/boards/arm/kinetis/freedom-k66f/src/k66_sdhc.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_sdhc.c
@@ -50,7 +50,6 @@
 #include <stdio.h>
 #include <debug.h>
 #include <errno.h>
-#include <debug.h>
 
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
diff --git a/boards/arm/kinetis/twr-k64f120m/src/k64_sdhc.c b/boards/arm/kinetis/twr-k64f120m/src/k64_sdhc.c
index 997a8779f99dd..361ae7f768dc9 100644
--- a/boards/arm/kinetis/twr-k64f120m/src/k64_sdhc.c
+++ b/boards/arm/kinetis/twr-k64f120m/src/k64_sdhc.c
@@ -51,7 +51,6 @@
 #include <stdio.h>
 #include <debug.h>
 #include <errno.h>
-#include <debug.h>
 
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c
index 23261d04aeccf..cb2a1dc7c3f9e 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c
@@ -38,8 +38,6 @@
 #include "lpc17_40_gpio.h"
 #include "arm_internal.h"
 
-#include <arch/board/board.h>
-
 #include "lx_cpu.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c
index 88c84c442c0b1..9202dd6123d42 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c
@@ -50,10 +50,6 @@
 #  include <nuttx/usb/usbmonitor.h>
 #endif
 
-#ifdef CONFIG_CDCECM_COMPOSITE
-#  include <nuttx/board.h>
-#endif
-
 #ifdef CONFIG_LPC17_40_ROMFS
 #  include "lpc17_40_romfs.h"
 #endif
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c
index d1a7be35c5e8b..6635f93cc4632 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c
index 1e245951ebf6c..66ef3547e272a 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c
@@ -33,8 +33,6 @@
 #include <nuttx/board.h>
 #include <nuttx/irq.h>
 
-#include <nuttx/irq.h>
-
 #include "lpc54_gpio.h"
 #include "lpcxpresso-lpc54628.h"
 
diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_button.c b/boards/arm/max326xx/max32660-evsys/src/max326_button.c
index 26f88d1df9915..314b514008753 100644
--- a/boards/arm/max326xx/max32660-evsys/src/max326_button.c
+++ b/boards/arm/max326xx/max32660-evsys/src/max326_button.c
@@ -34,8 +34,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/spinlock.h>
 
-#include <nuttx/irq.h>
-
 #include "max326_gpio.h"
 #include "max32660-evsys.h"
 
diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c b/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c
index 1815331d8a103..d1f690713a9c0 100644
--- a/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c
+++ b/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c
@@ -31,7 +31,6 @@
 #include <time.h>
 #include <debug.h>
 
-#include <nuttx/config.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/spi/spi.h>
 
diff --git a/boards/arm/nrf52/common/src/nrf52_progmem.c b/boards/arm/nrf52/common/src/nrf52_progmem.c
index 484ef98183c26..b4c18cada1129 100644
--- a/boards/arm/nrf52/common/src/nrf52_progmem.c
+++ b/boards/arm/nrf52/common/src/nrf52_progmem.c
@@ -41,7 +41,6 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mtd/mtd.h>
-#include <nuttx/drivers/drivers.h>
 
 #include "nrf52_progmem.h"
 
diff --git a/boards/arm/nrf53/common/src/nrf53_progmem.c b/boards/arm/nrf53/common/src/nrf53_progmem.c
index be1851846a143..8faab8e56f260 100644
--- a/boards/arm/nrf53/common/src/nrf53_progmem.c
+++ b/boards/arm/nrf53/common/src/nrf53_progmem.c
@@ -41,7 +41,6 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mtd/mtd.h>
-#include <nuttx/drivers/drivers.h>
 
 #include "nrf53_progmem.h"
 
diff --git a/boards/arm/nrf91/common/src/nrf91_progmem.c b/boards/arm/nrf91/common/src/nrf91_progmem.c
index e840ed10a409f..e508d29398e9a 100644
--- a/boards/arm/nrf91/common/src/nrf91_progmem.c
+++ b/boards/arm/nrf91/common/src/nrf91_progmem.c
@@ -41,7 +41,6 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mtd/mtd.h>
-#include <nuttx/drivers/drivers.h>
 
 #include "nrf91_progmem.h"
 
diff --git a/boards/arm/sam34/sam3u-ek/src/sam_buttons.c b/boards/arm/sam34/sam3u-ek/src/sam_buttons.c
index 369790698618e..43c785471503f 100644
--- a/boards/arm/sam34/sam3u-ek/src/sam_buttons.c
+++ b/boards/arm/sam34/sam3u-ek/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_buttons.c b/boards/arm/sam34/sam4e-ek/src/sam_buttons.c
index 6d21abdc2d260..3686920f64d79 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_buttons.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c b/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c
index d96371474ff0d..83cf3569d98a3 100644
--- a/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c
+++ b/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c
@@ -30,8 +30,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c
index fb921668f77bd..936d92520230b 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c
+++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c b/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c
index 72bc28a1f575e..39f4d1269d4cd 100644
--- a/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c
+++ b/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sama5/jupiter-nano/src/sam_buttons.c b/boards/arm/sama5/jupiter-nano/src/sam_buttons.c
index b22f3c8f342e5..389f5c375e39a 100644
--- a/boards/arm/sama5/jupiter-nano/src/sam_buttons.c
+++ b/boards/arm/sama5/jupiter-nano/src/sam_buttons.c
@@ -43,8 +43,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c b/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c
index 3e008793159c2..11d6f4008c21f 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c
@@ -43,8 +43,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c b/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c
index 97c01b5ed65d5..e0bf9a2dc99cf 100644
--- a/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c
+++ b/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c
@@ -47,8 +47,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c b/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c
index 5333d9196b0cf..895f5391305bf 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c
@@ -47,8 +47,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c b/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c
index 7c95e20670cbe..543427ed31472 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c
@@ -43,8 +43,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c b/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c
index 99ddf3a3606b5..87d8cb243c201 100644
--- a/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c
+++ b/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c b/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c
index 655f5ce2dbec6..c54a32a607f42 100644
--- a/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c
+++ b/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c b/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c
index 2177c04705f7a..7beef341748f8 100644
--- a/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c
+++ b/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/samv7/same70-qmtech/src/sam_buttons.c b/boards/arm/samv7/same70-qmtech/src/sam_buttons.c
index 0f02f54993284..c691cd4673fa7 100644
--- a/boards/arm/samv7/same70-qmtech/src/sam_buttons.c
+++ b/boards/arm/samv7/same70-qmtech/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/samv7/same70-xplained/src/sam_buttons.c b/boards/arm/samv7/same70-xplained/src/sam_buttons.c
index a81928088682c..ffcc4f2bc1f1e 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_buttons.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/samv7/samv71-xult/src/sam_buttons.c b/boards/arm/samv7/samv71-xult/src/sam_buttons.c
index 4f488521c4085..642b25933142a 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_buttons.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/stm32/common/src/stm32_tone.c b/boards/arm/stm32/common/src/stm32_tone.c
index 67a6a557fd5c6..ec3e43db8a3fe 100644
--- a/boards/arm/stm32/common/src/stm32_tone.c
+++ b/boards/arm/stm32/common/src/stm32_tone.c
@@ -25,7 +25,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/config.h>
 
 #include <errno.h>
 #include <debug.h>
diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
index a5e11c3957ccf..893f10db3d978 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
@@ -37,7 +37,6 @@
 #include "stm32f777zit6-meadow.h"
 
 #ifdef CONFIG_STM32F7_QUADSPI
-#  include <nuttx/mtd/mtd.h>
 #  include "stm32_qspi.h"
 
 #  ifdef CONFIG_FS_FAT
diff --git a/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_tone.c b/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_tone.c
index 63e8f7f845a3d..34590e429b3ea 100644
--- a/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_tone.c
+++ b/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_tone.c
@@ -25,7 +25,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/config.h>
 
 #include <errno.h>
 #include <debug.h>
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_progmem.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_progmem.c
index edf2be1441351..96647c4883c8f 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_progmem.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_progmem.c
@@ -41,9 +41,6 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mtd/mtd.h>
-#ifdef CONFIG_BCH
-#include <nuttx/drivers/drivers.h>
-#endif
 
 #include <stm32.h>
 #include "nucleo-h743zi.h"
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c
index 3cbb2bed51484..295a0b09b7700 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c
@@ -31,7 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/config.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/spi/spi.h>
diff --git a/boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_leds.c b/boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_leds.c
index a3f578959dfcd..a38439634fc19 100644
--- a/boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_leds.c
+++ b/boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_leds.c
@@ -29,7 +29,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <debug.h>
-#include <stdbool.h>
 
 #include <nuttx/board.h>
 #include <arch/board/board.h>
diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c
index 5f63f78f97de3..70ec8b2dbb231 100644
--- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c
+++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c
@@ -33,8 +33,6 @@
 #include <nuttx/board.h>
 #include <nuttx/irq.h>
 
-#include <nuttx/irq.h>
-
 #include "tiva_gpio.h"
 #include "launchxl-cc1310.h"
 
diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c
index b6e4a0f2522b3..8717f1827df82 100644
--- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c
+++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c
@@ -33,8 +33,6 @@
 #include <nuttx/board.h>
 #include <nuttx/irq.h>
 
-#include <nuttx/irq.h>
-
 #include "tiva_gpio.h"
 #include "launchxl-cc1312r1.h"
 
diff --git a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c
index 58542d98686c4..b279d4743a867 100644
--- a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c
+++ b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c
index 643523bfe6b33..253ec4f96d97c 100644
--- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c
+++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
-
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
index 23c490a4b9c2b..9629b5cdc7bb9 100644
--- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
+++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c
@@ -26,8 +26,6 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/config.h>
-
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
index bead9393d7cbe..855537c918a25 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c
@@ -26,8 +26,6 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/config.h>
-
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
diff --git a/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_bringup.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
index a41e76fe94596..f050f880632e3 100644
--- a/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <nuttx/fs/fs.h>
 
diff --git a/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_bringup.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_bringup.c
index c70c1c3cb344a..0c45cfbf70af9 100644
--- a/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_bringup.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <nuttx/fs/fs.h>
 
diff --git a/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c
index c9ba0f63100e9..bc5c02c017db6 100644
--- a/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c
+++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c
@@ -94,7 +94,6 @@
 #endif
 
 #ifdef CONFIG_SPI_SLAVE_DRIVER
-#  include "espressif/esp_spi.h"
 #  include "esp_board_spislavedev.h"
 #endif
 
diff --git a/boards/risc-v/esp32c6/esp32c6-devkitm/src/esp32c6_bringup.c b/boards/risc-v/esp32c6/esp32c6-devkitm/src/esp32c6_bringup.c
index 7e6dc2dfffb52..ac4a1ac0e3c27 100644
--- a/boards/risc-v/esp32c6/esp32c6-devkitm/src/esp32c6_bringup.c
+++ b/boards/risc-v/esp32c6/esp32c6-devkitm/src/esp32c6_bringup.c
@@ -94,7 +94,6 @@
 #endif
 
 #ifdef CONFIG_SPI_SLAVE_DRIVER
-#  include "espressif/esp_spi.h"
 #  include "esp_board_spislavedev.h"
 #endif
 
diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c
index be3a46f66173d..0be2553a001c7 100644
--- a/boards/sim/sim/sim/src/sim_bringup.c
+++ b/boards/sim/sim/sim/src/sim_bringup.c
@@ -50,7 +50,6 @@
 #include <nuttx/timers/oneshot.h>
 #include <nuttx/video/fb.h>
 #include <nuttx/video/v4l2_cap.h>
-#include <nuttx/timers/oneshot.h>
 #include <nuttx/wireless/pktradio.h>
 #include <nuttx/wireless/bluetooth/bt_null.h>
 #include <nuttx/wireless/bluetooth/bt_uart_shim.h>
diff --git a/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c
index 3dfa416b1d12f..447f1be519f3a 100644
--- a/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-2432S028/src/esp32_bringup.c
@@ -33,11 +33,8 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
-#include <syslog.h>
 #include <errno.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/himem/himem.h>
diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
index adfbef847f0fe..6719e203e6d4c 100644
--- a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
@@ -33,11 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
-
-#include <syslog.h>
 #include <errno.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/himem/himem.h>
@@ -101,7 +97,6 @@
 #endif
 
 #ifdef CONFIG_LCD_DEV
-#  include <nuttx/board.h>
 #  include <nuttx/lcd/lcd_dev.h>
 #endif
 
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
index 0993dba7e2c07..149e8cf82dcfb 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
@@ -29,14 +29,10 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
-
 #include <errno.h>
 #if defined(CONFIG_ESP32_EFUSE)
 #include <nuttx/efuse/efuse.h>
@@ -140,7 +136,6 @@
 #endif
 
 #ifdef CONFIG_LCD_DEV
-#  include <nuttx/board.h>
 #  include <nuttx/lcd/lcd_dev.h>
 #endif
 
@@ -157,7 +152,6 @@
 #endif
 
 #ifdef CONFIG_SPI_SLAVE_DRIVER
-#  include "esp32_spi.h"
 #  include "esp32_board_spislavedev.h"
 #endif
 
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
index 27b9e36b82f75..0045b99a89e42 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
@@ -29,13 +29,9 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
index d772ca1cf51ae..41e91a29cd624 100644
--- a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
@@ -33,11 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
-
-#include <syslog.h>
 #include <errno.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/himem/himem.h>
diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
index e7becaec67298..b974c138c68f5 100644
--- a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #if defined(CONFIG_ESP32_EFUSE)
diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
index b7fde28c3039d..4e5cdb0dcc44e 100644
--- a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
@@ -33,11 +33,8 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
-#include <syslog.h>
 #include <errno.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/himem/himem.h>
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
index 8ee68f28a16b3..747f169aad849 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
@@ -33,11 +33,8 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
-#include <syslog.h>
 #include <errno.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/himem/himem.h>
diff --git a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c
index 0c3b0cf212cd4..c46866819e3b1 100644
--- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #if defined(CONFIG_ESP32_EFUSE)
diff --git a/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c
index b917891100ec3..0bbcbc10460c8 100644
--- a/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 
diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c
index 01bccb4c407eb..ae6ab94c82b52 100644
--- a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #if defined(CONFIG_ESP32_EFUSE)
diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c b/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c
index 068587f345c4c..9b6057a2d12b8 100644
--- a/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #if defined(CONFIG_ESP32_EFUSE)
diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
index 318f7af85e27f..888744276d4b5 100644
--- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
+++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 #include <errno.h>
 
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
index 9a519c8a53e2d..918ba4ed98df3 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c
index 6e52251a7777e..d00a4d2f5d1e0 100644
--- a/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c
+++ b/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32s3/common/src/esp32s3_lan9250.c b/boards/xtensa/esp32s3/common/src/esp32s3_lan9250.c
index 9311cf1d3c090..ee3439ed6e789 100644
--- a/boards/xtensa/esp32s3/common/src/esp32s3_lan9250.c
+++ b/boards/xtensa/esp32s3/common/src/esp32s3_lan9250.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <nuttx/irq.h>
 #include <nuttx/net/lan9250.h>
 #include <arch/board/board.h>
 
diff --git a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c
index 954ca98a17444..17581e3b82230 100644
--- a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
index b68eaac18bfbd..13ecad5863d05 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
@@ -26,14 +26,12 @@
 
 #include <nuttx/config.h>
 
-#include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
 #include <stdio.h>
 
diff --git a/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c
index db276da7ae82e..93aaa33fbe852 100644
--- a/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
index 63090fde7856e..74d06fc1e2c75 100644
--- a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
index 767ee878d6265..cf9a4573a08a2 100644
--- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_lcd.c b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_lcd.c
index 0aca5268b07b8..135255f313b80 100644
--- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_lcd.c
+++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_lcd.c
@@ -31,7 +31,6 @@
 #include <debug.h>
 #include <assert.h>
 #include <sys/param.h>
-#include <unistd.h>
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 #include <nuttx/video/fb.h>
diff --git a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c
index 94930eb3d0b13..521368e447d03 100644
--- a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c
index c9687136b7609..2f6624ff0d02f 100644
--- a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_bringup.c
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <syslog.h>
 #include <debug.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <nuttx/fs/fs.h>
diff --git a/drivers/audio/tone.c b/drivers/audio/tone.c
index 7db86dcec72ee..5465258d75ff5 100644
--- a/drivers/audio/tone.c
+++ b/drivers/audio/tone.c
@@ -38,7 +38,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index c4a667b62dab3..7fd2d83e1cf95 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -51,7 +51,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/random.h>
 
-#include <nuttx/arch.h>
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/stmpe811.h>
 
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index c4d61896487ac..39be605d33016 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -30,7 +30,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/drivers/loop/losetup.c b/drivers/loop/losetup.c
index aa20c6f5419fc..78057b08ed439 100644
--- a/drivers/loop/losetup.c
+++ b/drivers/loop/losetup.c
@@ -28,7 +28,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 
diff --git a/drivers/mtd/mx25rxx.c b/drivers/mtd/mx25rxx.c
index e809539cb9b8d..3437ec7947c92 100644
--- a/drivers/mtd/mx25rxx.c
+++ b/drivers/mtd/mx25rxx.c
@@ -39,7 +39,6 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/signal.h>
-#include <nuttx/signal.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/qspi.h>
 #include <nuttx/mtd/mtd.h>
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 8393e79463e26..becda0e1cef56 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -35,7 +35,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <time.h>
 #include <string.h>
 #include <assert.h>
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index 76e2e5840a074..c26efa8cb195e 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -35,7 +35,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <time.h>
 #include <string.h>
 #include <assert.h>
diff --git a/drivers/net/lan9250.c b/drivers/net/lan9250.c
index 7e3e621495c10..8f02fb83ea3fa 100644
--- a/drivers/net/lan9250.c
+++ b/drivers/net/lan9250.c
@@ -28,7 +28,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <time.h>
 #include <string.h>
 #include <assert.h>
diff --git a/drivers/sensors/kxtj9.c b/drivers/sensors/kxtj9.c
index a1a2f256a7740..f8b6ac210d2c2 100644
--- a/drivers/sensors/kxtj9.c
+++ b/drivers/sensors/kxtj9.c
@@ -29,7 +29,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/drivers/wireless/bluetooth/bt_null.c b/drivers/wireless/bluetooth/bt_null.c
index 8ea3e98f3c09a..2a262ddac90ff 100644
--- a/drivers/wireless/bluetooth/bt_null.c
+++ b/drivers/wireless/bluetooth/bt_null.c
@@ -37,7 +37,6 @@
 #include <nuttx/net/bluetooth.h>
 #include <nuttx/wireless/bluetooth/bt_hci.h>
 #include <nuttx/wireless/bluetooth/bt_null.h>
-#include <nuttx/wireless/bluetooth/bt_driver.h>
 
 /****************************************************************************
  * Private Function Prototypes
diff --git a/include/nuttx/lib/math.h b/include/nuttx/lib/math.h
index 9e158cbda5120..fb707f126debc 100644
--- a/include/nuttx/lib/math.h
+++ b/include/nuttx/lib/math.h
@@ -64,13 +64,6 @@
  *
  ****************************************************************************/
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/compiler.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/libs/libc/modlib/modlib_symtab.c b/libs/libc/modlib/modlib_symtab.c
index e7b34c604ee1e..e84d817f5554b 100644
--- a/libs/libc/modlib/modlib_symtab.c
+++ b/libs/libc/modlib/modlib_symtab.c
@@ -30,7 +30,6 @@
 
 #include <nuttx/symtab.h>
 #include <nuttx/lib/modlib.h>
-#include <nuttx/symtab.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/pthread/pthread_spinlock.c b/libs/libc/pthread/pthread_spinlock.c
index 2af32e5a745c4..8c020282e7605 100644
--- a/libs/libc/pthread/pthread_spinlock.c
+++ b/libs/libc/pthread/pthread_spinlock.c
@@ -35,8 +35,6 @@
 #include <debug.h>
 #include <pthread.h>
 #include <sched.h>
-#include <assert.h>
-#include <errno.h>
 
 #ifdef CONFIG_PTHREAD_SPINLOCKS
 
diff --git a/net/local/local.h b/net/local/local.h
index 819e5ec50d471..a15e59eeef58b 100644
--- a/net/local/local.h
+++ b/net/local/local.h
@@ -33,7 +33,6 @@
 #include <sys/un.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <poll.h>
 
 #include <nuttx/fs/fs.h>
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index ce80317def747..3ad02a6d5f206 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -54,7 +54,6 @@
 #include <nuttx/mm/iob.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/tcp.h>
-#include <nuttx/net/net.h>
 
 #include "netdev/netdev.h"
 #include "devif/devif.h"
diff --git a/sched/misc/assert.c b/sched/misc/assert.c
index b23072c59ab3e..516d94ea101ca 100644
--- a/sched/misc/assert.c
+++ b/sched/misc/assert.c
@@ -34,7 +34,6 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/irq.h>
 #include <nuttx/init.h>
-#include <nuttx/fs/fs.h>
 #include <nuttx/tls.h>
 #include <nuttx/signal.h>
 #include <nuttx/sched.h>
diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c
index 7ff1c7c3c30da..bd55404666778 100644
--- a/sched/paging/pg_worker.c
+++ b/sched/paging/pg_worker.c
@@ -39,7 +39,6 @@
 #include <nuttx/signal.h>
 #include <nuttx/page.h>
 #include <nuttx/clock.h>
-#include <nuttx/signal.h>
 
 #include "sched/sched.h"
 #include "paging/paging.h"