diff -r 59b8768d0d0d xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/arch/x86/domain.c	Thu Mar 06 09:30:04 2008 +0800
@@ -46,7 +46,7 @@
 #include <asm/debugreg.h>
 #include <asm/msr.h>
 #include <asm/nmi.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 #ifdef CONFIG_COMPAT
 #include <compat/vcpu.h>
 #endif
diff -r 59b8768d0d0d xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/arch/x86/domctl.c	Wed Mar 05 11:22:58 2008 +0800
@@ -26,7 +26,7 @@
 #include <asm/hvm/cacheattr.h>
 #include <asm/processor.h>
 #include <xsm/xsm.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 
 long arch_do_domctl(
     struct xen_domctl *domctl,
diff -r 59b8768d0d0d xen/arch/x86/hvm/intercept.c
--- a/xen/arch/x86/hvm/intercept.c	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/arch/x86/hvm/intercept.c	Wed Mar 05 11:22:58 2008 +0800
@@ -30,7 +30,7 @@
 #include <asm/current.h>
 #include <io_ports.h>
 #include <xen/event.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 
 extern struct hvm_mmio_handler hpet_mmio_handler;
 extern struct hvm_mmio_handler vlapic_mmio_handler;
diff -r 59b8768d0d0d xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/arch/x86/irq.c	Wed Mar 05 11:22:58 2008 +0800
@@ -15,7 +15,7 @@
 #include <xen/keyhandler.h>
 #include <xen/compat.h>
 #include <asm/current.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 
 /* opt_noirqbalance: If true, software IRQ balancing/affinity is disabled. */
 int opt_noirqbalance = 0;
diff -r 59b8768d0d0d xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/arch/x86/mm/p2m.c	Thu Mar 06 09:30:04 2008 +0800
@@ -27,7 +27,7 @@
 #include <asm/page.h>
 #include <asm/paging.h>
 #include <asm/p2m.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 
 /* Debugging and auditing of the P2M code? */
 #define P2M_AUDIT     0
diff -r 59b8768d0d0d xen/drivers/passthrough/amd/iommu_detect.c
--- a/xen/drivers/passthrough/amd/iommu_detect.c	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/drivers/passthrough/amd/iommu_detect.c	Wed Mar 05 11:22:58 2008 +0800
@@ -20,7 +20,7 @@
 
 #include <xen/config.h>
 #include <xen/errno.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 #include <asm/amd-iommu.h>
 #include <asm/hvm/svm/amd-iommu-proto.h>
 #include "../pci-direct.h"
diff -r 59b8768d0d0d xen/drivers/passthrough/amd/iommu_map.c
--- a/xen/drivers/passthrough/amd/iommu_map.c	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/drivers/passthrough/amd/iommu_map.c	Wed Mar 05 11:22:58 2008 +0800
@@ -19,7 +19,7 @@
  */
 
 #include <xen/sched.h>
-#include <asm/hvm/iommu.h>
+#include <xen/hvm/iommu.h>
 #include <asm/amd-iommu.h>
 #include <asm/hvm/svm/amd-iommu-proto.h>
 
diff -r 59b8768d0d0d xen/drivers/passthrough/vtd/dmar.h
--- a/xen/drivers/passthrough/vtd/dmar.h	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/drivers/passthrough/vtd/dmar.h	Wed Mar 05 11:22:58 2008 +0800
@@ -22,7 +22,7 @@
 #define _DMAR_H_
 
 #include <xen/list.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 
 extern u8 dmar_host_address_width;
 
diff -r 59b8768d0d0d xen/include/asm-x86/fixmap.h
--- a/xen/include/asm-x86/fixmap.h	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/include/asm-x86/fixmap.h	Wed Mar 05 11:22:58 2008 +0800
@@ -17,7 +17,7 @@
 #include <asm/acpi.h>
 #include <asm/page.h>
 #include <xen/kexec.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 #include <asm/amd-iommu.h>
 
 /*
diff -r 59b8768d0d0d xen/include/asm-x86/hvm/domain.h
--- a/xen/include/asm-x86/hvm/domain.h	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/include/asm-x86/hvm/domain.h	Wed Mar 05 11:22:58 2008 +0800
@@ -21,13 +21,13 @@
 #ifndef __ASM_X86_HVM_DOMAIN_H__
 #define __ASM_X86_HVM_DOMAIN_H__
 
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 #include <asm/hvm/irq.h>
 #include <asm/hvm/vpt.h>
 #include <asm/hvm/vlapic.h>
 #include <asm/hvm/vioapic.h>
 #include <asm/hvm/io.h>
-#include <asm/hvm/iommu.h>
+#include <xen/hvm/iommu.h>
 #include <public/hvm/params.h>
 #include <public/hvm/save.h>
 
diff -r 59b8768d0d0d xen/include/asm-x86/io_apic.h
--- a/xen/include/asm-x86/io_apic.h	Wed Mar 05 11:18:25 2008 +0000
+++ b/xen/include/asm-x86/io_apic.h	Wed Mar 05 11:22:58 2008 +0800
@@ -6,7 +6,7 @@
 #include <asm/mpspec.h>
 #include <asm/apicdef.h>
 #include <asm/fixmap.h>
-#include <asm/iommu.h>
+#include <xen/iommu.h>
 
 /*
  * Intel IO-APIC support for SMP and UP systems.