diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
index ca624891d..2c9614a97 100644
--- a/hypervisor/arch/x86/guest/vcpu.c
+++ b/hypervisor/arch/x86/guest/vcpu.c
@@ -4,10 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
-#include <schedule.h>
-#include <security.h>
-#include <virtual_cr.h>
+#include <types.h>
+#include <vcpu.h>
+#include <bits.h>
+#include <vmx.h>
+#include <logmsg.h>
+#include <cpu_caps.h>
+#include <per_cpu.h>
 #include <init.h>
 
 inline uint64_t vcpu_get_gpreg(const struct acrn_vcpu *vcpu, uint32_t reg)
diff --git a/hypervisor/include/arch/x86/guest/vcpu.h b/hypervisor/include/arch/x86/guest/vcpu.h
index 27f0e3770..a42507717 100644
--- a/hypervisor/include/arch/x86/guest/vcpu.h
+++ b/hypervisor/include/arch/x86/guest/vcpu.h
@@ -50,6 +50,8 @@
 
 #ifndef ASSEMBLER
 
+#include <types.h>
+#include <acrn_common.h>
 #include <guest_memory.h>
 #include <virtual_cr.h>
 #include <vlapic.h>
diff --git a/hypervisor/include/arch/x86/timer.h b/hypervisor/include/arch/x86/timer.h
index 24bb43648..9cdce7df3 100644
--- a/hypervisor/include/arch/x86/timer.h
+++ b/hypervisor/include/arch/x86/timer.h
@@ -8,6 +8,7 @@
 #define TIMER_H
 
 #include <list.h>
+#include <rtl.h>
 
 /**
  * @brief Timer
diff --git a/hypervisor/include/common/schedule.h b/hypervisor/include/common/schedule.h
index 0a8f87307..c0a51f3a0 100644
--- a/hypervisor/include/common/schedule.h
+++ b/hypervisor/include/common/schedule.h
@@ -6,6 +6,7 @@
 
 #ifndef SCHEDULE_H
 #define SCHEDULE_H
+#include <spinlock.h>
 
 #define	NEED_RESCHEDULE		(1U)
 #define	NEED_OFFLINE		(2U)