diff --git a/bsps/aarch64/shared/irq/irq-arm-gicvx-aarch64.c b/bsps/aarch64/shared/irq/irq-arm-gicvx-aarch64.c
index 5caf717bf1..4c26ec3c2b 100644
--- a/bsps/aarch64/shared/irq/irq-arm-gicvx-aarch64.c
+++ b/bsps/aarch64/shared/irq/irq-arm-gicvx-aarch64.c
@@ -36,7 +36,6 @@
 
 #include <dev/irq/arm-gic-irq.h>
 #include <bsp/irq-generic.h>
-#include <rtems/score/cpu_irq.h>
 
 void arm_interrupt_handler_dispatch(rtems_vector_number vector)
 {
diff --git a/bsps/shared/dev/irq/arm-gicv3.c b/bsps/shared/dev/irq/arm-gicv3.c
index 65b049cd5a..77128adb5b 100644
--- a/bsps/shared/dev/irq/arm-gicv3.c
+++ b/bsps/shared/dev/irq/arm-gicv3.c
@@ -31,6 +31,12 @@
 #include <bsp/irq-generic.h>
 #include <bsp/start.h>
 
+#ifdef ARM_MULTILIB_ARCH_V4
+#include <rtems/score/armv4.h>
+#else
+#include <rtems/score/cpu_irq.h>
+#endif
+
 #define PRIORITY_DEFAULT 127
 
 #define MPIDR_AFFINITY2(val) BSP_FLD64(val, 16, 23)