diff --git a/hypervisor/arch/x86/assign.c b/hypervisor/arch/x86/assign.c
index 857d681d7..127cb49e6 100644
--- a/hypervisor/arch/x86/assign.c
+++ b/hypervisor/arch/x86/assign.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define ACTIVE_FLAG 0x1 /* any non zero should be okay */
 
diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index d5d9c45f0..c6bb36fad 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -29,13 +29,9 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
 #include <bsp_extern.h>
-#include <hv_arch.h>
 #include <schedule.h>
 #include <version.h>
-#include <hv_debug.h>
 
 spinlock_t cpu_secondary_spinlock = {
 	.head = 0,
diff --git a/hypervisor/arch/x86/cpu_primary.S b/hypervisor/arch/x86/cpu_primary.S
index 066bac0fe..26c6935a1 100644
--- a/hypervisor/arch/x86/cpu_primary.S
+++ b/hypervisor/arch/x86/cpu_primary.S
@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include        <hypervisor.h>
 #include        <cpu.h>
 #include        <mmu.h>
 #include        <gdt.h>
diff --git a/hypervisor/arch/x86/cpu_secondary.S b/hypervisor/arch/x86/cpu_secondary.S
index 74a9562b1..8e1685616 100644
--- a/hypervisor/arch/x86/cpu_secondary.S
+++ b/hypervisor/arch/x86/cpu_secondary.S
@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include        <hypervisor.h>
 #include        <spinlock.h>
 #include        <gdt.h>
 #include        <cpu.h>
diff --git a/hypervisor/arch/x86/cpu_state_tbl.c b/hypervisor/arch/x86/cpu_state_tbl.c
index f69245243..ffa697258 100644
--- a/hypervisor/arch/x86/cpu_state_tbl.c
+++ b/hypervisor/arch/x86/cpu_state_tbl.c
@@ -28,9 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <acrn_common.h>
-#include <hv_lib.h>
-#include <hv_arch.h>
+#include <hypervisor.h>
 
 /* The table includes cpu px info of Intel A3960 SoC */
 struct cpu_px_data px_a3960[] = {
diff --git a/hypervisor/arch/x86/cpuid.c b/hypervisor/arch/x86/cpuid.c
index dbe9b0ff4..e05811d6a 100644
--- a/hypervisor/arch/x86/cpuid.c
+++ b/hypervisor/arch/x86/cpuid.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static inline struct vcpuid_entry *find_vcpuid_entry(struct vcpu *vcpu,
 					uint32_t leaf, uint32_t subleaf)
diff --git a/hypervisor/arch/x86/debug/reboot.c b/hypervisor/arch/x86/debug/reboot.c
index dafacdd10..8ac200204 100644
--- a/hypervisor/arch/x86/debug/reboot.c
+++ b/hypervisor/arch/x86/debug/reboot.c
@@ -2,7 +2,7 @@
  * Copyright (C) <2018> Intel Corporation
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <acrn_common.h>
+#include <hypervisor.h>
 
 int warm_reboot(void)
 {
diff --git a/hypervisor/arch/x86/ept.c b/hypervisor/arch/x86/ept.c
index 5e7ac3ffd..23c477d53 100644
--- a/hypervisor/arch/x86/ept.c
+++ b/hypervisor/arch/x86/ept.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_hv_defs.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #include "guest/instr_emul_wrapper.h"
 #include "guest/instr_emul.h"
diff --git a/hypervisor/arch/x86/gdt.c b/hypervisor/arch/x86/gdt.c
index 3b81f5ddb..acca28b06 100644
--- a/hypervisor/arch/x86/gdt.c
+++ b/hypervisor/arch/x86/gdt.c
@@ -28,8 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <gdt.h>
+#include <hypervisor.h>
 
 DEFINE_CPU_DATA(struct tss_64, tss);
 DEFINE_CPU_DATA(struct host_gdt, gdt);
diff --git a/hypervisor/arch/x86/guest/guest.c b/hypervisor/arch/x86/guest/guest.c
index 2b0c8606a..7e7217cef 100644
--- a/hypervisor/arch/x86/guest/guest.c
+++ b/hypervisor/arch/x86/guest/guest.c
@@ -29,12 +29,7 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <bsp_extern.h>
-#include <acrn_hv_defs.h>
-#include <hv_debug.h>
 #include <multiboot.h>
 
 #define ACRN_DBG_GUEST	6
diff --git a/hypervisor/arch/x86/guest/instr_emul.c b/hypervisor/arch/x86/guest/instr_emul.c
index 04ae954a2..6387eb025 100644
--- a/hypervisor/arch/x86/guest/instr_emul.c
+++ b/hypervisor/arch/x86/guest/instr_emul.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #include "instr_emul_wrapper.h"
 #include "instr_emul.h"
diff --git a/hypervisor/arch/x86/guest/instr_emul_wrapper.c b/hypervisor/arch/x86/guest/instr_emul_wrapper.c
index fbbcbebb1..1a1fdeab3 100644
--- a/hypervisor/arch/x86/guest/instr_emul_wrapper.c
+++ b/hypervisor/arch/x86/guest/instr_emul_wrapper.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #include "instr_emul_wrapper.h"
 #include "instr_emul.h"
diff --git a/hypervisor/arch/x86/guest/pm.c b/hypervisor/arch/x86/guest/pm.c
index ecb465feb..9f69fd66e 100644
--- a/hypervisor/arch/x86/guest/pm.c
+++ b/hypervisor/arch/x86/guest/pm.c
@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <acrn_common.h>
-#include <hv_lib.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 
 int validate_pstate(struct vm *vm, uint64_t perf_ctl)
 {
diff --git a/hypervisor/arch/x86/guest/ucode.c b/hypervisor/arch/x86/guest/ucode.c
index fe3fa6a32..6b946ed73 100644
--- a/hypervisor/arch/x86/guest/ucode.c
+++ b/hypervisor/arch/x86/guest/ucode.c
@@ -28,9 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
+#include <hypervisor.h>
 #include <ucode.h>
 
 uint64_t get_microcode_version(void)
diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
index 99573f838..14ff0d5e3 100644
--- a/hypervisor/arch/x86/guest/vcpu.c
+++ b/hypervisor/arch/x86/guest/vcpu.c
@@ -29,11 +29,7 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <schedule.h>
-#include <hv_debug.h>
 
 vm_sw_loader_t vm_sw_loader;
 
diff --git a/hypervisor/arch/x86/guest/vioapic.c b/hypervisor/arch/x86/guest/vioapic.c
index 736697f3c..7e5f29984 100644
--- a/hypervisor/arch/x86/guest/vioapic.c
+++ b/hypervisor/arch/x86/guest/vioapic.c
@@ -31,10 +31,6 @@
 #define pr_fmt(fmt)	"vioapic: " fmt
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define	IOREGSEL	0x00
 #define	IOWIN		0x10
diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c
index 570049dc3..61635cf74 100644
--- a/hypervisor/arch/x86/guest/vlapic.c
+++ b/hypervisor/arch/x86/guest/vlapic.c
@@ -30,11 +30,6 @@
 #define pr_fmt(fmt)	"vlapic: " fmt
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <acrn_hv_defs.h>
-#include <hv_debug.h>
 
 #include "instr_emul_wrapper.h"
 #include "instr_emul.h"
diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 791d9e553..f22bf2331 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -28,11 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
+#include <hypervisor.h>
 #include <bsp_extern.h>
-#include <hv_debug.h>
 #include <multiboot.h>
 
 /* Local variables */
diff --git a/hypervisor/arch/x86/guest/vmcall.c b/hypervisor/arch/x86/guest/vmcall.c
index 97868b9af..5b30d80f7 100644
--- a/hypervisor/arch/x86/guest/vmcall.c
+++ b/hypervisor/arch/x86/guest/vmcall.c
@@ -28,11 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
-#include <acrn_hv_defs.h>
+#include <hypervisor.h>
 #include <hypercall.h>
 
 int vmcall_vmexit_handler(struct vcpu *vcpu)
diff --git a/hypervisor/arch/x86/guest/vmsr.c b/hypervisor/arch/x86/guest/vmsr.c
index 9b61f2cdb..ebda68dc1 100644
--- a/hypervisor/arch/x86/guest/vmsr.c
+++ b/hypervisor/arch/x86/guest/vmsr.c
@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 #include <ucode.h>
 
 /*MRS need to be emulated, the order in this array better as freq of ops*/
diff --git a/hypervisor/arch/x86/guest/vpic.c b/hypervisor/arch/x86/guest/vpic.c
index 2d69bd3f4..fad693011 100644
--- a/hypervisor/arch/x86/guest/vpic.c
+++ b/hypervisor/arch/x86/guest/vpic.c
@@ -28,10 +28,6 @@
 #define pr_fmt(fmt)	"vpic: " fmt
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define	VPIC_LOCK_INIT(vpic)	spinlock_init(&((vpic)->lock))
 #define	VPIC_LOCK(vpic)		spinlock_obtain(&((vpic)->lock))
diff --git a/hypervisor/arch/x86/interrupt.c b/hypervisor/arch/x86/interrupt.c
index 409357770..edbec3f48 100644
--- a/hypervisor/arch/x86/interrupt.c
+++ b/hypervisor/arch/x86/interrupt.c
@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 
 #define EXCEPTION_ERROR_CODE_VALID  8
 #define INTERRPUT_QUEUE_BUFF_SIZE   255
diff --git a/hypervisor/arch/x86/intr_lapic.c b/hypervisor/arch/x86/intr_lapic.c
index 299711bc5..9ac5825f0 100644
--- a/hypervisor/arch/x86/intr_lapic.c
+++ b/hypervisor/arch/x86/intr_lapic.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 /* Rate range 1 to 1000 or 1uSec to 1mSec */
 #define APIC_TIMER_MAX      0xffffffff
diff --git a/hypervisor/arch/x86/intr_main.c b/hypervisor/arch/x86/intr_main.c
index 8ee77391a..c984e2a9b 100644
--- a/hypervisor/arch/x86/intr_main.c
+++ b/hypervisor/arch/x86/intr_main.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 int interrupt_init(uint32_t cpu_id)
 {
diff --git a/hypervisor/arch/x86/io.c b/hypervisor/arch/x86/io.c
index 6c37f7b0e..702f4d5a1 100644
--- a/hypervisor/arch/x86/io.c
+++ b/hypervisor/arch/x86/io.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 int dm_emulate_pio_post(struct vcpu *vcpu)
 {
diff --git a/hypervisor/arch/x86/ioapic.c b/hypervisor/arch/x86/ioapic.c
index 03733f777..519029fc4 100644
--- a/hypervisor/arch/x86/ioapic.c
+++ b/hypervisor/arch/x86/ioapic.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 /* Register offsets */
 #define IOAPIC_REGSEL_OFFSET   0
diff --git a/hypervisor/arch/x86/irq.c b/hypervisor/arch/x86/irq.c
index f9b67c85e..2239e4d4e 100644
--- a/hypervisor/arch/x86/irq.c
+++ b/hypervisor/arch/x86/irq.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static spinlock_t exception_spinlock = { .head = 0, .tail = 0, };
 
diff --git a/hypervisor/arch/x86/mmu.c b/hypervisor/arch/x86/mmu.c
index ee50bbce7..e33ffefd3 100644
--- a/hypervisor/arch/x86/mmu.c
+++ b/hypervisor/arch/x86/mmu.c
@@ -28,10 +28,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static void *mmu_pml4_addr;
 
diff --git a/hypervisor/arch/x86/notify.c b/hypervisor/arch/x86/notify.c
index 950794f4a..461cfc9a2 100644
--- a/hypervisor/arch/x86/notify.c
+++ b/hypervisor/arch/x86/notify.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static struct dev_handler_node *notification_node;
 
diff --git a/hypervisor/arch/x86/softirq.c b/hypervisor/arch/x86/softirq.c
index b234a58d8..06e16acb3 100644
--- a/hypervisor/arch/x86/softirq.c
+++ b/hypervisor/arch/x86/softirq.c
@@ -29,9 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 
 static DEFINE_CPU_DATA(uint64_t, softirq_pending);
 
diff --git a/hypervisor/arch/x86/timer.c b/hypervisor/arch/x86/timer.c
index dd291c5b3..3185df90f 100644
--- a/hypervisor/arch/x86/timer.c
+++ b/hypervisor/arch/x86/timer.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define MAX_TIMER_ACTIONS	32
 #define TIMER_IRQ		(NR_MAX_IRQS - 1)
diff --git a/hypervisor/arch/x86/trusty.c b/hypervisor/arch/x86/trusty.c
index 4cbf93441..75fb1187e 100644
--- a/hypervisor/arch/x86/trusty.c
+++ b/hypervisor/arch/x86/trusty.c
@@ -28,11 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <acrn_hv_defs.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 #include <hkdf.h>
 
 _Static_assert(NR_WORLD == 2, "Only 2 Worlds supported!");
diff --git a/hypervisor/arch/x86/vmexit.c b/hypervisor/arch/x86/vmexit.c
index e1d8f4116..15b78382e 100644
--- a/hypervisor/arch/x86/vmexit.c
+++ b/hypervisor/arch/x86/vmexit.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static int unhandled_vmexit_handler(struct vcpu *vcpu);
 static int xsetbv_vmexit_handler(struct vcpu *vcpu);
diff --git a/hypervisor/arch/x86/vmx.c b/hypervisor/arch/x86/vmx.c
index 9072cffdc..a5505f538 100644
--- a/hypervisor/arch/x86/vmx.c
+++ b/hypervisor/arch/x86/vmx.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #ifdef CONFIG_EFI_STUB
 #include <acrn_efi.h>
 extern struct efi_ctx* efi_ctx;
diff --git a/hypervisor/arch/x86/vtd.c b/hypervisor/arch/x86/vtd.c
index c02f9fcba..ff6b23360 100644
--- a/hypervisor/arch/x86/vtd.c
+++ b/hypervisor/arch/x86/vtd.c
@@ -31,10 +31,6 @@
 #define pr_fmt(fmt)	"iommu: " fmt
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define DBG_IOMMU 0
 
diff --git a/hypervisor/boot/acpi.c b/hypervisor/boot/acpi.c
index 58e5b118d..e902c6ac7 100644
--- a/hypervisor/boot/acpi.c
+++ b/hypervisor/boot/acpi.c
@@ -28,9 +28,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <cpu.h>
-#include <hv_debug.h>
 #include "acpi.h"
 #ifdef CONFIG_EFI_STUB
 #include <acrn_efi.h>
diff --git a/hypervisor/boot/dmar_parse.c b/hypervisor/boot/dmar_parse.c
index 099a7b187..d095d55e7 100644
--- a/hypervisor/boot/dmar_parse.c
+++ b/hypervisor/boot/dmar_parse.c
@@ -27,14 +27,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #include "bsp_cfg.h"
 #ifdef CONFIG_DMAR_PARSE_ENABLED
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "vtd.h"
 #include "acpi.h"
 
diff --git a/hypervisor/boot/sbl/multiboot.c b/hypervisor/boot/sbl/multiboot.c
index f99c5ce82..b34be4a98 100644
--- a/hypervisor/boot/sbl/multiboot.c
+++ b/hypervisor/boot/sbl/multiboot.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <multiboot.h>
 #include <zeropage.h>
 
diff --git a/hypervisor/bsp/sbl/sbl.c b/hypervisor/bsp/sbl/sbl.c
index 64f7d81a8..36c734cdd 100644
--- a/hypervisor/bsp/sbl/sbl.c
+++ b/hypervisor/bsp/sbl/sbl.c
@@ -29,8 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <vtd.h>
 
 /* IOAPIC id */
 #define SBL_IOAPIC_ID   8
diff --git a/hypervisor/bsp/sbl/vm_description.c b/hypervisor/bsp/sbl/vm_description.c
index 3360e69a9..f97b5d664 100644
--- a/hypervisor/bsp/sbl/vm_description.c
+++ b/hypervisor/bsp/sbl/vm_description.c
@@ -29,9 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 
 #define NUM_USER_VMS    2
 
diff --git a/hypervisor/bsp/uefi/cmdline.c b/hypervisor/bsp/uefi/cmdline.c
index faef0011e..2d5e8908d 100644
--- a/hypervisor/bsp/uefi/cmdline.c
+++ b/hypervisor/bsp/uefi/cmdline.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <multiboot.h>
 
 #define MAX_PORT			0x10000  /* port 0 - 64K */
diff --git a/hypervisor/bsp/uefi/uefi.c b/hypervisor/bsp/uefi/uefi.c
index 9253edf34..78b739af5 100644
--- a/hypervisor/bsp/uefi/uefi.c
+++ b/hypervisor/bsp/uefi/uefi.c
@@ -29,14 +29,10 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <multiboot.h>
 #ifdef CONFIG_EFI_STUB
 #include <acrn_efi.h>
 #endif
-#include <hv_debug.h>
 
 /* IOAPIC id */
 #define UEFI_IOAPIC_ID   8
diff --git a/hypervisor/bsp/uefi/vm_description.c b/hypervisor/bsp/uefi/vm_description.c
index 800e96e97..d1e1d685d 100644
--- a/hypervisor/bsp/uefi/vm_description.c
+++ b/hypervisor/bsp/uefi/vm_description.c
@@ -29,9 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 
 #define NUM_USER_VMS    2
 
diff --git a/hypervisor/common/hv_main.c b/hypervisor/common/hv_main.c
index 2c6699c7c..5dc1275d1 100644
--- a/hypervisor/common/hv_main.c
+++ b/hypervisor/common/hv_main.c
@@ -29,11 +29,7 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <schedule.h>
-#include <hv_debug.h>
 
 bool x2apic_enabled;
 
diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c
index 184f1b0c4..2fadcb224 100644
--- a/hypervisor/common/hypercall.c
+++ b/hypervisor/common/hypercall.c
@@ -29,13 +29,8 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <schedule.h>
 #include <hypercall.h>
-#include <acrn_hv_defs.h>
-#include <hv_debug.h>
 #include <version.h>
 
 #define ACRN_DBG_HYCALL	6
diff --git a/hypervisor/common/io_request.c b/hypervisor/common/io_request.c
index 17e114b11..19cd48b6a 100644
--- a/hypervisor/common/io_request.c
+++ b/hypervisor/common/io_request.c
@@ -4,10 +4,6 @@
  */
 
 #include <hypervisor.h>
-#include <acrn_common.h>
-#include <hv_lib.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define ACRN_DBG_IOREQUEST	6
 
diff --git a/hypervisor/common/schedule.c b/hypervisor/common/schedule.c
index 2f2f67042..ad22a5329 100644
--- a/hypervisor/common/schedule.c
+++ b/hypervisor/common/schedule.c
@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 #include <schedule.h>
 
 struct sched_context {
diff --git a/hypervisor/common/stack_protector.c b/hypervisor/common/stack_protector.c
index a7400ff5a..2ecfb6c3e 100644
--- a/hypervisor/common/stack_protector.c
+++ b/hypervisor/common/stack_protector.c
@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 
 void __stack_chk_fail(void)
 {
diff --git a/hypervisor/common/trusty_hypercall.c b/hypervisor/common/trusty_hypercall.c
index 5505d8d82..def2ba8a0 100644
--- a/hypervisor/common/trusty_hypercall.c
+++ b/hypervisor/common/trusty_hypercall.c
@@ -29,11 +29,7 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <hypercall.h>
-#include <hv_debug.h>
 
 int64_t hcall_world_switch(struct vcpu *vcpu)
 {
diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c
index a50281473..8d7a1586e 100644
--- a/hypervisor/common/vm_load.c
+++ b/hypervisor/common/vm_load.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <zeropage.h>
 
 static uint32_t create_e820_table(struct e820_entry *_e820)
diff --git a/hypervisor/debug/console.c b/hypervisor/debug/console.c
index 1f1da71cf..ae83fcc8f 100644
--- a/hypervisor/debug/console.c
+++ b/hypervisor/debug/console.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "serial_internal.h"
 
 static spinlock_t lock;
diff --git a/hypervisor/debug/dump.c b/hypervisor/debug/dump.c
index 3e2a5f4b4..ac3631eda 100644
--- a/hypervisor/debug/dump.c
+++ b/hypervisor/debug/dump.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 /*
  * readable exception descriptors.
diff --git a/hypervisor/debug/logmsg.c b/hypervisor/debug/logmsg.c
index b8be58126..e903b5c7b 100644
--- a/hypervisor/debug/logmsg.c
+++ b/hypervisor/debug/logmsg.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define LOG_ENTRY_SIZE		80
 
diff --git a/hypervisor/debug/printf.c b/hypervisor/debug/printf.c
index c1eef8a6a..a60a628c7 100644
--- a/hypervisor/debug/printf.c
+++ b/hypervisor/debug/printf.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static int charout(int cmd, const char *s, int sz, void *hnd)
 {
diff --git a/hypervisor/debug/sbuf.c b/hypervisor/debug/sbuf.c
index d5eb9b258..486248dd7 100644
--- a/hypervisor/debug/sbuf.c
+++ b/hypervisor/debug/sbuf.c
@@ -33,10 +33,7 @@
  *
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 
 DEFINE_CPU_DATA(uint64_t * [ACRN_SBUF_ID_MAX], sbuf);
 
diff --git a/hypervisor/debug/serial.c b/hypervisor/debug/serial.c
index 8de71f257..6d4312181 100644
--- a/hypervisor/debug/serial.c
+++ b/hypervisor/debug/serial.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "serial_internal.h"
 
 static struct uart *sio_ports[SERIAL_MAX_DEVS];
diff --git a/hypervisor/debug/shell_internal.c b/hypervisor/debug/shell_internal.c
index c94d588dc..b38e2649e 100644
--- a/hypervisor/debug/shell_internal.c
+++ b/hypervisor/debug/shell_internal.c
@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 #include <reboot.h>
 #include "shell_internal.h"
 #include "serial_internal.h"
diff --git a/hypervisor/debug/shell_public.c b/hypervisor/debug/shell_public.c
index fdbbaa239..651e4c5a2 100644
--- a/hypervisor/debug/shell_public.c
+++ b/hypervisor/debug/shell_public.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "shell_internal.h"
 
 /* Shell that uses serial I/O */
diff --git a/hypervisor/debug/uart16550.c b/hypervisor/debug/uart16550.c
index b26719b51..147ed887e 100644
--- a/hypervisor/debug/uart16550.c
+++ b/hypervisor/debug/uart16550.c
@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-
+#include <hypervisor.h>
 #include "uart16550.h"
 #include "serial_internal.h"
 
diff --git a/hypervisor/debug/vuart.c b/hypervisor/debug/vuart.c
index b16ea06b7..6030f28d4 100644
--- a/hypervisor/debug/vuart.c
+++ b/hypervisor/debug/vuart.c
@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #include "uart16550.h"
 #include "serial_internal.h"
diff --git a/hypervisor/include/hypervisor.h b/hypervisor/include/hypervisor.h
index 0b533bc94..0fabb5a8f 100644
--- a/hypervisor/include/hypervisor.h
+++ b/hypervisor/include/hypervisor.h
@@ -46,7 +46,13 @@
 #define HYPERVISOR_H
 
 /* Include config header file containing config options */
+#include <types.h>
 #include "bsp_cfg.h"
+#include "acrn_common.h"
+#include <acrn_hv_defs.h>
+#include <hv_lib.h>
+#include <hv_arch.h>
+#include <hv_debug.h>
 
 #ifndef ASSEMBLER
 /* hpa <--> hva, now it is 1:1 mapping */
diff --git a/hypervisor/include/lib/spinlock.h b/hypervisor/include/lib/spinlock.h
index fddd479f8..fc4439ebe 100644
--- a/hypervisor/include/lib/spinlock.h
+++ b/hypervisor/include/lib/spinlock.h
@@ -31,8 +31,6 @@
 #ifndef SPINLOCK_H
 #define SPINLOCK_H
 
-#include <hypervisor.h>
-
 #ifndef ASSEMBLER
 
 #include <types.h>
diff --git a/hypervisor/include/public/acrn_hv_defs.h b/hypervisor/include/public/acrn_hv_defs.h
index 88c7fb17b..34bc42f6d 100644
--- a/hypervisor/include/public/acrn_hv_defs.h
+++ b/hypervisor/include/public/acrn_hv_defs.h
@@ -39,11 +39,6 @@
 #ifndef ACRN_HV_DEFS_H
 #define ACRN_HV_DEFS_H
 
-/*
- * Common structures for ACRN/VHM/DM
- */
-#include "acrn_common.h"
-
 /*
  * Common structures for HV/VHM
  */
diff --git a/hypervisor/lib/div.c b/hypervisor/lib/div.c
index c3601d6e0..37e42212b 100644
--- a/hypervisor/lib/div.c
+++ b/hypervisor/lib/div.c
@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hypervisor.h>
 #include <hv_lib.h>
 
 static int do_udiv32(uint32_t dividend, uint32_t divisor,
diff --git a/hypervisor/lib/mdelay.c b/hypervisor/lib/mdelay.c
index ac1a3660d..d8253f69b 100644
--- a/hypervisor/lib/mdelay.c
+++ b/hypervisor/lib/mdelay.c
@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hypervisor.h>
 #include <hv_lib.h>
 
 void mdelay(uint32_t loop_count)
diff --git a/hypervisor/lib/memory.c b/hypervisor/lib/memory.c
index 9990ff83f..e095c5a70 100644
--- a/hypervisor/lib/memory.c
+++ b/hypervisor/lib/memory.c
@@ -3,10 +3,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <hypervisor.h>
 
 /************************************************************************/
diff --git a/hypervisor/lib/sprintf.c b/hypervisor/lib/sprintf.c
index ef1365ebf..62596009c 100644
--- a/hypervisor/lib/sprintf.c
+++ b/hypervisor/lib/sprintf.c
@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hypervisor.h>
 #include <hv_lib.h>
 
 #ifndef NULL
diff --git a/hypervisor/lib/string.c b/hypervisor/lib/string.c
index e241a60e8..f77dc6928 100644
--- a/hypervisor/lib/string.c
+++ b/hypervisor/lib/string.c
@@ -8,10 +8,6 @@
  * constants.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <hypervisor.h>
 
 /* Categories.  */
diff --git a/hypervisor/lib/udelay.c b/hypervisor/lib/udelay.c
index 29b66d790..aa536d5bb 100644
--- a/hypervisor/lib/udelay.c
+++ b/hypervisor/lib/udelay.c
@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hypervisor.h>
 #include <hv_lib.h>
 
 void udelay(int loop_count)