diff --git a/hypervisor/arch/x86/cpu_caps.c b/hypervisor/arch/x86/cpu_caps.c
index fe520aa42..bf5379f83 100644
--- a/hypervisor/arch/x86/cpu_caps.c
+++ b/hypervisor/arch/x86/cpu_caps.c
@@ -16,6 +16,7 @@
 #include <cpu_caps.h>
 #include <errno.h>
 #include <logmsg.h>
+#include <vmcs.h>
 
 /* TODO: add more capability per requirement */
 /* APICv features */
diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
index 2c9614a97..12c3335b3 100644
--- a/hypervisor/arch/x86/guest/vcpu.c
+++ b/hypervisor/arch/x86/guest/vcpu.c
@@ -5,6 +5,7 @@
  */
 
 #include <types.h>
+#include <errno.h>
 #include <vcpu.h>
 #include <bits.h>
 #include <vmx.h>
@@ -12,6 +13,10 @@
 #include <cpu_caps.h>
 #include <per_cpu.h>
 #include <init.h>
+#include <atomic.h>
+#include <vm.h>
+#include <vmcs.h>
+#include <sprintf.h>
 
 inline uint64_t vcpu_get_gpreg(const struct acrn_vcpu *vcpu, uint32_t reg)
 {
diff --git a/hypervisor/include/arch/x86/guest/instr_emul.h b/hypervisor/include/arch/x86/guest/instr_emul.h
index 82db9ed93..ce81312e9 100644
--- a/hypervisor/include/arch/x86/guest/instr_emul.h
+++ b/hypervisor/include/arch/x86/guest/instr_emul.h
@@ -30,6 +30,8 @@
 #ifndef INSTR_EMUL_H
 #define INSTR_EMUL_H
 
+#include <vcpu.h>
+
 struct instr_emul_vie_op {
 	uint8_t		op_type;	/* type of operation (e.g. MOV) */
 	uint16_t	op_flags;
diff --git a/hypervisor/include/arch/x86/irq.h b/hypervisor/include/arch/x86/irq.h
index 7f9d0849f..9eb323de0 100644
--- a/hypervisor/include/arch/x86/irq.h
+++ b/hypervisor/include/arch/x86/irq.h
@@ -7,6 +7,9 @@
 #ifndef ARCH_IRQ_H
 #define ARCH_IRQ_H
 
+#include <acrn_common.h>
+#include <util.h>
+
 /**
  * @file arch/x86/irq.h
  *
diff --git a/hypervisor/include/arch/x86/per_cpu.h b/hypervisor/include/arch/x86/per_cpu.h
index 7cb3a8039..87cb34ed8 100644
--- a/hypervisor/include/arch/x86/per_cpu.h
+++ b/hypervisor/include/arch/x86/per_cpu.h
@@ -7,15 +7,13 @@
 #ifndef PER_CPU_H
 #define PER_CPU_H
 
-#include <hypervisor.h>
-#include <schedule.h>
-#include <irq.h>
+#include <types.h>
 #include <sbuf.h>
-#include <gdt.h>
-#include <timer.h>
-#include <logmsg.h>
+#include <irq.h>
 #include <instr_emul.h>
 #include <profiling.h>
+#include <logmsg.h>
+#include <gdt.h>
 #include <security.h>
 
 struct per_cpu_region {