diff --git a/hypervisor/debug/console.c b/hypervisor/debug/console.c
index 979783863..697d76d47 100644
--- a/hypervisor/debug/console.c
+++ b/hypervisor/debug/console.c
@@ -4,9 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
-#include <shell.h>
+#include <types.h>
+#include <pci.h>
 #include <uart16550.h>
+#include <shell.h>
+#include <timer.h>
+#include <vuart.h>
+#include <logmsg.h>
 
 struct hv_timer console_timer;
 
diff --git a/hypervisor/debug/dbg_cmd.c b/hypervisor/debug/dbg_cmd.c
index 8aeadd7f3..f23e58ee4 100644
--- a/hypervisor/debug/dbg_cmd.c
+++ b/hypervisor/debug/dbg_cmd.c
@@ -4,8 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
+#include <pci.h>
 #include <uart16550.h>
+#include <vuart.h>
 
 #define MAX_PORT			0x10000  /* port 0 - 64K */
 #define DEFAULT_UART_PORT	0x3F8
diff --git a/hypervisor/debug/dump.c b/hypervisor/debug/dump.c
index 2e3b9f304..4faf83b43 100644
--- a/hypervisor/debug/dump.c
+++ b/hypervisor/debug/dump.c
@@ -4,8 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <per_cpu.h>
+#include <mmu.h>
+#include <vcpu.h>
+#include <vmx.h>
+#include <vm.h>
 #include <init.h>
+#include <logmsg.h>
 
 #define CALL_TRACE_HIERARCHY_MAX    20U
 #define DUMP_STACK_SIZE 0x200U
diff --git a/hypervisor/debug/hypercall.c b/hypervisor/debug/hypercall.c
index f20f43d34..4c906fd18 100644
--- a/hypervisor/debug/hypercall.c
+++ b/hypervisor/debug/hypercall.c
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
-#include <schedule.h>
-#include <hypercall.h>
-#include <version.h>
-#include <reloc.h>
+#include <types.h>
+#include <errno.h>
+#include <profiling.h>
+#include <sbuf.h>
+#include <npk_log.h>
+#include <vm.h>
+#include <logmsg.h>
 
 #ifdef PROFILING_ON
 /**
diff --git a/hypervisor/debug/logmsg.c b/hypervisor/debug/logmsg.c
index dcfedd64f..9bd8feb0d 100644
--- a/hypervisor/debug/logmsg.c
+++ b/hypervisor/debug/logmsg.c
@@ -4,8 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <atomic.h>
+#include <sprintf.h>
+#include <spinlock.h>
 #include <per_cpu.h>
+#include <npk_log.h>
+#include <logmsg.h>
+
 /* buf size should be identical to the size in hvlog option, which is
  * transfered to SOS:
  * bsp/uefi/clearlinux/acrn.conf: hvlog=2M@0x1FE00000
diff --git a/hypervisor/debug/npk_log.c b/hypervisor/debug/npk_log.c
index 0ab34f3fd..bc2947a83 100644
--- a/hypervisor/debug/npk_log.c
+++ b/hypervisor/debug/npk_log.c
@@ -3,7 +3,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <atomic.h>
+#include <acrn_hv_defs.h>
+#include <io.h>
+#include <per_cpu.h>
+#include <mmu.h>
+#include <logmsg.h>
 
 static int32_t npk_log_setup_ref;
 static bool npk_log_enabled;
diff --git a/hypervisor/debug/printf.c b/hypervisor/debug/printf.c
index ed33734e4..e54280704 100644
--- a/hypervisor/debug/printf.c
+++ b/hypervisor/debug/printf.c
@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
+#include <util.h>
+#include <sprintf.h>
+#include <console.h>
 
 static void
 charout(size_t cmd, const char *s_arg, uint32_t sz_arg, struct snprint_param *param)
diff --git a/hypervisor/debug/profiling.c b/hypervisor/debug/profiling.c
index 41afff600..d94e242b9 100644
--- a/hypervisor/debug/profiling.c
+++ b/hypervisor/debug/profiling.c
@@ -5,7 +5,16 @@
  */
 #ifdef PROFILING_ON
 
-#include <hypervisor.h>
+#include <types.h>
+#include <errno.h>
+#include <irq.h>
+#include <per_cpu.h>
+#include <pgtable.h>
+#include <vmx.h>
+#include <cpuid.h>
+#include <vm.h>
+#include <sprintf.h>
+#include <logmsg.h>
 
 #define ACRN_DBG_PROFILING		5U
 #define ACRN_ERR_PROFILING		3U
