diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index f701f03c9..5bb3a094f 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -115,7 +115,6 @@ C_SRCS += arch/x86/ioapic.c
 C_SRCS += arch/x86/lapic.c
 S_SRCS += arch/x86/trampoline.S
 C_SRCS += arch/x86/cpu.c
-C_SRCS += arch/x86/softirq.c
 C_SRCS += arch/x86/cpuid.c
 C_SRCS += arch/x86/mmu.c
 C_SRCS += arch/x86/pagetable.c
@@ -160,6 +159,7 @@ C_SRCS += lib/string.c
 C_SRCS += lib/memory.c
 C_SRCS += lib/crypto/hkdf.c
 C_SRCS += lib/sprintf.c
+C_SRCS += common/softirq.c
 C_SRCS += common/hv_main.c
 C_SRCS += common/hypercall.c
 C_SRCS += common/trusty_hypercall.c
diff --git a/hypervisor/arch/x86/timer.c b/hypervisor/arch/x86/timer.c
index dca04fbd1..9d78d74ea 100644
--- a/hypervisor/arch/x86/timer.c
+++ b/hypervisor/arch/x86/timer.c
@@ -5,6 +5,7 @@
  */
 
 #include <hypervisor.h>
+#include <softirq.h>
 
 #define MAX_TIMER_ACTIONS	32U
 #define TIMER_IRQ		(NR_IRQS - 1U)
diff --git a/hypervisor/common/ptdev.c b/hypervisor/common/ptdev.c
index 3fe607eaa..f49531429 100644
--- a/hypervisor/common/ptdev.c
+++ b/hypervisor/common/ptdev.c
@@ -5,6 +5,7 @@
  */
 
 #include <hypervisor.h>
+#include <softirq.h>
 #include <ptdev.h>
 
 /* SOFTIRQ_DEV_ASSIGN list for all CPUs */
diff --git a/hypervisor/arch/x86/softirq.c b/hypervisor/common/softirq.c
similarity index 98%
rename from hypervisor/arch/x86/softirq.c
rename to hypervisor/common/softirq.c
index b67355c2a..eda8fdedd 100644
--- a/hypervisor/arch/x86/softirq.c
+++ b/hypervisor/common/softirq.c
@@ -5,6 +5,7 @@
  */
 
 #include <hypervisor.h>
+#include <softirq.h>
 
 void disable_softirq(uint16_t cpu_id)
 {
diff --git a/hypervisor/include/arch/x86/hv_arch.h b/hypervisor/include/arch/x86/hv_arch.h
index 4ce7055b6..21d29734c 100644
--- a/hypervisor/include/arch/x86/hv_arch.h
+++ b/hypervisor/include/arch/x86/hv_arch.h
@@ -28,7 +28,6 @@
 #include <pgtable.h>
 #include <irq.h>
 #include <timer.h>
-#include <softirq.h>
 #include <vmx.h>
 #include <assign.h>
 #include <vtd.h>
diff --git a/hypervisor/include/arch/x86/softirq.h b/hypervisor/include/common/softirq.h
similarity index 100%
rename from hypervisor/include/arch/x86/softirq.h
rename to hypervisor/include/common/softirq.h