diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 63c951e71..ebb812daf 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -198,7 +198,7 @@ endif
 S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(S_SRCS))
 
 DISTCLEAN_OBJS := $(shell find $(BASEDIR) -name '*.o')
-VERSION := bsp/$(CONFIG_PLATFORM)/include/bsp/version.h
+VERSION := $(HV_OBJDIR)/include/version.h
 
 .PHONY: all
 all: $(VERSION) $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
diff --git a/hypervisor/bsp/sbl/include/bsp/bsp_cfg.h b/hypervisor/bsp/sbl/include/bsp/bsp_cfg.h
deleted file mode 100644
index a89f988b3..000000000
--- a/hypervisor/bsp/sbl/include/bsp/bsp_cfg.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef BSP_CFG_H
-#define BSP_CFG_H
-#define NR_IOAPICS	1
-#define STACK_SIZE	8192
-#define LOG_BUF_SIZE	0x100000
-#define LOG_DESTINATION	3
-#define CPU_UP_TIMEOUT	100
-#define CONFIG_SERIAL_MMIO_BASE	0xfc000000
-#define MALLOC_ALIGN	16
-#define NUM_ALLOC_PAGES	4096
-#define HEAP_SIZE	0x100000
-#define CONSOLE_LOGLEVEL_DEFAULT	3
-#define MEM_LOGLEVEL_DEFAULT		5
-#define	CONFIG_LOW_RAM_SIZE	0x00010000
-#define	CONFIG_RAM_START	0x6E000000
-#define	CONFIG_RAM_SIZE		0x02000000	/* 32M */
-#define CONFIG_MTRR_ENABLED     1
-#define CONFIG_REMAIN_1G_PAGES 1
-#endif /* BSP_CFG_H */
diff --git a/hypervisor/bsp/uefi/include/bsp/bsp_cfg.h b/hypervisor/bsp/uefi/include/bsp/bsp_cfg.h
deleted file mode 100644
index 9624a627c..000000000
--- a/hypervisor/bsp/uefi/include/bsp/bsp_cfg.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef BSP_CFG_H
-#define BSP_CFG_H
-#define NR_IOAPICS	1
-#define STACK_SIZE	8192
-#define LOG_BUF_SIZE	0x100000
-#define LOG_DESTINATION	3
-#define CPU_UP_TIMEOUT	100
-#define CONFIG_SERIAL_PIO_BASE	0x3f8
-#define MALLOC_ALIGN	16
-#define NUM_ALLOC_PAGES	4096
-#define HEAP_SIZE	0x100000
-#define CONSOLE_LOGLEVEL_DEFAULT	3
-#define MEM_LOGLEVEL_DEFAULT		5
-#define	CONFIG_LOW_RAM_SIZE	0x00010000
-
-/*
- *  By default build the hypervisor in low address
- *  so that it can only relocate to higher address
- */
-#define	CONFIG_RAM_START	0x00100000
-#define	CONFIG_RAM_SIZE		0x02000000	/* 32M */
-#define	CONFIG_DMAR_PARSE_ENABLED	1
-#define	CONFIG_GPU_SBDF		0x00000010	/* 0000:00:02.0 */
-#define CONFIG_EFI_STUB       1
-#define CONFIG_UEFI_OS_LOADER_NAME  "\\EFI\\org.clearlinux\\bootloaderx64.efi"
-#define CONFIG_MTRR_ENABLED		1
-#endif /* BSP_CFG_H */
diff --git a/hypervisor/common/all_header.c b/hypervisor/common/all_header.c
deleted file mode 100644
index 85bf977d2..000000000
--- a/hypervisor/common/all_header.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <hypervisor.h>
-#include <lib/stdarg.h>
-#include <lib/util.h>
-#include <lib/list.h>
-#include <lib/macros.h>
-#include <lib/rtl.h>
-#include <lib/spinlock.h>
-#include <lib/atomic.h>
-#include <lib/types.h>
-#include <lib/errno.h>
-#include <lib/bits.h>
-#include <lib/crypto/hkdf.h>
-#include <lib/sprintf.h>
-#include <lib/mem_mgt.h>
-#include <hv_debug.h>
-#include <common/acrn_efi.h>
-#include <common/schedule.h>
-#include <common/irq.h>
-#include <common/ptdev.h>
-#include <common/hypercall.h>
-#include <debug/console.h>
-#include <debug/printf.h>
-#include <debug/serial.h>
-#include <debug/dump.h>
-#include <debug/vuart.h>
-#include <debug/trace.h>
-#include <debug/assert.h>
-#include <debug/sbuf.h>
-#include <debug/shell.h>
-#include <debug/logmsg.h>
-#include <hv_lib.h>
-#include <public/acrn_common.h>
-#include <public/acrn_hv_defs.h>
-#include <arch/x86/softirq.h>
-#include <arch/x86/vmexit.h>
-#include <arch/x86/msr.h>
-#include <arch/x86/ioapic.h>
-#include <arch/x86/cpuid.h>
-#include <arch/x86/multiboot.h>
-#include <arch/x86/per_cpu.h>
-#include <arch/x86/vtd.h>
-#include <arch/x86/vmx.h>
-#include <arch/x86/hv_arch.h>
-#include <arch/x86/lapic.h>
-#include <arch/x86/apicreg.h>
-#include <arch/x86/zeropage.h>
-#include <arch/x86/host_pm.h>
-#include <arch/x86/timer.h>
-#include <arch/x86/cpu.h>
-#include <arch/x86/mtrr.h>
-#include <arch/x86/assign.h>
-#include <arch/x86/hob_parse.h>
-#include <arch/x86/gdt.h>
-#include <arch/x86/mmu.h>
-#include <arch/x86/idt.h>
-#include <arch/x86/io.h>
-#include <arch/x86/cpufeatures.h>
-#include <arch/x86/trusty.h>
-#include <arch/x86/irq.h>
-#include <arch/x86/guest/guest_pm.h>
-#include <arch/x86/guest/vlapic.h>
-#include <arch/x86/guest/vm.h>
-#include <arch/x86/guest/vioapic.h>
-#include <arch/x86/guest/ucode.h>
-#include <arch/x86/guest/vpic.h>
-#include <arch/x86/guest/vcpu.h>
-#include <arch/x86/guest/guest.h>
-#include <arch/x86/reboot.h>