diff --git a/[refs] b/[refs]
index 4f46d76bad19..b4b797645cd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79fec2c557cf69187dad09ba55ee389872485622
+refs/heads/master: 399988eea194a8453e283fdd2da968d1fd39a7cf
diff --git a/trunk/arch/x86/include/asm/irq_remapping.h b/trunk/arch/x86/include/asm/irq_remapping.h
index dcb0c7231028..5fb9bbbd2f14 100644
--- a/trunk/arch/x86/include/asm/irq_remapping.h
+++ b/trunk/arch/x86/include/asm/irq_remapping.h
@@ -22,11 +22,9 @@
 #ifndef __X86_IRQ_REMAPPING_H
 #define __X86_IRQ_REMAPPING_H
 
-#ifdef CONFIG_IRQ_REMAP
+#include <asm/io_apic.h>
 
-struct IO_APIC_route_entry;
-struct io_apic_irq_attr;
-struct pci_dev;
+#ifdef CONFIG_IRQ_REMAP
 
 extern int irq_remapping_enabled;