HV: further cleanup of header inclusions

According to the comments in hypervisor:
 " This file includes config header file "bsp_cfg.h" and other
	hypervisor used header files.
	It should be included in all the source files."

this patch includes all common header files in hypervisor.h
then removes other redundant inclusions

Signed-off-by: Zide Chen <zide.chen@intel.com>

hypervisor/arch/x86/assign.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define ACTIVE_FLAG 0x1 /* any non zero should be okay */
 

hypervisor/arch/x86/cpu.c

@@ -29,13 +29,9 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
 #include <bsp_extern.h>
-#include <hv_arch.h>
 #include <schedule.h>
 #include <version.h>
-#include <hv_debug.h>
 
 spinlock_t cpu_secondary_spinlock = {
 	.head = 0,

hypervisor/arch/x86/cpu_primary.S

@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include        <hypervisor.h>
 #include        <cpu.h>
 #include        <mmu.h>
 #include        <gdt.h>

hypervisor/arch/x86/cpu_secondary.S

@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include        <hypervisor.h>
 #include        <spinlock.h>
 #include        <gdt.h>
 #include        <cpu.h>

hypervisor/arch/x86/cpu_state_tbl.c

@@ -28,9 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <acrn_common.h>
-#include <hv_lib.h>
-#include <hv_arch.h>
+#include <hypervisor.h>
 
 /* The table includes cpu px info of Intel A3960 SoC */
 struct cpu_px_data px_a3960[] = {

hypervisor/arch/x86/cpuid.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static inline struct vcpuid_entry *find_vcpuid_entry(struct vcpu *vcpu,
 					uint32_t leaf, uint32_t subleaf)

hypervisor/arch/x86/debug/reboot.c

@@ -2,7 +2,7 @@
  * Copyright (C) <2018> Intel Corporation
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <acrn_common.h>
+#include <hypervisor.h>
 
 int warm_reboot(void)
 {

hypervisor/arch/x86/ept.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_hv_defs.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #include "guest/instr_emul_wrapper.h"
 #include "guest/instr_emul.h"

hypervisor/arch/x86/gdt.c

@@ -28,8 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <gdt.h>
+#include <hypervisor.h>
 
 DEFINE_CPU_DATA(struct tss_64, tss);
 DEFINE_CPU_DATA(struct host_gdt, gdt);

hypervisor/arch/x86/guest/guest.c

@@ -29,12 +29,7 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <bsp_extern.h>
-#include <acrn_hv_defs.h>
-#include <hv_debug.h>
 #include <multiboot.h>
 
 #define ACRN_DBG_GUEST	6

hypervisor/arch/x86/guest/instr_emul.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #include "instr_emul_wrapper.h"
 #include "instr_emul.h"

hypervisor/arch/x86/guest/instr_emul_wrapper.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #include "instr_emul_wrapper.h"
 #include "instr_emul.h"

hypervisor/arch/x86/guest/pm.c

@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <acrn_common.h>
-#include <hv_lib.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 
 int validate_pstate(struct vm *vm, uint64_t perf_ctl)
 {

hypervisor/arch/x86/guest/ucode.c

@@ -28,9 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
+#include <hypervisor.h>
 #include <ucode.h>
 
 uint64_t get_microcode_version(void)

hypervisor/arch/x86/guest/vcpu.c

@@ -29,11 +29,7 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <schedule.h>
-#include <hv_debug.h>
 
 vm_sw_loader_t vm_sw_loader;
 

hypervisor/arch/x86/guest/vioapic.c

@@ -31,10 +31,6 @@
 #define pr_fmt(fmt)	"vioapic: " fmt
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define	IOREGSEL	0x00
 #define	IOWIN		0x10

hypervisor/arch/x86/guest/vlapic.c

@@ -30,11 +30,6 @@
 #define pr_fmt(fmt)	"vlapic: " fmt
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <acrn_hv_defs.h>
-#include <hv_debug.h>
 
 #include "instr_emul_wrapper.h"
 #include "instr_emul.h"

hypervisor/arch/x86/guest/vm.c

@@ -28,11 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
+#include <hypervisor.h>
 #include <bsp_extern.h>
-#include <hv_debug.h>
 #include <multiboot.h>
 
 /* Local variables */

hypervisor/arch/x86/guest/vmcall.c

@@ -28,11 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
-#include <acrn_hv_defs.h>
+#include <hypervisor.h>
 #include <hypercall.h>
 
 int vmcall_vmexit_handler(struct vcpu *vcpu)

hypervisor/arch/x86/guest/vmsr.c

@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 #include <ucode.h>
 
 /*MRS need to be emulated, the order in this array better as freq of ops*/

hypervisor/arch/x86/guest/vpic.c

@@ -28,10 +28,6 @@
 #define pr_fmt(fmt)	"vpic: " fmt
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define	VPIC_LOCK_INIT(vpic)	spinlock_init(&((vpic)->lock))
 #define	VPIC_LOCK(vpic)		spinlock_obtain(&((vpic)->lock))

hypervisor/arch/x86/interrupt.c

@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 
 #define EXCEPTION_ERROR_CODE_VALID  8
 #define INTERRPUT_QUEUE_BUFF_SIZE   255

hypervisor/arch/x86/intr_lapic.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 /* Rate range 1 to 1000 or 1uSec to 1mSec */
 #define APIC_TIMER_MAX      0xffffffff

hypervisor/arch/x86/intr_main.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 int interrupt_init(uint32_t cpu_id)
 {

hypervisor/arch/x86/io.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 int dm_emulate_pio_post(struct vcpu *vcpu)
 {

hypervisor/arch/x86/ioapic.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 /* Register offsets */
 #define IOAPIC_REGSEL_OFFSET   0

hypervisor/arch/x86/irq.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static spinlock_t exception_spinlock = { .head = 0, .tail = 0, };
 

hypervisor/arch/x86/mmu.c

@@ -28,10 +28,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static void *mmu_pml4_addr;
 

hypervisor/arch/x86/notify.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static struct dev_handler_node *notification_node;
 

hypervisor/arch/x86/softirq.c

@@ -29,9 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 
 static DEFINE_CPU_DATA(uint64_t, softirq_pending);
 

hypervisor/arch/x86/timer.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define MAX_TIMER_ACTIONS	32
 #define TIMER_IRQ		(NR_MAX_IRQS - 1)

hypervisor/arch/x86/trusty.c

@@ -28,11 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <acrn_hv_defs.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 #include <hkdf.h>
 
 _Static_assert(NR_WORLD == 2, "Only 2 Worlds supported!");

hypervisor/arch/x86/vmexit.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static int unhandled_vmexit_handler(struct vcpu *vcpu);
 static int xsetbv_vmexit_handler(struct vcpu *vcpu);

hypervisor/arch/x86/vmx.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #ifdef CONFIG_EFI_STUB
 #include <acrn_efi.h>
 extern struct efi_ctx* efi_ctx;

hypervisor/arch/x86/vtd.c

@@ -31,10 +31,6 @@
 #define pr_fmt(fmt)	"iommu: " fmt
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define DBG_IOMMU 0
 

hypervisor/boot/acpi.c

@@ -28,9 +28,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <cpu.h>
-#include <hv_debug.h>
 #include "acpi.h"
 #ifdef CONFIG_EFI_STUB
 #include <acrn_efi.h>

hypervisor/boot/dmar_parse.c

@@ -27,14 +27,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #include "bsp_cfg.h"
 #ifdef CONFIG_DMAR_PARSE_ENABLED
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "vtd.h"
 #include "acpi.h"
 

hypervisor/boot/sbl/multiboot.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <multiboot.h>
 #include <zeropage.h>
 

hypervisor/bsp/sbl/sbl.c

@@ -29,8 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <vtd.h>
 
 /* IOAPIC id */
 #define SBL_IOAPIC_ID   8

hypervisor/bsp/sbl/vm_description.c

@@ -29,9 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 
 #define NUM_USER_VMS    2
 

hypervisor/bsp/uefi/cmdline.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <multiboot.h>
 
 #define MAX_PORT			0x10000  /* port 0 - 64K */

hypervisor/bsp/uefi/uefi.c

@@ -29,14 +29,10 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <multiboot.h>
 #ifdef CONFIG_EFI_STUB
 #include <acrn_efi.h>
 #endif
-#include <hv_debug.h>
 
 /* IOAPIC id */
 #define UEFI_IOAPIC_ID   8

hypervisor/bsp/uefi/vm_description.c

@@ -29,9 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 
 #define NUM_USER_VMS    2
 

hypervisor/common/hv_main.c

@@ -29,11 +29,7 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <schedule.h>
-#include <hv_debug.h>
 
 bool x2apic_enabled;
 

hypervisor/common/hypercall.c

@@ -29,13 +29,8 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <schedule.h>
 #include <hypercall.h>
-#include <acrn_hv_defs.h>
-#include <hv_debug.h>
 #include <version.h>
 
 #define ACRN_DBG_HYCALL	6

hypervisor/common/io_request.c

@@ -4,10 +4,6 @@
  */
 
 #include <hypervisor.h>
-#include <acrn_common.h>
-#include <hv_lib.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define ACRN_DBG_IOREQUEST	6
 

hypervisor/common/schedule.c

@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 #include <schedule.h>
 
 struct sched_context {

hypervisor/common/stack_protector.c

@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 
 void __stack_chk_fail(void)
 {

hypervisor/common/trusty_hypercall.c

@@ -29,11 +29,7 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 #include <hypercall.h>
-#include <hv_debug.h>
 
 int64_t hcall_world_switch(struct vcpu *vcpu)
 {

hypervisor/common/vm_load.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <zeropage.h>
 
 static uint32_t create_e820_table(struct e820_entry *_e820)

hypervisor/debug/console.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "serial_internal.h"
 
 static spinlock_t lock;

hypervisor/debug/dump.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 /*
  * readable exception descriptors.

hypervisor/debug/logmsg.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define LOG_ENTRY_SIZE		80
 

hypervisor/debug/printf.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 static int charout(int cmd, const char *s, int sz, void *hnd)
 {

hypervisor/debug/sbuf.c

@@ -33,10 +33,7 @@
  *
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 
 DEFINE_CPU_DATA(uint64_t * [ACRN_SBUF_ID_MAX], sbuf);
 

hypervisor/debug/serial.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "serial_internal.h"
 
 static struct uart *sio_ports[SERIAL_MAX_DEVS];

hypervisor/debug/shell_internal.c

@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
+#include <hypervisor.h>
 #include <reboot.h>
 #include "shell_internal.h"
 #include "serial_internal.h"

hypervisor/debug/shell_public.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "shell_internal.h"
 
 /* Shell that uses serial I/O */

hypervisor/debug/uart16550.c

@@ -28,10 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-
+#include <hypervisor.h>
 #include "uart16550.h"
 #include "serial_internal.h"
 

hypervisor/debug/vuart.c

@@ -29,10 +29,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #include "uart16550.h"
 #include "serial_internal.h"

hypervisor/include/hypervisor.h

@@ -46,7 +46,13 @@
 #define HYPERVISOR_H
 
 /* Include config header file containing config options */
+#include <types.h>
 #include "bsp_cfg.h"
+#include "acrn_common.h"
+#include <acrn_hv_defs.h>
+#include <hv_lib.h>
+#include <hv_arch.h>
+#include <hv_debug.h>
 
 #ifndef ASSEMBLER
 /* hpa <--> hva, now it is 1:1 mapping */

hypervisor/include/lib/spinlock.h

@@ -31,8 +31,6 @@
 #ifndef SPINLOCK_H
 #define SPINLOCK_H
 
-#include <hypervisor.h>
-
 #ifndef ASSEMBLER
 
 #include <types.h>

hypervisor/include/public/acrn_hv_defs.h

@@ -39,11 +39,6 @@
 #ifndef ACRN_HV_DEFS_H
 #define ACRN_HV_DEFS_H
 
-/*
- * Common structures for ACRN/VHM/DM
- */
-#include "acrn_common.h"
-
 /*
  * Common structures for HV/VHM
  */

hypervisor/lib/div.c

@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hypervisor.h>
 #include <hv_lib.h>
 
 static int do_udiv32(uint32_t dividend, uint32_t divisor,

hypervisor/lib/mdelay.c

@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hypervisor.h>
 #include <hv_lib.h>
 
 void mdelay(uint32_t loop_count)

hypervisor/lib/memory.c

@@ -3,10 +3,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <hypervisor.h>
 
 /************************************************************************/

hypervisor/lib/sprintf.c

@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hypervisor.h>
 #include <hv_lib.h>
 
 #ifndef NULL

hypervisor/lib/string.c

@@ -8,10 +8,6 @@
  * constants.
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include <hypervisor.h>
 
 /* Categories.  */

hypervisor/lib/udelay.c

@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hypervisor.h>
 #include <hv_lib.h>
 
 void udelay(int loop_count)