diff --git a/hypervisor/release/console.c b/hypervisor/release/console.c
index 1cd410a8a..fc0826447 100644
--- a/hypervisor/release/console.c
+++ b/hypervisor/release/console.c
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <pci.h>
 
 size_t console_write(__unused const char *str, __unused size_t len)
 {
diff --git a/hypervisor/release/dump.c b/hypervisor/release/dump.c
index 077c24472..a367ab66b 100644
--- a/hypervisor/release/dump.c
+++ b/hypervisor/release/dump.c
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <irq.h>
 
 void dump_intr_excp_frame(__unused const struct intr_excp_ctx *ctx) {}
 void dump_exception(__unused struct intr_excp_ctx *ctx, __unused uint16_t pcpu_id) {}
diff --git a/hypervisor/release/hypercall.c b/hypervisor/release/hypercall.c
index 49564726e..836088c37 100644
--- a/hypervisor/release/hypercall.c
+++ b/hypervisor/release/hypercall.c
@@ -4,7 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <errno.h>
+#include <vm.h>
 
 int32_t hcall_debug(__unused struct acrn_vm *vm, __unused uint64_t param1, __unused uint64_t param2,
 			__unused uint64_t hypcall_id)
diff --git a/hypervisor/release/logmsg.c b/hypervisor/release/logmsg.c
index 095dd0b51..5966d032f 100644
--- a/hypervisor/release/logmsg.c
+++ b/hypervisor/release/logmsg.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
 
 void init_logmsg(__unused uint32_t flags) {}
 void do_logmsg(__unused uint32_t severity, __unused const char *fmt, ...) {}
diff --git a/hypervisor/release/npk_log.c b/hypervisor/release/npk_log.c
index f38a3760f..fc1cb026a 100644
--- a/hypervisor/release/npk_log.c
+++ b/hypervisor/release/npk_log.c
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <acrn_hv_defs.h>
 
 void npk_log_setup(__unused struct hv_npk_log_param *param) {}
 void npk_log_write(__unused const char *buf, __unused size_t len) {}
diff --git a/hypervisor/release/profiling.c b/hypervisor/release/profiling.c
index 21342d3a7..0d86a98f3 100644
--- a/hypervisor/release/profiling.c
+++ b/hypervisor/release/profiling.c
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <vcpu.h>
 
 void profiling_vmenter_handler(__unused struct acrn_vcpu *vcpu) {}
 void profiling_pre_vmexit_handler(__unused struct acrn_vcpu *vcpu) {}
diff --git a/hypervisor/release/trace.c b/hypervisor/release/trace.c
index b73e0577e..ef14532a7 100644
--- a/hypervisor/release/trace.c
+++ b/hypervisor/release/trace.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
 
 void TRACE_2L(__unused uint32_t evid, __unused uint64_t e, __unused uint64_t f) {}
 
diff --git a/hypervisor/release/vuart.c b/hypervisor/release/vuart.c
index e6c8f5f5a..dac88f18e 100644
--- a/hypervisor/release/vuart.c
+++ b/hypervisor/release/vuart.c
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <vm.h>
 
 void vuart_init(__unused struct acrn_vm *vm) {}