diff --git a/hypervisor/bsp/const_dmar.c b/hypervisor/bsp/const_dmar.c
index fd8259608..796e05cb6 100644
--- a/hypervisor/bsp/const_dmar.c
+++ b/hypervisor/bsp/const_dmar.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
 #include <vtd.h>
 #include <platform_acpi_info.h>
 
diff --git a/hypervisor/bsp/firmware_sbl.c b/hypervisor/bsp/firmware_sbl.c
index 603a8f4d5..7830e4922 100644
--- a/hypervisor/bsp/firmware_sbl.c
+++ b/hypervisor/bsp/firmware_sbl.c
@@ -6,7 +6,9 @@
 
 /* this is for both SBL and ABL platform */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <e820.h>
+#include <cpu.h>
 #include <firmware_sbl.h>
 
 static void sbl_init(void)
diff --git a/hypervisor/bsp/firmware_uefi.c b/hypervisor/bsp/firmware_uefi.c
index 4ed1f97a8..e5f3b1c15 100644
--- a/hypervisor/bsp/firmware_uefi.c
+++ b/hypervisor/bsp/firmware_uefi.c
@@ -6,7 +6,14 @@
 
 /* this is for UEFI platform */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <acrn_common.h>
+#include <pgtable.h>
+#include <logmsg.h>
+#include <rtl.h>
+#include <vlapic.h>
+#include <lapic.h>
+#include <per_cpu.h>
 #include <multiboot.h>
 #include <boot_context.h>
 #include <firmware_uefi.h>
diff --git a/hypervisor/bsp/firmware_wrapper.c b/hypervisor/bsp/firmware_wrapper.c
index db6ce849a..4aa71d0c6 100644
--- a/hypervisor/bsp/firmware_wrapper.c
+++ b/hypervisor/bsp/firmware_wrapper.c
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
 #include <multiboot.h>
+#include <vm.h>
+#include <types.h>
+#include <pgtable.h>
 #include <firmware.h>
 #include <firmware_sbl.h>
 #include <firmware_uefi.h>
diff --git a/hypervisor/include/arch/x86/multiboot.h b/hypervisor/include/arch/x86/multiboot.h
index ea68a6e8d..d45839c2b 100644
--- a/hypervisor/include/arch/x86/multiboot.h
+++ b/hypervisor/include/arch/x86/multiboot.h
@@ -7,6 +7,7 @@
 #ifndef MULTIBOOT_H
 #define MULTIBOOT_H
 
+#include <types.h>
 #define	MULTIBOOT_INFO_MAGIC		0x2BADB002U
 #define	MULTIBOOT_INFO_HAS_CMDLINE	0x00000004U
 #define	MULTIBOOT_INFO_HAS_MODS		0x00000008U