diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/acpi/sleep.c RC13-git12-amd64-irq/arch/x86_64/kernel/acpi/sleep.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/acpi/sleep.c	2005-09-10 15:41:34.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/acpi/sleep.c	2005-09-12 14:50:24.000000000 -0400
@@ -34,7 +34,6 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/bootmem.h>
-#include <linux/irq.h>
 #include <linux/acpi.h>
 #include <asm/mpspec.h>
 #include <asm/io.h>
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/apic.c RC13-git12-amd64-irq/arch/x86_64/kernel/apic.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/apic.c	2005-08-28 23:09:40.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/apic.c	2005-09-12 14:50:24.000000000 -0400
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/bootmem.h>
 #include <linux/smp_lock.h>
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/crash.c RC13-git12-amd64-irq/arch/x86_64/kernel/crash.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/crash.c	2005-08-28 23:09:40.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/crash.c	2005-09-12 14:50:24.000000000 -0400
@@ -11,7 +11,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/smp.h>
-#include <linux/irq.h>
 #include <linux/reboot.h>
 #include <linux/kexec.h>
 
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/i8259.c RC13-git12-amd64-irq/arch/x86_64/kernel/i8259.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/i8259.c	2005-08-28 23:09:40.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/i8259.c	2005-09-12 14:50:24.000000000 -0400
@@ -18,15 +18,12 @@
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/hw_irq.h>
 #include <asm/pgtable.h>
 #include <asm/delay.h>
 #include <asm/desc.h>
 #include <asm/apic.h>
 
-#include <linux/irq.h>
-
 /*
  * Common place to define all x86 IRQ vectors
  *
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/io_apic.c RC13-git12-amd64-irq/arch/x86_64/kernel/io_apic.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/io_apic.c	2005-09-10 15:41:34.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/io_apic.c	2005-09-12 14:50:24.000000000 -0400
@@ -21,7 +21,6 @@
  */
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/mpparse.c RC13-git12-amd64-irq/arch/x86_64/kernel/mpparse.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/mpparse.c	2005-09-10 15:41:34.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/mpparse.c	2005-09-12 14:50:24.000000000 -0400
@@ -14,7 +14,6 @@
  */
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/config.h>
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/nmi.c RC13-git12-amd64-irq/arch/x86_64/kernel/nmi.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/nmi.c	2005-09-08 10:07:30.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/nmi.c	2005-09-12 14:50:24.000000000 -0400
@@ -14,7 +14,6 @@
 
 #include <linux/config.h>
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/bootmem.h>
 #include <linux/smp_lock.h>
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/process.c RC13-git12-amd64-irq/arch/x86_64/kernel/process.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/process.c	2005-09-08 10:07:30.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/process.c	2005-09-12 14:50:24.000000000 -0400
@@ -32,7 +32,6 @@
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/ptrace.h>
 #include <linux/utsname.h>
 #include <linux/random.h>
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/smp.c RC13-git12-amd64-irq/arch/x86_64/kernel/smp.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/smp.c	2005-08-28 23:09:40.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/smp.c	2005-09-12 14:50:24.000000000 -0400
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/smpboot.c RC13-git12-amd64-irq/arch/x86_64/kernel/smpboot.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/smpboot.c	2005-09-10 15:41:34.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/smpboot.c	2005-09-12 14:50:24.000000000 -0400
@@ -44,7 +44,6 @@
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>
 #include <linux/smp_lock.h>
-#include <linux/irq.h>
 #include <linux/bootmem.h>
 #include <linux/thread_info.h>
 #include <linux/module.h>
@@ -58,6 +57,8 @@
 #include <asm/tlbflush.h>
 #include <asm/proto.h>
 #include <asm/nmi.h>
+#include <asm/irq.h>
+#include <asm/hw_irq.h>
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/suspend.c RC13-git12-amd64-irq/arch/x86_64/kernel/suspend.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/suspend.c	2005-08-28 23:09:40.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/suspend.c	2005-09-12 14:50:24.000000000 -0400
@@ -8,23 +8,8 @@
  */
 
 #include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/spinlock.h>
-#include <linux/poll.h>
-#include <linux/delay.h>
-#include <linux/sysrq.h>
-#include <linux/proc_fs.h>
-#include <linux/irq.h>
-#include <linux/pm.h>
-#include <linux/device.h>
+#include <linux/smp.h>
 #include <linux/suspend.h>
-#include <asm/uaccess.h>
-#include <asm/acpi.h>
-#include <asm/tlbflush.h>
-#include <asm/io.h>
 #include <asm/proto.h>
 
 struct saved_context saved_context;
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/time.c RC13-git12-amd64-irq/arch/x86_64/kernel/time.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/time.c	2005-09-08 10:07:30.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/time.c	2005-09-12 14:50:24.000000000 -0400
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/mc146818rtc.h>
-#include <linux/irq.h>
 #include <linux/time.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff -urN RC13-git12-page_alloc/arch/x86_64/kernel/traps.c RC13-git12-amd64-irq/arch/x86_64/kernel/traps.c
--- RC13-git12-page_alloc/arch/x86_64/kernel/traps.c	2005-09-08 10:07:30.000000000 -0400
+++ RC13-git12-amd64-irq/arch/x86_64/kernel/traps.c	2005-09-12 14:50:24.000000000 -0400
@@ -47,9 +47,6 @@
 #include <asm/proto.h>
 #include <asm/nmi.h>
 
-#include <linux/irq.h>
-
-
 extern struct gate_struct idt_table[256]; 
 
 asmlinkage void divide_error(void);