diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index c58e759c5..7962d0a9c 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -9,6 +9,7 @@
 #include <sprintf.h>
 #include <vm.h>
 #include <bits.h>
+#include <uart16550.h>
 #include <e820.h>
 #include <multiboot.h>
 #include <vtd.h>
diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c
index fbc9a223c..738eabc7e 100644
--- a/hypervisor/arch/x86/init.c
+++ b/hypervisor/arch/x86/init.c
@@ -10,6 +10,7 @@
 #include <per_cpu.h>
 #include <profiling.h>
 #include <vtd.h>
+#include <shell.h>
 #include <vmx.h>
 #include <vm.h>
 #include <logmsg.h>
diff --git a/hypervisor/bsp/uefi/cmdline.c b/hypervisor/bsp/uefi/cmdline.c
index 0c26fd2ce..68e811049 100644
--- a/hypervisor/bsp/uefi/cmdline.c
+++ b/hypervisor/bsp/uefi/cmdline.c
@@ -4,8 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <errno.h>
 #include <multiboot.h>
+#include <pgtable.h>
+#include <dbg_cmd.h>
+#include <logmsg.h>
 
 #define ACRN_DBG_PARSE		6
 
diff --git a/hypervisor/debug/console.c b/hypervisor/debug/console.c
index 6f00aeb38..979783863 100644
--- a/hypervisor/debug/console.c
+++ b/hypervisor/debug/console.c
@@ -5,7 +5,8 @@
  */
 
 #include <hypervisor.h>
-#include "uart16550.h"
+#include <shell.h>
+#include <uart16550.h>
 
 struct hv_timer console_timer;
 
diff --git a/hypervisor/debug/dbg_cmd.c b/hypervisor/debug/dbg_cmd.c
index d03b01a69..8aeadd7f3 100644
--- a/hypervisor/debug/dbg_cmd.c
+++ b/hypervisor/debug/dbg_cmd.c
@@ -5,6 +5,7 @@
  */
 
 #include <hypervisor.h>
+#include <uart16550.h>
 
 #define MAX_PORT			0x10000  /* port 0 - 64K */
 #define DEFAULT_UART_PORT	0x3F8
diff --git a/hypervisor/debug/uart16550.c b/hypervisor/debug/uart16550.c
index c0560eebc..891a9a902 100644
--- a/hypervisor/debug/uart16550.c
+++ b/hypervisor/debug/uart16550.c
@@ -5,7 +5,7 @@
  */
 
 #include <hypervisor.h>
-#include "uart16550.h"
+#include <uart16550.h>
 
 #define MAX_BDF_LEN 8
 
diff --git a/hypervisor/debug/vuart.c b/hypervisor/debug/vuart.c
index 6cc479398..18424cad5 100644
--- a/hypervisor/debug/vuart.c
+++ b/hypervisor/debug/vuart.c
@@ -31,7 +31,7 @@
 #include <hypervisor.h>
 #include <ioapic.h>
 
-#include "uart16550.h"
+#include <uart16550.h>
 
 static uint32_t vuart_com_irq =  CONFIG_COM_IRQ;
 static uint16_t vuart_com_base = CONFIG_COM_BASE;
diff --git a/hypervisor/hw/pci.c b/hypervisor/hw/pci.c
index 66dc56442..319efeca0 100644
--- a/hypervisor/hw/pci.c
+++ b/hypervisor/hw/pci.c
@@ -30,6 +30,7 @@
  */
 
 #include <hypervisor.h>
+#include <uart16550.h>
 #include <pci.h>
 
 static spinlock_t pci_device_lock;
diff --git a/hypervisor/include/arch/x86/multiboot.h b/hypervisor/include/arch/x86/multiboot.h
index 4ec19e945..c160e3c3c 100644
--- a/hypervisor/include/arch/x86/multiboot.h
+++ b/hypervisor/include/arch/x86/multiboot.h
@@ -13,6 +13,7 @@
 #define	MULTIBOOT_INFO_HAS_MMAP		0x00000040U
 #define	MULTIBOOT_INFO_HAS_DRIVES	0x00000080U
 
+struct acrn_vm;
 struct multiboot_info {
 	uint32_t               mi_flags;
 
diff --git a/hypervisor/include/debug/console.h b/hypervisor/include/debug/console.h
index bf79ec444..641bf6825 100644
--- a/hypervisor/include/debug/console.h
+++ b/hypervisor/include/debug/console.h
@@ -38,15 +38,8 @@ void console_putc(const char *ch);
 char console_getc(void);
 
 void console_setup_timer(void);
-void uart16550_set_property(bool enabled, bool port_mapped, uint64_t base_addr);
-bool is_pci_dbg_uart(union pci_bdf bdf_value);
-bool is_dbg_uart_enabled(void);
-
-void shell_init(void);
-void shell_kick(void);
 
 void suspend_console(void);
 void resume_console(void);
 
-bool handle_dbg_cmd(const char *cmd, int32_t len);
 #endif /* CONSOLE_H */
diff --git a/hypervisor/include/debug/dbg_cmd.h b/hypervisor/include/debug/dbg_cmd.h
new file mode 100644
index 000000000..3c4802242
--- /dev/null
+++ b/hypervisor/include/debug/dbg_cmd.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef DBG_CMD_H
+#define DBG_CMD_H
+
+bool handle_dbg_cmd(const char *cmd, int32_t len);
+
+#endif /* DBG_CMD_H */
diff --git a/hypervisor/include/debug/shell.h b/hypervisor/include/debug/shell.h
new file mode 100644
index 000000000..67e5f4623
--- /dev/null
+++ b/hypervisor/include/debug/shell.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef SHELL_H
+#define SHELL_H
+
+void shell_init(void);
+void shell_kick(void);
+
+#endif /* SHELL_H */
diff --git a/hypervisor/debug/uart16550.h b/hypervisor/include/debug/uart16550.h
similarity index 96%
rename from hypervisor/debug/uart16550.h
rename to hypervisor/include/debug/uart16550.h
index 5eb5c718b..5a8228206 100644
--- a/hypervisor/debug/uart16550.h
+++ b/hypervisor/include/debug/uart16550.h
@@ -109,5 +109,8 @@
 void uart16550_init(void);
 char uart16550_getc(void);
 size_t uart16550_puts(const char *buf, uint32_t len);
+void uart16550_set_property(bool enabled, bool port_mapped, uint64_t base_addr);
+bool is_pci_dbg_uart(union pci_bdf bdf_value);
+bool is_dbg_uart_enabled(void);
 
 #endif /* !UART16550_H */