diff --git a/hypervisor/arch/x86/boot/cpu_primary.S b/hypervisor/arch/x86/boot/cpu_primary.S
index 8b59986e9..d0012a983 100644
--- a/hypervisor/arch/x86/boot/cpu_primary.S
+++ b/hypervisor/arch/x86/boot/cpu_primary.S
@@ -23,9 +23,6 @@
 
 #include <config.h>
 #include <multiboot.h>
-#ifdef CONFIG_MULTIBOOT2
-#include <multiboot2.h>
-#endif
 
 /* MULTIBOOT HEADER */
 #define MULTIBOOT_HEADER_FLAGS	MULTIBOOT_HEADER_NEED_MEMINFO
diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c
index e668d588f..d6dde9b52 100644
--- a/hypervisor/arch/x86/init.c
+++ b/hypervisor/arch/x86/init.c
@@ -14,9 +14,13 @@
 #include <logmsg.h>
 #include <seed.h>
 #include <ld_sym.h>
-#include <boot.h>
 #include <multiboot.h>
 
+/* The following are assembly varaibles defined in arch/x86/boot/cpu_primary.S */
+/* boot_regs store the multiboot info magic and address */
+extern uint32_t boot_regs[2];
+extern char *efiloader_sig;
+
 /* Push sp magic to top of stack for call trace */
 #define SWITCH_TO(rsp, to)                                              \
 {                                                                       \
diff --git a/hypervisor/boot/include/boot.h b/hypervisor/boot/include/boot.h
deleted file mode 100644
index 689084298..000000000
--- a/hypervisor/boot/include/boot.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2020 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef BOOT_H_
-#define BOOT_H_
-
-#include <types.h>
-
-#ifndef ASSEMBLER
-
-/* boot_regs store the multiboot info magic and address */
-extern uint32_t boot_regs[2];
-
-extern char *efiloader_sig;
-
-#endif	/* ASSEMBLER */
-
-#endif /* BOOT_H_ */