diff --git a/hypervisor/debug/sbuf.c b/hypervisor/debug/sbuf.c
index 9a5053959..bc7353f48 100644
--- a/hypervisor/debug/sbuf.c
+++ b/hypervisor/debug/sbuf.c
@@ -9,7 +9,12 @@
  *
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
+#include <errno.h>
+#include <sbuf.h>
+#include <cpu.h>
+#include <per_cpu.h>
 
 static inline bool sbuf_is_empty(const struct shared_buf *sbuf)
 {
diff --git a/hypervisor/debug/shell.c b/hypervisor/debug/shell.c
index 91ec303f9..706d0e7a3 100644
--- a/hypervisor/debug/shell.c
+++ b/hypervisor/debug/shell.c
@@ -4,9 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
-#include <ioapic.h>
+#include <types.h>
+#include <errno.h>
+#include <bits.h>
+#include <page.h>
 #include "shell_priv.h"
+#include <irq.h>
+#include <console.h>
+#include <per_cpu.h>
+#include <vmx.h>
+#include <cpuid.h>
+#include <ioapic.h>
+#include <ptdev.h>
+#include <vm.h>
+#include <sprintf.h>
+#include <logmsg.h>
 
 #define TEMP_STR_SIZE		60U
 #define MAX_STR_SIZE		256U
diff --git a/hypervisor/debug/string.c b/hypervisor/debug/string.c
index 20de36f80..04d02739b 100644
--- a/hypervisor/debug/string.c
+++ b/hypervisor/debug/string.c
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
 
 /*
  * Convert a string to a long integer - decimal support only.
diff --git a/hypervisor/debug/trace.c b/hypervisor/debug/trace.c
index 3a0fbdc83..7c62e454b 100644
--- a/hypervisor/debug/trace.c
+++ b/hypervisor/debug/trace.c
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <per_cpu.h>
 
 #define TRACE_CUSTOM			0xFCU
 #define TRACE_FUNC_ENTER		0xFDU
diff --git a/hypervisor/debug/uart16550.c b/hypervisor/debug/uart16550.c
index 891a9a902..687562dee 100644
--- a/hypervisor/debug/uart16550.c
+++ b/hypervisor/debug/uart16550.c
@@ -4,8 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include  <types.h>
+#include <spinlock.h>
+#include <pci.h>
+#include <pgtable.h>
 #include <uart16550.h>
+#include <io.h>
+#include <mmu.h>
 
 #define MAX_BDF_LEN 8
 
diff --git a/hypervisor/debug/vuart.c b/hypervisor/debug/vuart.c
index 18424cad5..0350c21e9 100644
--- a/hypervisor/debug/vuart.c
+++ b/hypervisor/debug/vuart.c
@@ -28,10 +28,13 @@
  * $FreeBSD$
  */
 
-#include <hypervisor.h>
-#include <ioapic.h>
-
+#include <types.h>
+#include <pci.h>
 #include <uart16550.h>
+#include <console.h>
+#include <vuart.h>
+#include <vm.h>
+#include <logmsg.h>
 
 static uint32_t vuart_com_irq =  CONFIG_COM_IRQ;
 static uint16_t vuart_com_base = CONFIG_COM_BASE;
diff --git a/hypervisor/include/debug/console.h b/hypervisor/include/debug/console.h
index 641bf6825..f029445d5 100644
--- a/hypervisor/include/debug/console.h
+++ b/hypervisor/include/debug/console.h
@@ -7,8 +7,6 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include <pci.h>
-
 /* Switching key combinations for shell and uart console */
 #define GUEST_CONSOLE_TO_HV_SWITCH_KEY      0       /* CTRL + SPACE */
 
diff --git a/hypervisor/include/debug/vuart.h b/hypervisor/include/debug/vuart.h
index b0e74d8d1..524e5c3bf 100644
--- a/hypervisor/include/debug/vuart.h
+++ b/hypervisor/include/debug/vuart.h
@@ -29,6 +29,8 @@
 
 #ifndef VUART_H
 #define VUART_H
+#include <types.h>
+#include <spinlock.h>
 
 #define RX_BUF_SIZE		256U
 #define TX_BUF_SIZE		8192U