diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index 4b4145a77..c497e22a8 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -21,6 +21,7 @@
 #include <version.h>
 #include <vmx.h>
 #include <msr.h>
+#include <ptdev.h>
 #include <ld_sym.h>
 #include <logmsg.h>
 #include <cat.h>
diff --git a/hypervisor/arch/x86/guest/assign.c b/hypervisor/arch/x86/guest/assign.c
index 6165cf7e7..459813992 100644
--- a/hypervisor/arch/x86/guest/assign.c
+++ b/hypervisor/arch/x86/guest/assign.c
@@ -9,6 +9,7 @@
 #include <bits.h>
 #include <vm.h>
 #include <vtd.h>
+#include <ptdev.h>
 #include <per_cpu.h>
 #include <ioapic.h>
 
diff --git a/hypervisor/arch/x86/vtd.c b/hypervisor/arch/x86/vtd.c
index 402ab5f9b..7f30891cd 100644
--- a/hypervisor/arch/x86/vtd.c
+++ b/hypervisor/arch/x86/vtd.c
@@ -17,6 +17,7 @@
 #include <mmu.h>
 #include <lapic.h>
 #include <vtd.h>
+#include <timer.h>
 #include <logmsg.h>
 #include <vm_configurations.h>
 
diff --git a/hypervisor/include/arch/x86/vtd.h b/hypervisor/include/arch/x86/vtd.h
index 3a52d4d4f..3e376eece 100644
--- a/hypervisor/include/arch/x86/vtd.h
+++ b/hypervisor/include/arch/x86/vtd.h
@@ -6,7 +6,8 @@
 
 #ifndef VTD_H
 #define VTD_H
-#include <ptdev.h>
+#include <types.h>
+#include <pci.h>
 /*
  * Intel IOMMU register specification per version 1.0 public spec.
  */
@@ -56,6 +57,16 @@ struct iommu_domain {
 	bool iommu_snoop;
 };
 
+union source {
+	uint16_t ioapic_id;
+	union pci_bdf msi;
+};
+
+struct intr_source {
+	bool is_msi;
+	union source src;
+};
+
 static inline uint8_t dmar_ver_major(uint64_t version)
 {
 	return (((uint8_t)version & 0xf0U) >> 4U);
diff --git a/hypervisor/include/common/ptdev.h b/hypervisor/include/common/ptdev.h
index 0a328589e..c7f497099 100644
--- a/hypervisor/include/common/ptdev.h
+++ b/hypervisor/include/common/ptdev.h
@@ -8,7 +8,6 @@
 #define PTDEV_H
 #include <list.h>
 #include <spinlock.h>
-#include <pci.h>
 #include <timer.h>
 
 #define PTDEV_INTR_MSI		(1U << 0U)
@@ -25,16 +24,6 @@ union source_id (name) = {.msi_id = {.bdf = (a), .entry_nr = (b)} }
 #define DEFINE_IOAPIC_SID(name, a, b)	\
 union source_id (name) = {.intx_id = {.pin = (a), .src = (b)} }
 
-union source {
-	uint16_t ioapic_id;
-	union pci_bdf msi;
-};
-
-struct intr_source {
-	bool is_msi;
-	union source src;
-};
-
 union irte_index {
 	uint16_t index;
 	struct {