diff --git a/arch/risc-v/src/bl602/bl602_irq.c b/arch/risc-v/src/bl602/bl602_irq.c
index 7332fd53ba..ff5c0486ab 100644
--- a/arch/risc-v/src/bl602/bl602_irq.c
+++ b/arch/risc-v/src/bl602/bl602_irq.c
@@ -30,9 +30,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 #include <nuttx/irq.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "hardware/bl602_clic.h"
diff --git a/arch/risc-v/src/bl602/bl602_irq_dispatch.c b/arch/risc-v/src/bl602/bl602_irq_dispatch.c
index f8b6d878cb..add7971259 100644
--- a/arch/risc-v/src/bl602/bl602_irq_dispatch.c
+++ b/arch/risc-v/src/bl602/bl602_irq_dispatch.c
@@ -29,8 +29,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "chip.h"
diff --git a/arch/risc-v/src/c906/c906_allocateheap.c b/arch/risc-v/src/c906/c906_allocateheap.c
index 95407246cc..cc28eda59a 100644
--- a/arch/risc-v/src/c906/c906_allocateheap.c
+++ b/arch/risc-v/src/c906/c906_allocateheap.c
@@ -28,8 +28,6 @@
 #include <nuttx/userspace.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "c906.h"
 
diff --git a/arch/risc-v/src/c906/c906_irq_dispatch.c b/arch/risc-v/src/c906/c906_irq_dispatch.c
index 9e125a40b3..e559892d85 100644
--- a/arch/risc-v/src/c906/c906_irq_dispatch.c
+++ b/arch/risc-v/src/c906/c906_irq_dispatch.c
@@ -29,12 +29,12 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "group/group.h"
 
+#include "c906_memorymap.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/src/common/riscv_checkstack.c b/arch/risc-v/src/common/riscv_checkstack.c
index b384f95267..2f8e0a0580 100644
--- a/arch/risc-v/src/common/riscv_checkstack.c
+++ b/arch/risc-v/src/common/riscv_checkstack.c
@@ -31,7 +31,6 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 
 #include "sched/sched.h"
 #include "riscv_internal.h"
diff --git a/arch/risc-v/src/common/riscv_exception.c b/arch/risc-v/src/common/riscv_exception.c
index 5be6b3331e..db27d20720 100644
--- a/arch/risc-v/src/common/riscv_exception.c
+++ b/arch/risc-v/src/common/riscv_exception.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <nuttx/syslog/syslog.h>
 
 #include "riscv_internal.h"
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_irq.c b/arch/risc-v/src/esp32c3/esp32c3_irq.c
index c3f329d6c7..e4305fc5ba 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_irq.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_irq.c
@@ -31,8 +31,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "hardware/esp32c3_interrupt.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_resetcause.c b/arch/risc-v/src/esp32c3/esp32c3_resetcause.c
index 86b8ebe83d..00ede72ff4 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_resetcause.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_resetcause.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 
 #include "hardware/esp32c3_rtccntl.h"
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_systemreset.c b/arch/risc-v/src/esp32c3/esp32c3_systemreset.c
index 88b0d74d99..219f5735cc 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_systemreset.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_systemreset.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 
 #include "hardware/esp32c3_rtccntl.h"
 #include "esp32c3.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_uid.c b/arch/risc-v/src/esp32c3/esp32c3_uid.c
index 71da0b6bb4..e823d05628 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_uid.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_uid.c
@@ -26,9 +26,6 @@
 
 #include <stdint.h>
 
-#include <nuttx/arch.h>
-#include <nuttx/board.h>
-
 #include "hardware/esp32c3_efuse.h"
 #include "esp32c3.h"
 
diff --git a/arch/risc-v/src/fe310/fe310_irq_dispatch.c b/arch/risc-v/src/fe310/fe310_irq_dispatch.c
index 0771c675f3..d03ac0846b 100644
--- a/arch/risc-v/src/fe310/fe310_irq_dispatch.c
+++ b/arch/risc-v/src/fe310/fe310_irq_dispatch.c
@@ -29,8 +29,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "fe310_gpio.h"
diff --git a/arch/risc-v/src/k210/k210_irq_dispatch.c b/arch/risc-v/src/k210/k210_irq_dispatch.c
index b5b5db5668..79da3423e7 100644
--- a/arch/risc-v/src/k210/k210_irq_dispatch.c
+++ b/arch/risc-v/src/k210/k210_irq_dispatch.c
@@ -29,12 +29,12 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "group/group.h"
 
+#include "k210_memorymap.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/src/litex/litex_irq.c b/arch/risc-v/src/litex/litex_irq.c
index 517be49a00..c3587ac5d6 100644
--- a/arch/risc-v/src/litex/litex_irq.c
+++ b/arch/risc-v/src/litex/litex_irq.c
@@ -30,9 +30,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 #include <nuttx/irq.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "litex.h"
diff --git a/arch/risc-v/src/litex/litex_irq_dispatch.c b/arch/risc-v/src/litex/litex_irq_dispatch.c
index 15338d663a..c6a80b26a8 100644
--- a/arch/risc-v/src/litex/litex_irq_dispatch.c
+++ b/arch/risc-v/src/litex/litex_irq_dispatch.c
@@ -29,8 +29,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "litex.h"
diff --git a/arch/risc-v/src/mpfs/mpfs_allocateheap.c b/arch/risc-v/src/mpfs/mpfs_allocateheap.c
index 8a27c4cd57..692203ad88 100755
--- a/arch/risc-v/src/mpfs/mpfs_allocateheap.c
+++ b/arch/risc-v/src/mpfs/mpfs_allocateheap.c
@@ -28,8 +28,6 @@
 #include <nuttx/userspace.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #ifdef CONFIG_MM_KERNEL_HEAP
 #include <arch/board/board_memorymap.h>
diff --git a/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c b/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
index 67337de92b..168446df0e 100755
--- a/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
+++ b/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
@@ -29,8 +29,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 
diff --git a/arch/risc-v/src/mpfs/mpfs_systemreset.c b/arch/risc-v/src/mpfs/mpfs_systemreset.c
index 26478a519d..38fd714367 100644
--- a/arch/risc-v/src/mpfs/mpfs_systemreset.c
+++ b/arch/risc-v/src/mpfs/mpfs_systemreset.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 
 #include "riscv_internal.h"
 #include "hardware/mpfs_memorymap.h"
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_irq.c b/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
index 9a3a704509..ce0221146e 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
@@ -30,9 +30,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 #include <nuttx/irq.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "chip.h"
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c b/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
index 645789c964..68780f11bb 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
@@ -29,8 +29,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "hardware/qemu_rv_memorymap.h"
diff --git a/arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c b/arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c
index 474ed2c580..cbe08ed2c1 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c
@@ -29,8 +29,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "riscv_internal.h"
 #include "rv32m1.h"