diff --git a/hypervisor/arch/x86/boot/cpu_primary.S b/hypervisor/arch/x86/boot/cpu_primary.S
index 11d08155c..df0bb4a91 100644
--- a/hypervisor/arch/x86/boot/cpu_primary.S
+++ b/hypervisor/arch/x86/boot/cpu_primary.S
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include <multiboot.h>
+#include <multiboot_std.h>
 
 /* MULTIBOOT HEADER */
 #define MULTIBOOT_HEADER_FLAGS	MULTIBOOT_HEADER_NEED_MEMINFO
diff --git a/hypervisor/arch/x86/e820.c b/hypervisor/arch/x86/e820.c
index 57b879b1c..cb9391d31 100644
--- a/hypervisor/arch/x86/e820.c
+++ b/hypervisor/arch/x86/e820.c
@@ -9,7 +9,7 @@
 #include <asm/page.h>
 #include <asm/e820.h>
 #include <asm/mmu.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <logmsg.h>
 #include <asm/guest/ept.h>
 
diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 26c936472..e5d12d61b 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -14,7 +14,7 @@
 #include <asm/guest/virq.h>
 #include <asm/lib/bits.h>
 #include <asm/e820.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <asm/vtd.h>
 #include <reloc.h>
 #include <asm/guest/ept.h>
diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c
index 18fcf7267..30f6bdf3a 100644
--- a/hypervisor/arch/x86/init.c
+++ b/hypervisor/arch/x86/init.c
@@ -14,7 +14,7 @@
 #include <logmsg.h>
 #include <asm/seed.h>
 #include <asm/boot/ld_sym.h>
-#include <multiboot.h>
+#include <boot.h>
 
 /* boot_regs store the multiboot info magic and address, defined in
    arch/x86/boot/cpu_primary.S.
diff --git a/hypervisor/arch/x86/seed/seed.c b/hypervisor/arch/x86/seed/seed.c
index 64c98389a..c2b618133 100644
--- a/hypervisor/arch/x86/seed/seed.c
+++ b/hypervisor/arch/x86/seed/seed.c
@@ -11,7 +11,7 @@
 #include <sprintf.h>
 #include <asm/guest/ept.h>
 #include <logmsg.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <crypto_api.h>
 #include <asm/seed.h>
 #include "seed_abl.h"
diff --git a/hypervisor/boot/acpi_base.c b/hypervisor/boot/acpi_base.c
index df4b7a4af..f41819588 100644
--- a/hypervisor/boot/acpi_base.c
+++ b/hypervisor/boot/acpi_base.c
@@ -35,7 +35,7 @@
 #include <acrn_common.h>
 #include <util.h>
 #include <asm/e820.h>
-#include <multiboot.h>
+#include <boot.h>
 
 static struct acpi_table_rsdp *acpi_rsdp;
 
diff --git a/hypervisor/boot/guest/vboot_info.c b/hypervisor/boot/guest/vboot_info.c
index 39d35cd36..16e222ad3 100644
--- a/hypervisor/boot/guest/vboot_info.c
+++ b/hypervisor/boot/guest/vboot_info.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <asm/per_cpu.h>
 #include <asm/irq.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <asm/pgtable.h>
 #include <asm/zeropage.h>
 #include <asm/seed.h>
diff --git a/hypervisor/boot/include/multiboot.h b/hypervisor/boot/include/boot.h
similarity index 91%
rename from hypervisor/boot/include/multiboot.h
rename to hypervisor/boot/include/boot.h
index e55bade69..b39f3ae89 100644
--- a/hypervisor/boot/include/multiboot.h
+++ b/hypervisor/boot/include/boot.h
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef MULTIBOOT_H
-#define MULTIBOOT_H
+#ifndef BOOT_H
+#define BOOT_H
 
 #include <multiboot_std.h>
+#include <efi.h>
+#include <vm_configurations.h>
 
 /* TODO: MAX_MMAP_ENTRIES shall be config by config tool, and same as E820_MAX_ENTRIES */
 #define MAX_MMAP_ENTRIES		32U
@@ -20,11 +22,6 @@
 /* The vACPI module size is fixed to 1MB */
 #define ACPI_MODULE_SIZE		MEM_1M
 
-#ifndef ASSEMBLER
-
-#include <efi.h>
-#include <vm_configurations.h>
-
 struct acrn_boot_info {
 
 	const char		*mi_cmdline;
@@ -49,6 +46,4 @@ void init_acrn_boot_info(uint32_t magic, uint32_t info);
 int32_t sanitize_acrn_boot_info(uint32_t magic, uint32_t info);
 struct acrn_boot_info *get_acrn_boot_info(void);
 
-#endif	/* ASSEMBLER */
-
-#endif	/* MULTIBOOT_H */
+#endif	/* BOOT_H */
diff --git a/hypervisor/boot/multiboot/multiboot.c b/hypervisor/boot/multiboot/multiboot.c
index 2503345e0..b940775bb 100644
--- a/hypervisor/boot/multiboot/multiboot.c
+++ b/hypervisor/boot/multiboot/multiboot.c
@@ -7,7 +7,7 @@
 #include <types.h>
 #include <errno.h>
 #include <asm/pgtable.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <rtl.h>
 #include <logmsg.h>
 #include "multiboot_priv.h"
diff --git a/hypervisor/boot/multiboot/multiboot2.c b/hypervisor/boot/multiboot/multiboot2.c
index 8b329913d..7ca61faaf 100644
--- a/hypervisor/boot/multiboot/multiboot2.c
+++ b/hypervisor/boot/multiboot/multiboot2.c
@@ -6,7 +6,7 @@
 
 #include <types.h>
 #include <errno.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <asm/pgtable.h>
 #include "multiboot_priv.h"
 
diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c
index d157488db..a7cfadce7 100644
--- a/hypervisor/common/vm_load.c
+++ b/hypervisor/common/vm_load.c
@@ -9,7 +9,7 @@
 #include <asm/zeropage.h>
 #include <asm/guest/ept.h>
 #include <asm/mmu.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <errno.h>
 #include <logmsg.h>
 
diff --git a/hypervisor/debug/console.c b/hypervisor/debug/console.c
index a6b5b5375..7fb7adc59 100644
--- a/hypervisor/debug/console.c
+++ b/hypervisor/debug/console.c
@@ -15,7 +15,7 @@
 #include <acrn_hv_defs.h>
 #include <asm/guest/vm.h>
 #include <console.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <dbg_cmd.h>
 
 struct hv_timer console_timer;
diff --git a/hypervisor/include/arch/x86/asm/vm_config.h b/hypervisor/include/arch/x86/asm/vm_config.h
index faea5ba9c..5e146f0ad 100644
--- a/hypervisor/include/arch/x86/asm/vm_config.h
+++ b/hypervisor/include/arch/x86/asm/vm_config.h
@@ -10,7 +10,7 @@
 #include <types.h>
 #include <pci.h>
 #include <board_info.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <acrn_common.h>
 #include <vm_uuids.h>
 #include <vm_configurations.h>