1.1 --- a/xen/include/xen/hvm/iommu.h	Mon Oct 13 10:06:33 2008 +0100
     1.2 +++ b/xen/include/xen/hvm/iommu.h	Mon Oct 13 10:08:16 2008 +0100
     1.3 @@ -17,16 +17,10 @@
     1.4   * Copyright (C) Allen Kay <allen.m.kay@intel.com>
     1.5   */
     1.6  
     1.7 -#ifndef __ASM_X86_HVM_IOMMU_H__
     1.8 -#define __ASM_X86_HVM_IOMMU_H__
     1.9 +#ifndef __XEN_HVM_IOMMU_H__
    1.10 +#define __XEN_HVM_IOMMU_H__
    1.11  
    1.12  #include <xen/iommu.h>
    1.13 -#include <asm/hvm/irq.h>
    1.14 -#include <asm/hvm/vpt.h>
    1.15 -#include <asm/hvm/vlapic.h>
    1.16 -#include <asm/hvm/io.h>
    1.17 -#include <public/hvm/params.h>
    1.18 -#include <public/hvm/save.h>
    1.19  
    1.20  struct g2m_ioport {
    1.21      struct list_head list;
    1.22 @@ -53,4 +47,4 @@ struct hvm_iommu {
    1.23      struct iommu_ops *platform_ops;
    1.24  };
    1.25  
    1.26 -#endif /* __ASM_X86_HVM_IOMMU_H__ */
    1.27 +#endif /* __XEN_HVM_IOMMU_H__ */

     2.1 --- a/xen/include/xen/iommu.h	Mon Oct 13 10:06:33 2008 +0100
     2.2 +++ b/xen/include/xen/iommu.h	Mon Oct 13 10:08:16 2008 +0100
     2.3 @@ -21,7 +21,6 @@
     2.4  #define _IOMMU_H_
     2.5  
     2.6  #include <xen/init.h>
     2.7 -#include <xen/pci.h>
     2.8  #include <xen/spinlock.h>
     2.9  #include <xen/pci.h>
    2.10  #include <public/hvm/ioreq.h>