diff --git a/arch/ceva/include/arch.h b/arch/ceva/include/arch.h
index ecb877d07bd..1d17a585cf3 100644
--- a/arch/ceva/include/arch.h
+++ b/arch/ceva/include/arch.h
@@ -31,7 +31,6 @@
 
 #include <nuttx/config.h>
 
-#include <arch/irq.h>
 #include <arch/chip/chip.h>
 
 /****************************************************************************
diff --git a/arch/risc-v/include/bl602/chip.h b/arch/risc-v/include/bl602/chip.h
index afc95b0b160..837c29ed813 100644
--- a/arch/risc-v/include/bl602/chip.h
+++ b/arch/risc-v/include/bl602/chip.h
@@ -25,11 +25,4 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <arch/irq.h>
-
 #endif /* __ARCH_RISCV_INCLUDE_BL602_CHIP_H */
diff --git a/arch/risc-v/include/bl602/irq.h b/arch/risc-v/include/bl602/irq.h
index 3f5fb0fd9b2..cfcf71554ef 100644
--- a/arch/risc-v/include/bl602/irq.h
+++ b/arch/risc-v/include/bl602/irq.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/include/c906/chip.h b/arch/risc-v/include/c906/chip.h
index b284b620afd..c946ae74785 100644
--- a/arch/risc-v/include/c906/chip.h
+++ b/arch/risc-v/include/c906/chip.h
@@ -25,10 +25,4 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-#include <sys/types.h>
-#include <stdint.h>
-
-#include <arch/irq.h>
-
 #endif /* __ARCH_RISCV_INCLUDE_C906_CHIP_H */
diff --git a/arch/risc-v/include/c906/irq.h b/arch/risc-v/include/c906/irq.h
index 4c637c444dc..f797e9dfdb9 100644
--- a/arch/risc-v/include/c906/irq.h
+++ b/arch/risc-v/include/c906/irq.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/include/esp32c3/irq.h b/arch/risc-v/include/esp32c3/irq.h
index 60262d8ea6c..5768d63001e 100644
--- a/arch/risc-v/include/esp32c3/irq.h
+++ b/arch/risc-v/include/esp32c3/irq.h
@@ -25,13 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ASSEMBLY__
-#  include <arch/csr.h>
-#  include <arch/irq.h>
-#endif
-
-#include <sys/types.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/include/fe310/irq.h b/arch/risc-v/include/fe310/irq.h
index a65dc3bbc62..8b336125c09 100644
--- a/arch/risc-v/include/fe310/irq.h
+++ b/arch/risc-v/include/fe310/irq.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/include/k210/irq.h b/arch/risc-v/include/k210/irq.h
index c1b595ff02c..0cede0e33b3 100644
--- a/arch/risc-v/include/k210/irq.h
+++ b/arch/risc-v/include/k210/irq.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/include/litex/irq.h b/arch/risc-v/include/litex/irq.h
index 24b8d53760b..6a01e2efe05 100644
--- a/arch/risc-v/include/litex/irq.h
+++ b/arch/risc-v/include/litex/irq.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/include/mpfs/chip.h b/arch/risc-v/include/mpfs/chip.h
index 0efd02220d0..145dc266e98 100755
--- a/arch/risc-v/include/mpfs/chip.h
+++ b/arch/risc-v/include/mpfs/chip.h
@@ -25,10 +25,4 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-#include <sys/types.h>
-#include <stdint.h>
-
-#include <arch/irq.h>
-
 #endif /* __ARCH_RISCV_INCLUDE_MPFS_CHIP_H */
diff --git a/arch/risc-v/include/mpfs/irq.h b/arch/risc-v/include/mpfs/irq.h
index eb3c206ef03..fc968edd21d 100755
--- a/arch/risc-v/include/mpfs/irq.h
+++ b/arch/risc-v/include/mpfs/irq.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/include/qemu-rv/irq.h b/arch/risc-v/include/qemu-rv/irq.h
index 715d925608b..833633909ee 100644
--- a/arch/risc-v/include/qemu-rv/irq.h
+++ b/arch/risc-v/include/qemu-rv/irq.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/include/rv32m1/irq.h b/arch/risc-v/include/rv32m1/irq.h
index 6a1a9976e6d..a11dea4a706 100644
--- a/arch/risc-v/include/rv32m1/irq.h
+++ b/arch/risc-v/include/rv32m1/irq.h
@@ -26,7 +26,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <arch/irq.h>
 
 #ifdef CONFIG_ARCH_CHIP_RV32M1_RI5CY
 #  include "rv32m1ri5cy_irq.h"
diff --git a/arch/risc-v/include/rv32m1/rv32m1ri5cy_irq.h b/arch/risc-v/include/rv32m1/rv32m1ri5cy_irq.h
index f528d126e47..56e10a763c1 100644
--- a/arch/risc-v/include/rv32m1/rv32m1ri5cy_irq.h
+++ b/arch/risc-v/include/rv32m1/rv32m1ri5cy_irq.h
@@ -25,8 +25,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/z16/include/arch.h b/arch/z16/include/arch.h
index 2b0a81f56f8..f6db60dc78b 100644
--- a/arch/z16/include/arch.h
+++ b/arch/z16/include/arch.h
@@ -29,8 +29,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/z80/include/z180/arch.h b/arch/z80/include/z180/arch.h
index 5ba52a67fb6..bc7d60acdd1 100644
--- a/arch/z80/include/z180/arch.h
+++ b/arch/z80/include/z180/arch.h
@@ -33,8 +33,6 @@
 
 #include <stdint.h>
 
-#include <arch/irq.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/