diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index d23723b65..e19849756 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -13,7 +13,7 @@
 #include <asm/guest/vept.h>
 #include <asm/vtd.h>
 #include <asm/lapic.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <per_cpu.h>
 #include <asm/cpufeatures.h>
 #include <asm/cpu_caps.h>
diff --git a/hypervisor/arch/x86/exception.c b/hypervisor/arch/x86/exception.c
index 88d88c6f4..eebc632ff 100644
--- a/hypervisor/arch/x86/exception.c
+++ b/hypervisor/arch/x86/exception.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <asm/irq.h>
+#include <irq.h>
 #include <debug/dump.h>
 #include <cpu.h>
 
diff --git a/hypervisor/arch/x86/guest/assign.c b/hypervisor/arch/x86/guest/assign.c
index d89046a14..058c010c6 100644
--- a/hypervisor/arch/x86/guest/assign.c
+++ b/hypervisor/arch/x86/guest/assign.c
@@ -13,7 +13,7 @@
 #include <per_cpu.h>
 #include <asm/ioapic.h>
 #include <pgtable.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <asm/guest/optee.h>
 
 /*
diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
index b31122c9d..3db222f78 100755
--- a/hypervisor/arch/x86/guest/vcpu.c
+++ b/hypervisor/arch/x86/guest/vcpu.c
@@ -21,7 +21,7 @@
 #include <asm/mmu.h>
 #include <lib/sprintf.h>
 #include <asm/lapic.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <console.h>
 #include <trace.h>
 #include <asm/guest/vmexit.h>
diff --git a/hypervisor/arch/x86/guest/virq.c b/hypervisor/arch/x86/guest/virq.c
index 652e49057..214f29b0c 100644
--- a/hypervisor/arch/x86/guest/virq.c
+++ b/hypervisor/arch/x86/guest/virq.c
@@ -17,7 +17,7 @@
 #include <asm/guest/lock_instr_emul.h>
 #include <trace.h>
 #include <logmsg.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <common/notify.h>
 
 #define EXCEPTION_ERROR_CODE_VALID  8U
diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c
index 3fb12465d..1140d0b38 100644
--- a/hypervisor/arch/x86/guest/vlapic.c
+++ b/hypervisor/arch/x86/guest/vlapic.c
@@ -43,7 +43,7 @@
 #include <asm/guest/ept.h>
 #include <trace.h>
 #include <logmsg.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <ticks.h>
 #include "vlapic_priv.h"
 
diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 5887d1e9c..fcf64aea1 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -37,7 +37,7 @@
 #include <asm/guest/assign.h>
 #include <vgpio.h>
 #include <asm/rtcm.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <uart16550.h>
 #include <vcpu.h>
 #ifdef CONFIG_SECURITY_VM_FIXUP
diff --git a/hypervisor/arch/x86/hw_thermal.c b/hypervisor/arch/x86/hw_thermal.c
index 5ca56da8c..522b3f143 100644
--- a/hypervisor/arch/x86/hw_thermal.c
+++ b/hypervisor/arch/x86/hw_thermal.c
@@ -10,7 +10,7 @@
 #include <logmsg.h>
 #include <cpu.h>
 #include <asm/msr.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <asm/apicreg.h>
 #include <hw/hw_thermal.h>
 
diff --git a/hypervisor/arch/x86/ioapic.c b/hypervisor/arch/x86/ioapic.c
index 9abb2b2e0..52aa15cce 100644
--- a/hypervisor/arch/x86/ioapic.c
+++ b/hypervisor/arch/x86/ioapic.c
@@ -12,7 +12,7 @@
 #include <spinlock.h>
 #include <mmu.h>
 #include <asm/ioapic.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <io.h>
 #include <acpi.h>
 #include <logmsg.h>
diff --git a/hypervisor/arch/x86/irq.c b/hypervisor/arch/x86/irq.c
index 1ef5494c5..d162fbeb1 100644
--- a/hypervisor/arch/x86/irq.c
+++ b/hypervisor/arch/x86/irq.c
@@ -9,7 +9,7 @@
 #include <spinlock.h>
 #include <per_cpu.h>
 #include <io.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <asm/idt.h>
 #include <asm/ioapic.h>
 #include <asm/lapic.h>
diff --git a/hypervisor/arch/x86/lapic.c b/hypervisor/arch/x86/lapic.c
index 7a80d6643..b7064d1d8 100644
--- a/hypervisor/arch/x86/lapic.c
+++ b/hypervisor/arch/x86/lapic.c
@@ -12,7 +12,7 @@
 #include <asm/cpu_caps.h>
 #include <asm/lapic.h>
 #include <asm/apicreg.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <delay.h>
 #include <cpu.h>
 
diff --git a/hypervisor/arch/x86/nmi.c b/hypervisor/arch/x86/nmi.c
index 9f1f9db60..5d1ebcce5 100644
--- a/hypervisor/arch/x86/nmi.c
+++ b/hypervisor/arch/x86/nmi.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <asm/irq.h>
+#include <irq.h>
 #include <asm/vmx.h>
 
 #include <vcpu.h>
diff --git a/hypervisor/arch/x86/notify.c b/hypervisor/arch/x86/notify.c
index 0ebe046f4..0663af4a6 100644
--- a/hypervisor/arch/x86/notify.c
+++ b/hypervisor/arch/x86/notify.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <atomic.h>
 #include <bits.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <asm/cpu.h>
 #include <asm/per_cpu.h>
 #include <asm/lapic.h>
diff --git a/hypervisor/arch/x86/tsc_deadline_timer.c b/hypervisor/arch/x86/tsc_deadline_timer.c
index 5fe46921b..77ae4b895 100644
--- a/hypervisor/arch/x86/tsc_deadline_timer.c
+++ b/hypervisor/arch/x86/tsc_deadline_timer.c
@@ -11,7 +11,7 @@
 #include <timer.h>
 #include <cpu.h>
 #include <asm/msr.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <asm/apicreg.h>
 
 /* run in interrupt context */
