4 files changed, 24 insertions, 4 deletions
diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h
index 774b5505b8..002b8244b0 100644
--- a/src/include/device/azalia_device.h
+++ b/src/include/device/azalia_device.h
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <console/console.h>
 #include <arch/acpi.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/interrupt.h>
 
 #include <device/device.h>
diff --git a/src/include/device/mmio.h b/src/include/device/mmio.h
new file mode 100644
index 0000000000..bebf0cfbd4
--- /dev/null
+++ b/src/include/device/mmio.h
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __DEVICE_MMIO_H__
+#define __DEVICE_MMIO_H__
+
+/* FIXME: We only want the volatile MMIO ops. */
+#include <arch/io.h>
+
+#endif
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 0ead5784f6..a4f6536e64 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -19,12 +19,11 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <arch/io.h>
 #include <device/pci_def.h>
 #include <device/resource.h>
 #include <device/device.h>
 #include <device/pci_rom.h>
-
+#include <device/pci_type.h>
 
 /* Common pci operations without a standard interface */
 struct pci_operations {
diff --git a/src/include/device/pci_mmio_cfg.h b/src/include/device/pci_mmio_cfg.h
index d7ada4d84e..147b630c0b 100644
--- a/src/include/device/pci_mmio_cfg.h
+++ b/src/include/device/pci_mmio_cfg.h
@@ -17,7 +17,7 @@
 #define _PCI_MMIO_CFG_H
 
 #include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_type.h>
 
 #define DEFAULT_PCIEXBAR	CONFIG_MMCONF_BASE_ADDRESS