[RFC,v3,3/5] Include hw/irq.h where qemu_irq is used

diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h
index 72b602f..72265ba 100644
--- a/hw/net/ne2000.h
+++ b/hw/net/ne2000.h
@@ -3,6 +3,8 @@ 
 #ifndef HW_NE2000_H
 #define HW_NE2000_H 1
 
+#include "hw/irq.h"
+
 #define NE2000_PMEM_SIZE    (32*1024)
 #define NE2000_PMEM_START   (16*1024)
 #define NE2000_PMEM_END     (NE2000_PMEM_SIZE+NE2000_PMEM_START)
diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index 012e2ea..11474f5 100644
--- a/hw/net/pcnet.h
+++ b/hw/net/pcnet.h
@@ -10,6 +10,7 @@ 
 #define PCNET_LOOPTEST_NOCRC	2
 
 #include "exec/memory.h"
+#include "hw/irq.h"
 
 /* BUS CONFIGURATION REGISTERS */
 #define BCR_MSRDA    0
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index 3e9013b..4c5d3c5 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -3,6 +3,7 @@ 
 #ifndef HW_FDC_H
 #define HW_FDC_H
 
+#include "hw/irq.h"
 #include "qemu-common.h"
 
 /* fdc.c */
diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h
index 99c6a68..b37fa76 100644
--- a/include/hw/char/escc.h
+++ b/include/hw/char/escc.h
@@ -3,6 +3,8 @@ 
 #ifndef HW_ESCC_H
 #define HW_ESCC_H 1
 
+#include "hw/irq.h"
+
 /* escc.c */
 #define TYPE_ESCC "escc"
 #define ESCC_SIZE 4
diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h
index da127ba..bbb7a1f 100644
--- a/include/hw/char/pl011.h
+++ b/include/hw/char/pl011.h
@@ -17,6 +17,8 @@ 
 #ifndef PL011_UART_H
 #define PL011_UART_H
 
+#include "hw/irq.h"
+
 static inline DeviceState *pl011_create(hwaddr addr,
                                         qemu_irq irq,
                                         CharDriverState *chr)
diff --git a/include/hw/char/xilinx_uartlite.h b/include/hw/char/xilinx_uartlite.h
index 7652174..f9070f8 100644
--- a/include/hw/char/xilinx_uartlite.h
+++ b/include/hw/char/xilinx_uartlite.h
@@ -17,6 +17,8 @@ 
 #ifndef XILINX_UARTLITE_H
 #define XILINX_UARTLITE_H
 
+#include "hw/irq.h"
+
 static inline DeviceState *xilinx_uartlite_create(hwaddr addr,
                                         qemu_irq irq,
                                         CharDriverState *chr)
diff --git a/include/hw/cris/etraxfs_dma.h b/include/hw/cris/etraxfs_dma.h
index 185d50f..925e289 100644
--- a/include/hw/cris/etraxfs_dma.h
+++ b/include/hw/cris/etraxfs_dma.h
@@ -3,6 +3,8 @@ 
 #ifndef HW_ETRAXFS_DMA_H
 #define HW_ETRAXFS_DMA_H 1
 
+#include "hw/irq.h"
+
 struct dma_context_metadata {
 	/* data descriptor md */
 	uint16_t metadata;
diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h
index ddc8405..99aafc3 100644
--- a/include/hw/isa/vt82c686.h
+++ b/include/hw/isa/vt82c686.h
@@ -1,8 +1,8 @@ 
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef HW_VT82C686_H
 #define HW_VT82C686_H
 
+#include "hw/irq.h"
+
 /* vt82c686.c */
 ISABus *vt82c686b_init(PCIBus * bus, int devfn);
 void vt82c686b_ac97_init(PCIBus *bus, int devfn);
diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h
index 8f5608b..16412dc 100644
--- a/include/hw/mips/mips.h
+++ b/include/hw/mips/mips.h
@@ -1,5 +1,3 @@ 
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef HW_MIPS_H
 #define HW_MIPS_H
 /* Definitions for mips board emulation.  */
@@ -8,6 +6,7 @@ 
 #define INITRD_PAGE_MASK (~((1 << 16) - 1))
 
 #include "exec/memory.h"
+#include "hw/irq.h"
 
 /* gt64xxx.c */
 PCIBus *gt64120_register(qemu_irq *pic);
diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_emac.h
index 2a668a6..c14b270 100644
--- a/include/hw/net/allwinner_emac.h
+++ b/include/hw/net/allwinner_emac.h
@@ -27,6 +27,7 @@ 
 
 #include "net/net.h"
 #include "qemu/fifo8.h"
+#include "hw/irq.h"
 #include "hw/net/mii.h"
 
 #define TYPE_AW_EMAC "allwinner-emac"
diff --git a/include/hw/pci-host/apb.h b/include/hw/pci-host/apb.h
index b076064..c059fe2 100644
--- a/include/hw/pci-host/apb.h
+++ b/include/hw/pci-host/apb.h
@@ -3,6 +3,7 @@ 
 #ifndef APB_PCI_H
 #define APB_PCI_H
 
+#include "hw/irq.h"
 #include "qemu-common.h"
 
 PCIBus *pci_apb_init(hwaddr special_base,
diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwinner-a10-pit.h
index f3f7c08..0704791 100644
--- a/include/hw/timer/allwinner-a10-pit.h
+++ b/include/hw/timer/allwinner-a10-pit.h
@@ -3,6 +3,7 @@ 
 #ifndef AW_A10_PIT_H
 #define AW_A10_PIT_H
 
+#include "hw/irq.h"
 #include "hw/ptimer.h"
 
 #define TYPE_AW_A10_PIT "allwinner-A10-timer"
diff --git a/include/hw/timer/aspeed_timer.h b/include/hw/timer/aspeed_timer.h
index 50f9deb..444977b 100644
--- a/include/hw/timer/aspeed_timer.h
+++ b/include/hw/timer/aspeed_timer.h
@@ -25,6 +25,7 @@ 
 #ifndef ASPEED_TIMER_H
 #define ASPEED_TIMER_H
 
+#include "hw/irq.h"
 #include "qemu/timer.h"
 
 #define ASPEED_TIMER(obj) \
diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h
index e541e52..06e1f44 100644
--- a/include/hw/timer/m48t59.h
+++ b/include/hw/timer/m48t59.h
@@ -3,6 +3,7 @@ 
 #ifndef NVRAM_H
 #define NVRAM_H
 
+#include "hw/irq.h"
 #include "qemu-common.h"
 #include "qom/object.h"