diff --git a/src/arch/i386/include/arch/pirq_routing.h b/src/arch/i386/include/arch/pirq_routing.h
index 0165b5786e..de3cd78ad6 100644
--- a/src/arch/i386/include/arch/pirq_routing.h
+++ b/src/arch/i386/include/arch/pirq_routing.h
@@ -4,9 +4,32 @@
 #define PIRQ_SIGNATURE	(('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24))
 #define PIRQ_VERSION 0x0100
 
+struct irq_info {
+	u8 bus, devfn;			/* Bus, device and function */
+	struct {
+		u8 link;		/* IRQ line ID, chipset dependent, 0=not routed */
+		u16 bitmap;		/* Available IRQs */
+	} __attribute__((packed)) irq[4];
+	u8 slot;			/* Slot number, 0=onboard */
+	u8 rfu;
+} __attribute__((packed));
+
+struct irq_routing_table {
+	u32 signature;			/* PIRQ_SIGNATURE should be here */
+	u16 version;			/* PIRQ_VERSION */
+	u16 size;			/* Table size in bytes */
+	u8 rtr_bus, rtr_devfn;		/* Where the interrupt router lies */
+	u16 exclusive_irqs;		/* IRQs devoted exclusively to PCI usage */
+	u16 rtr_vendor, rtr_device;	/* Vendor and device ID of interrupt router */
+	u32 miniport_data;		/* Crap */
+	u8 rfu[11];
+	u8 checksum;			/* Modulo 256 checksum must give zero */
+	struct irq_info slots[0];
+} __attribute__((packed));
+
 extern const struct irq_routing_table intel_irq_routing_table;
 
-#if !defined(DEBUG) && defined(HAVE_PIRQ_TABLE)
+#if defined(DEBUG) && defined(HAVE_PIRQ_TABLE)
 void check_pirq_routing_table(void);
 #else
 #define check_pirq_routing_table() do {} while(0)
diff --git a/src/include/pci-i386.h b/src/include/pci-i386.h
index a71909ced2..6c28cde55d 100644
--- a/src/include/pci-i386.h
+++ b/src/include/pci-i386.h
@@ -35,29 +35,6 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
 
 /* pci-irq.c */
 
-struct irq_info {
-	u8 bus, devfn;			/* Bus, device and function */
-	struct {
-		u8 link;		/* IRQ line ID, chipset dependent, 0=not routed */
-		u16 bitmap;		/* Available IRQs */
-	} __attribute__((packed)) irq[4];
-	u8 slot;			/* Slot number, 0=onboard */
-	u8 rfu;
-} __attribute__((packed));
-
-struct irq_routing_table {
-	u32 signature;			/* PIRQ_SIGNATURE should be here */
-	u16 version;			/* PIRQ_VERSION */
-	u16 size;			/* Table size in bytes */
-	u8 rtr_bus, rtr_devfn;		/* Where the interrupt router lies */
-	u16 exclusive_irqs;		/* IRQs devoted exclusively to PCI usage */
-	u16 rtr_vendor, rtr_device;	/* Vendor and device ID of interrupt router */
-	u32 miniport_data;		/* Crap */
-	u8 rfu[11];
-	u8 checksum;			/* Modulo 256 checksum must give zero */
-	struct irq_info slots[0];
-} __attribute__((packed));
-
 extern unsigned int pcibios_irq_mask;
 
 void pcibios_irq_init(void);
diff --git a/src/mainboard/asus/cua/irq_tables.c b/src/mainboard/asus/cua/irq_tables.c
index 1d3b5d474c..febb23fd64 100644
--- a/src/mainboard/asus/cua/irq_tables.c
+++ b/src/mainboard/asus/cua/irq_tables.c
@@ -1,4 +1,4 @@
-#include <i386_subr.h>
+#include <arch/pirq_routing.h>
 
 /* NOTE -- THIS IS A PLACEHOLDER -- WE NEED TO FIX THIS */
 #define CHECKSUM 0xe6
diff --git a/src/mainboard/gigabit/ga-6bxc/irq_tables.c b/src/mainboard/gigabit/ga-6bxc/irq_tables.c
index 8a8860a602..82a4a3b5b5 100644
--- a/src/mainboard/gigabit/ga-6bxc/irq_tables.c
+++ b/src/mainboard/gigabit/ga-6bxc/irq_tables.c
@@ -1,5 +1,5 @@
-
 #include <subr.h>