diff --git a/hypervisor/arch/x86/vtd.c b/hypervisor/arch/x86/vtd.c
index 660a82342..61bd67d59 100644
--- a/hypervisor/arch/x86/vtd.c
+++ b/hypervisor/arch/x86/vtd.c
@@ -13,7 +13,7 @@
 #include <asm/cpu_caps.h>
 #include <irq.h>
 #include <mmu.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <io.h>
 #include <asm/lapic.h>
 #include <asm/vtd.h>
diff --git a/hypervisor/boot/guest/vboot_info.c b/hypervisor/boot/guest/vboot_info.c
index 502b6a25b..ec21eae81 100644
--- a/hypervisor/boot/guest/vboot_info.c
+++ b/hypervisor/boot/guest/vboot_info.c
@@ -8,7 +8,7 @@
 #include <rtl.h>
 #include <errno.h>
 #include <asm/per_cpu.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <boot.h>
 #include <pgtable.h>
 #include <asm/mmu.h>
diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c
index 5e84cf9fc..db5b09b92 100644
--- a/hypervisor/common/hypercall.c
+++ b/hypervisor/common/hypercall.c
@@ -23,7 +23,7 @@
 #include <ivshmem.h>
 #include <vmcs9900.h>
 #include <asm/rtcm.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <ticks.h>
 #include <asm/cpuid.h>
 #include <vroot_port.h>
diff --git a/hypervisor/common/irq.c b/hypervisor/common/irq.c
index d747e6be7..e32b61027 100644
--- a/hypervisor/common/irq.c
+++ b/hypervisor/common/irq.c
@@ -8,7 +8,6 @@
 #include <bits.h>
 #include <irq.h>
 #include <common/softirq.h>
-#include <asm/irq.h>
 #include <per_cpu.h>
 
 static spinlock_t irq_alloc_spinlock = { .head = 0U, .tail = 0U, };
diff --git a/hypervisor/common/timer.c b/hypervisor/common/timer.c
index f070f1959..0a0927394 100644
--- a/hypervisor/common/timer.c
+++ b/hypervisor/common/timer.c
@@ -9,7 +9,7 @@
 #include <per_cpu.h>
 #include <softirq.h>
 #include <trace.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <ticks.h>
 #include <timer.h>
 
diff --git a/hypervisor/debug/x86/profiling.c b/hypervisor/debug/x86/profiling.c
index e5f935814..065838355 100644
--- a/hypervisor/debug/x86/profiling.c
+++ b/hypervisor/debug/x86/profiling.c
@@ -7,7 +7,7 @@
 
 #include <types.h>
 #include <errno.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <per_cpu.h>
 #include <vm.h>
 #include <asm/pgtable.h>
diff --git a/hypervisor/debug/x86/x86_shell.c b/hypervisor/debug/x86/x86_shell.c
index 0fcbc7929..3640750dd 100644
--- a/hypervisor/debug/x86/x86_shell.c
+++ b/hypervisor/debug/x86/x86_shell.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <bits.h>
 #include <vm.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <console.h>
 #include <per_cpu.h>
 #include <asm/vmx.h>
diff --git a/hypervisor/dm/io_req.c b/hypervisor/dm/io_req.c
index 47bf3dc99..4049b13f1 100644
--- a/hypervisor/dm/io_req.c
+++ b/hypervisor/dm/io_req.c
@@ -4,7 +4,7 @@
  */
 
 #include <vm.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <errno.h>
 #include <logmsg.h>
 #include <sbuf.h>
diff --git a/hypervisor/dm/vioapic.c b/hypervisor/dm/vioapic.c
index b6759c4c1..f1acc0be1 100644
--- a/hypervisor/dm/vioapic.c
+++ b/hypervisor/dm/vioapic.c
@@ -31,7 +31,7 @@
 
 #include <vm.h>
 #include <errno.h>
-#include <asm/irq.h>
+#include <irq.h>
 #include <asm/guest/ept.h>
 #include <asm/guest/assign.h>
 #include <logmsg.h>
diff --git a/hypervisor/dm/vpic.c b/hypervisor/dm/vpic.c
index dcd1bc3e7..0743426f6 100644
--- a/hypervisor/dm/vpic.c
+++ b/hypervisor/dm/vpic.c
@@ -33,7 +33,7 @@
 #include <spinlock.h>
 #include <logmsg.h>
 #include <asm/ioapic.h>
-#include <asm/irq.h>
+#include <irq.h>
 
 #define DBG_LEVEL_PIC	6U
 
diff --git a/hypervisor/release/dump.c b/hypervisor/release/dump.c
index 9a4116d7b..b3c539232 100644
--- a/hypervisor/release/dump.c
+++ b/hypervisor/release/dump.c
@@ -5,7 +5,7 @@
  */
 
 #include <types.h>
-#include <asm/irq.h>
+#include <irq.h>
 
 struct intr_excp_ctx;