diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
index 4cce59582..acaa0356d 100644
--- a/hypervisor/arch/x86/guest/vcpu.c
+++ b/hypervisor/arch/x86/guest/vcpu.c
@@ -8,7 +8,7 @@
 #include <schedule.h>
 
 #ifdef CONFIG_EFI_STUB
-#include <acrn_efi.h>
+#include <vm0_boot.h>
 extern struct efi_ctx* efi_ctx;
 #endif
 
diff --git a/hypervisor/arch/x86/vmx.c b/hypervisor/arch/x86/vmx.c
index 9b13e574a..60787b6b6 100644
--- a/hypervisor/arch/x86/vmx.c
+++ b/hypervisor/arch/x86/vmx.c
@@ -6,7 +6,7 @@
 
 #include <hypervisor.h>
 #ifdef CONFIG_EFI_STUB
-#include <acrn_efi.h>
+#include <vm0_boot.h>
 extern struct efi_ctx* efi_ctx;
 #endif
 
diff --git a/hypervisor/boot/acpi.c b/hypervisor/boot/acpi.c
index 9c873c523..82b161b09 100644
--- a/hypervisor/boot/acpi.c
+++ b/hypervisor/boot/acpi.c
@@ -30,7 +30,7 @@
 #include <hypervisor.h>
 #include "acpi.h"
 #ifdef CONFIG_EFI_STUB
-#include <acrn_efi.h>
+#include <vm0_boot.h>
 #endif
 
 #define ACPI_SIG_RSDP             "RSD PTR " /* Root System Description Ptr */
diff --git a/hypervisor/boot/reloc.c b/hypervisor/boot/reloc.c
index 026f24b20..b18475a6c 100644
--- a/hypervisor/boot/reloc.c
+++ b/hypervisor/boot/reloc.c
@@ -7,7 +7,7 @@
 #include <hypervisor.h>
 #include <reloc.h>
 #ifdef CONFIG_EFI_STUB
-#include <acrn_efi.h>
+#include <vm0_boot.h>
 #endif
 
 struct Elf64_Dyn {
diff --git a/hypervisor/bsp/uefi/efi/Makefile b/hypervisor/bsp/uefi/efi/Makefile
index 97ac30ffd..dc18faddf 100644
--- a/hypervisor/bsp/uefi/efi/Makefile
+++ b/hypervisor/bsp/uefi/efi/Makefile
@@ -60,7 +60,7 @@ LDSCRIPT := $(GNUEFI_DIR)/elf_$(ARCH)_efi.lds
 
 INCDIR := /usr/include
 
-CFLAGS=-I. -I.. -I../../../include/common -I$(INCDIR)/efi -I$(INCDIR)/efi/$(ARCH) \
+CFLAGS=-I. -I.. -I../../../include/arch/x86/guest -I$(INCDIR)/efi -I$(INCDIR)/efi/$(ARCH) \
 		-DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \
 		-Wall -I../fs/ -D$(ARCH) -O2 \
 		-include config.h
diff --git a/hypervisor/bsp/uefi/efi/boot.c b/hypervisor/bsp/uefi/efi/boot.c
index 21432c04f..ffeb99f01 100644
--- a/hypervisor/bsp/uefi/efi/boot.c
+++ b/hypervisor/bsp/uefi/efi/boot.c
@@ -36,7 +36,7 @@
 #include "efilinux.h"
 #include "stdlib.h"
 #include "boot.h"
-#include "acrn_efi.h"
+#include "vm0_boot.h"
 
 EFI_SYSTEM_TABLE *sys_table;
 EFI_BOOT_SERVICES *boot;
diff --git a/hypervisor/bsp/uefi/uefi.c b/hypervisor/bsp/uefi/uefi.c
index 620c0d774..29103260a 100644
--- a/hypervisor/bsp/uefi/uefi.c
+++ b/hypervisor/bsp/uefi/uefi.c
@@ -7,7 +7,7 @@
 #include <hypervisor.h>
 #include <multiboot.h>
 #ifdef CONFIG_EFI_STUB
-#include <acrn_efi.h>
+#include <vm0_boot.h>
 #endif
 
 /* IOAPIC id */
diff --git a/hypervisor/include/common/acrn_efi.h b/hypervisor/include/arch/x86/guest/vm0_boot.h
similarity index 100%
rename from hypervisor/include/common/acrn_efi.h
rename to hypervisor/include/arch/x86/guest/vm0_boot.h