+#include <arch/pirq_routing.h>
 
 /*
  * This table must be located between 0x000f0000 and 0x000fffff.
diff --git a/src/mainboard/irobot/proto1/irq_tables.c b/src/mainboard/irobot/proto1/irq_tables.c
index 8bc8b1f2c6..871a1feeb2 100644
--- a/src/mainboard/irobot/proto1/irq_tables.c
+++ b/src/mainboard/irobot/proto1/irq_tables.c
@@ -8,6 +8,7 @@ Need to define PIIX4_DEVFN=0x38 as compile time flag
 */
 
 #include <subr.h>
+#include <arch/pirq_routing.h>
 
 /*
  * This table must be located between 0x000f0000 and 0x000fffff.
diff --git a/src/mainboard/leadtek/winfast6300/irq_tables.c b/src/mainboard/leadtek/winfast6300/irq_tables.c
index 8a872815fc..85ce3de6ab 100644
--- a/src/mainboard/leadtek/winfast6300/irq_tables.c
+++ b/src/mainboard/leadtek/winfast6300/irq_tables.c
@@ -1,4 +1,4 @@
-#include <i386_subr.h>
+#include <arch/pirq_routing.h>
 
 #ifndef SIS630S
 #define CHECKSUM 0xe6
diff --git a/src/mainboard/matsonic/ms7308e/irq_tables.c b/src/mainboard/matsonic/ms7308e/irq_tables.c
index 35ac6a1eb6..6ef5997881 100644
--- a/src/mainboard/matsonic/ms7308e/irq_tables.c
+++ b/src/mainboard/matsonic/ms7308e/irq_tables.c
@@ -1,4 +1,4 @@
-#include <i386_subr.h>
+#include <arch/pirq_routing.h>
 
 #define CHECKSUM 0xe6
 const struct irq_routing_table intel_irq_routing_table = {
diff --git a/src/mainboard/pcchips/m754lmr/irq_tables.c b/src/mainboard/pcchips/m754lmr/irq_tables.c
index 1d3b5d474c..febb23fd64 100644
--- a/src/mainboard/pcchips/m754lmr/irq_tables.c
+++ b/src/mainboard/pcchips/m754lmr/irq_tables.c
@@ -1,4 +1,4 @@
-#include <i386_subr.h>
+#include <arch/pirq_routing.h>
 
 /* NOTE -- THIS IS A PLACEHOLDER -- WE NEED TO FIX THIS */
 #define CHECKSUM 0xe6
diff --git a/src/mainboard/pcchips/m810lmr/irq_tables.c b/src/mainboard/pcchips/m810lmr/irq_tables.c
index a1699fcb65..3c779c48b7 100644
--- a/src/mainboard/pcchips/m810lmr/irq_tables.c
+++ b/src/mainboard/pcchips/m810lmr/irq_tables.c
@@ -1,4 +1,4 @@
-#include <i386_subr.h>
+#include <arch/pirq_routing.h>
 
 #define CHECKSUM 0x14
 const struct irq_routing_table intel_irq_routing_table = {
diff --git a/src/mainboard/sis/540/irq_tables.c b/src/mainboard/sis/540/irq_tables.c
index 35ac6a1eb6..6ef5997881 100644
--- a/src/mainboard/sis/540/irq_tables.c
+++ b/src/mainboard/sis/540/irq_tables.c
@@ -1,4 +1,4 @@
-#include <i386_subr.h>
+#include <arch/pirq_routing.h>
 
 #define CHECKSUM 0xe6
 const struct irq_routing_table intel_irq_routing_table = {
diff --git a/src/mainboard/sis/550/irq_tables.c b/src/mainboard/sis/550/irq_tables.c
index 192b4b5a06..b04a0bdd6c 100644
--- a/src/mainboard/sis/550/irq_tables.c
+++ b/src/mainboard/sis/550/irq_tables.c
@@ -1,4 +1,4 @@
-#include <i386_subr.h>
+#include <arch/pirq_routing.h>
 
 #define CHECKSUM 0x1F
 const struct irq_routing_table intel_irq_routing_table = {