aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accel/kvm/kvm-all.c1
-rw-r--r--audio/audio.c1
-rw-r--r--audio/spiceaudio.c1
-rw-r--r--audio/wavcapture.c1
-rw-r--r--cpus.c1
-rw-r--r--device-hotplug.c1
-rw-r--r--exec.c1
-rw-r--r--hw/9pfs/xen-9p-backend.c1
-rw-r--r--hw/acpi/core.c1
-rw-r--r--hw/acpi/cpu_hotplug.c1
-rw-r--r--hw/acpi/ich9.c1
-rw-r--r--hw/acpi/pcihp.c1
-rw-r--r--hw/acpi/piix4.c1
-rw-r--r--hw/adc/stm32f2xx_adc.c1
-rw-r--r--hw/alpha/dp264.c1
-rw-r--r--hw/alpha/typhoon.c1
-rw-r--r--hw/arm/boot.c1
-rw-r--r--hw/arm/collie.c1
-rw-r--r--hw/arm/gumstix.c1
-rw-r--r--hw/arm/integratorcp.c1
-rw-r--r--hw/arm/mainstone.c1
-rw-r--r--hw/arm/musicpal.c1
-rw-r--r--hw/arm/omap2.c1
-rw-r--r--hw/arm/omap_sx1.c1
-rw-r--r--hw/arm/palm.c1
-rw-r--r--hw/arm/pxa2xx_pic.c1
-rw-r--r--hw/arm/spitz.c1
-rw-r--r--hw/arm/tosa.c1
-rw-r--r--hw/arm/virt-acpi-build.c1
-rw-r--r--hw/arm/z2.c1
-rw-r--r--hw/audio/ac97.c1
-rw-r--r--hw/audio/adlib.c1
-rw-r--r--hw/audio/cs4231a.c1
-rw-r--r--hw/audio/es1370.c1
-rw-r--r--hw/audio/gus.c1
-rw-r--r--hw/audio/hda-codec.c1
-rw-r--r--hw/audio/intel-hda.c1
-rw-r--r--hw/audio/marvell_88w8618.c1
-rw-r--r--hw/audio/milkymist-ac97.c1
-rw-r--r--hw/audio/pcspk.c1
-rw-r--r--hw/audio/sb16.c1
-rw-r--r--hw/block/dataplane/xen-block.c1
-rw-r--r--hw/block/ecc.c1
-rw-r--r--hw/block/fdc.c1
-rw-r--r--hw/block/m25p80.c1
-rw-r--r--hw/block/nvme.c1
-rw-r--r--hw/block/pflash_cfi01.c1
-rw-r--r--hw/block/pflash_cfi02.c1
-rw-r--r--hw/block/tc58128.c1
-rw-r--r--hw/block/xen-block.c1
-rw-r--r--hw/char/debugcon.c1
-rw-r--r--hw/char/digic-uart.c1
-rw-r--r--hw/char/escc.c1
-rw-r--r--hw/char/lm32_juart.c1
-rw-r--r--hw/char/lm32_uart.c1
-rw-r--r--hw/char/mcf_uart.c1
-rw-r--r--hw/char/milkymist-uart.c1
-rw-r--r--hw/char/omap_uart.c1
-rw-r--r--hw/char/parallel.c1
-rw-r--r--hw/char/sh_serial.c1
-rw-r--r--hw/char/xen_console.c1
-rw-r--r--hw/char/xilinx_uartlite.c1
-rw-r--r--hw/core/empty_slot.c1
-rw-r--r--hw/core/null-machine.c1
-rw-r--r--hw/core/ptimer.c1
-rw-r--r--hw/cris/boot.c1
-rw-r--r--hw/display/ati.c1
-rw-r--r--hw/display/bcm2835_fb.c1
-rw-r--r--hw/display/bochs-display.c1
-rw-r--r--hw/display/cirrus_vga.c1
-rw-r--r--hw/display/cirrus_vga_isa.c1
-rw-r--r--hw/display/exynos4210_fimd.c1
-rw-r--r--hw/display/framebuffer.c1
-rw-r--r--hw/display/milkymist-tmu2.c1
-rw-r--r--hw/display/omap_lcdc.c1
-rw-r--r--hw/display/qxl.h1
-rw-r--r--hw/display/sm501.c1
-rw-r--r--hw/display/tc6393xb.c1
-rw-r--r--hw/display/vga-isa-mm.c1
-rw-r--r--hw/display/vga-isa.c1
-rw-r--r--hw/display/vga-pci.c1
-rw-r--r--hw/display/vga.c1
-rw-r--r--hw/display/virtio-vga.c1
-rw-r--r--hw/display/vmware_vga.c1
-rw-r--r--hw/display/xenfb.c1
-rw-r--r--hw/dma/i8257.c1
-rw-r--r--hw/dma/pl080.c1
-rw-r--r--hw/dma/puv3_dma.c1
-rw-r--r--hw/dma/rc4030.c1
-rw-r--r--hw/dma/sparc32_dma.c1
-rw-r--r--hw/dma/xilinx_axidma.c1
-rw-r--r--hw/gpio/max7310.c1
-rw-r--r--hw/gpio/omap_gpio.c1
-rw-r--r--hw/gpio/puv3_gpio.c1
-rw-r--r--hw/gpio/zaurus.c1
-rw-r--r--hw/hppa/dino.c1
-rw-r--r--hw/hppa/machine.c1
-rw-r--r--hw/i2c/bitbang_i2c.c1
-rw-r--r--hw/i2c/omap_i2c.c1
-rw-r--r--hw/i2c/pm_smbus.c1
-rw-r--r--hw/i2c/ppc4xx_i2c.c1
-rw-r--r--hw/i2c/smbus_eeprom.c1
-rw-r--r--hw/i2c/smbus_ich9.c1
-rw-r--r--hw/i2c/smbus_master.c1
-rw-r--r--hw/i2c/smbus_slave.c1
-rw-r--r--hw/i386/amd_iommu.h1
-rw-r--r--hw/i386/multiboot.c1
-rw-r--r--hw/i386/pc.c1
-rw-r--r--hw/i386/pc_piix.c1
-rw-r--r--hw/i386/pc_q35.c1
-rw-r--r--hw/i386/pc_sysfw.c1
-rw-r--r--hw/i386/vmmouse.c1
-rw-r--r--hw/i386/vmport.c1
-rw-r--r--hw/i386/xen/xen-hvm.c1
-rw-r--r--hw/i386/xen/xen_platform.c1
-rw-r--r--hw/i386/xen/xen_pvdevice.c1
-rw-r--r--hw/ide/ahci-allwinner.c1
-rw-r--r--hw/ide/ahci.c1
-rw-r--r--hw/ide/cmd646.c1
-rw-r--r--hw/ide/core.c1
-rw-r--r--hw/ide/ich.c1
-rw-r--r--hw/ide/ioport.c1
-rw-r--r--hw/ide/isa.c1
-rw-r--r--hw/ide/macio.c1
-rw-r--r--hw/ide/microdrive.c1
-rw-r--r--hw/ide/mmio.c1
-rw-r--r--hw/ide/pci.c1
-rw-r--r--hw/ide/piix.c1
-rw-r--r--hw/ide/qdev.c1
-rw-r--r--hw/ide/via.c1
-rw-r--r--hw/input/hid.c1
-rw-r--r--hw/input/lm832x.c1
-rw-r--r--hw/input/milkymist-softusb.c1
-rw-r--r--hw/input/pckbd.c1
-rw-r--r--hw/input/ps2.c1
-rw-r--r--hw/input/stellaris_input.c1
-rw-r--r--hw/input/tsc2005.c1
-rw-r--r--hw/intc/etraxfs_pic.c1
-rw-r--r--hw/intc/exynos4210_combiner.c1
-rw-r--r--hw/intc/heathrow_pic.c1
-rw-r--r--hw/intc/i8259.c1
-rw-r--r--hw/intc/ioapic.c1
-rw-r--r--hw/intc/lm32_pic.c1
-rw-r--r--hw/intc/mips_gic.c1
-rw-r--r--hw/intc/omap_intc.c1
-rw-r--r--hw/intc/ompic.c1
-rw-r--r--hw/intc/openpic.c1
-rw-r--r--hw/intc/openpic_kvm.c1
-rw-r--r--hw/intc/sh_intc.c1
-rw-r--r--hw/intc/xics.c1
-rw-r--r--hw/intc/xics_kvm.c1
-rw-r--r--hw/intc/xics_spapr.c1
-rw-r--r--hw/intc/xilinx_intc.c1
-rw-r--r--hw/ipmi/ipmi.c1
-rw-r--r--hw/ipmi/isa_ipmi_bt.c1
-rw-r--r--hw/ipmi/isa_ipmi_kcs.c1
-rw-r--r--hw/isa/apm.c1
-rw-r--r--hw/isa/lpc_ich9.c1
-rw-r--r--hw/isa/piix4.c1
-rw-r--r--hw/isa/vt82c686.c1
-rw-r--r--hw/lm32/lm32_boards.c1
-rw-r--r--hw/lm32/milkymist.c1
-rw-r--r--hw/m68k/an5206.c1
-rw-r--r--hw/microblaze/boot.h1
-rw-r--r--hw/microblaze/petalogix_ml605_mmu.c1
-rw-r--r--hw/microblaze/petalogix_s3adsp1800_mmu.c1
-rw-r--r--hw/mips/addr.c1
-rw-r--r--hw/mips/boston.c1
-rw-r--r--hw/mips/gt64xxx_pci.c1
-rw-r--r--hw/mips/mips_fulong2e.c1
-rw-r--r--hw/mips/mips_int.c1
-rw-r--r--hw/mips/mips_jazz.c1
-rw-r--r--hw/mips/mips_malta.c1
-rw-r--r--hw/mips/mips_mipssim.c1
-rw-r--r--hw/mips/mips_r4k.c1
-rw-r--r--hw/misc/applesmc.c1
-rw-r--r--hw/misc/arm_integrator_debug.c1
-rw-r--r--hw/misc/arm_sysctl.c1
-rw-r--r--hw/misc/debugexit.c1
-rw-r--r--hw/misc/edu.c1
-rw-r--r--hw/misc/ivshmem.c1
-rw-r--r--hw/misc/macio/cuda.c1
-rw-r--r--hw/misc/macio/gpio.c1
-rw-r--r--hw/misc/macio/mac_dbdma.c1
-rw-r--r--hw/misc/macio/macio.c1
-rw-r--r--hw/misc/macio/pmu.c1
-rw-r--r--hw/misc/milkymist-hpdmc.c1
-rw-r--r--hw/misc/milkymist-pfpu.c1
-rw-r--r--hw/misc/mips_cmgcr.c1
-rw-r--r--hw/misc/mos6522.c1
-rw-r--r--hw/misc/mst_fpga.c1
-rw-r--r--hw/misc/omap_gpmc.c1
-rw-r--r--hw/misc/omap_l4.c1
-rw-r--r--hw/misc/omap_sdrc.c1
-rw-r--r--hw/misc/pc-testdev.c1
-rw-r--r--hw/misc/pca9552.c1
-rw-r--r--hw/misc/pci-testdev.c1
-rw-r--r--hw/misc/puv3_pm.c1
-rw-r--r--hw/misc/tmp105.c1
-rw-r--r--hw/misc/tmp421.c1
-rw-r--r--hw/misc/unimp.c1
-rw-r--r--hw/misc/zynq-xadc.c1
-rw-r--r--hw/misc/zynq_slcr.c1
-rw-r--r--hw/moxie/moxiesim.c1
-rw-r--r--hw/net/can/can_kvaser_pci.c1
-rw-r--r--hw/net/can/can_mioe3680_pci.c1
-rw-r--r--hw/net/can/can_pcm3680_pci.c1
-rw-r--r--hw/net/can/can_sja1000.c1
-rw-r--r--hw/net/e1000.c1
-rw-r--r--hw/net/e1000e.c1
-rw-r--r--hw/net/e1000e_core.c1
-rw-r--r--hw/net/e1000x_common.c1
-rw-r--r--hw/net/eepro100.c1
-rw-r--r--hw/net/lan9118.c1
-rw-r--r--hw/net/milkymist-minimac2.c1
-rw-r--r--hw/net/mipsnet.c1
-rw-r--r--hw/net/ne2000.h1
-rw-r--r--hw/net/opencores_eth.c1
-rw-r--r--hw/net/rocker/rocker.c1
-rw-r--r--hw/net/rocker/rocker_desc.c1
-rw-r--r--hw/net/rtl8139.c1
-rw-r--r--hw/net/spapr_llan.c1
-rw-r--r--hw/net/sunhme.c1
-rw-r--r--hw/net/xen_nic.c1
-rw-r--r--hw/net/xilinx_axienet.c1
-rw-r--r--hw/net/xilinx_ethlite.c1
-rw-r--r--hw/nios2/10m50_devboard.c1
-rw-r--r--hw/nios2/boot.h1
-rw-r--r--hw/nios2/generic_nommu.c1
-rw-r--r--hw/nvram/chrp_nvram.c1
-rw-r--r--hw/nvram/eeprom93xx.c1
-rw-r--r--hw/nvram/eeprom_at24c.c1
-rw-r--r--hw/nvram/fw_cfg.c1
-rw-r--r--hw/nvram/mac_nvram.c1
-rw-r--r--hw/openrisc/cputimer.c1
-rw-r--r--hw/openrisc/openrisc_sim.c1
-rw-r--r--hw/openrisc/pic_cpu.c1
-rw-r--r--hw/pci-host/bonito.c1
-rw-r--r--hw/pci-host/gpex.c1
-rw-r--r--hw/pci-host/piix.c1
-rw-r--r--hw/pci-host/ppce500.c1
-rw-r--r--hw/pci-host/prep.c1
-rw-r--r--hw/pci-host/q35.c1
-rw-r--r--hw/pci-host/uninorth.c1
-rw-r--r--hw/pci/msix.c1
-rw-r--r--hw/pci/pci.c1
-rw-r--r--hw/pci/pcie_host.c1
-rw-r--r--hw/pcmcia/pcmcia.c1
-rw-r--r--hw/pcmcia/pxa2xx.c1
-rw-r--r--hw/ppc/e500.c1
-rw-r--r--hw/ppc/mac_newworld.c1
-rw-r--r--hw/ppc/mac_oldworld.c1
-rw-r--r--hw/ppc/mpc8544_guts.c1
-rw-r--r--hw/ppc/pnv.c1
-rw-r--r--hw/ppc/pnv_bmc.c1
-rw-r--r--hw/ppc/pnv_occ.c1
-rw-r--r--hw/ppc/pnv_psi.c1
-rw-r--r--hw/ppc/pnv_xscom.c1
-rw-r--r--hw/ppc/ppc.c1
-rw-r--r--hw/ppc/ppc405_boards.c1
-rw-r--r--hw/ppc/ppc405_uc.c1
-rw-r--r--hw/ppc/ppc440_bamboo.c1
-rw-r--r--hw/ppc/ppc440_pcix.c1
-rw-r--r--hw/ppc/ppc440_uc.c1
-rw-r--r--hw/ppc/ppc4xx_devs.c1
-rw-r--r--hw/ppc/ppc4xx_pci.c1
-rw-r--r--hw/ppc/ppc_booke.c1
-rw-r--r--hw/ppc/prep.c1
-rw-r--r--hw/ppc/sam460ex.c1
-rw-r--r--hw/ppc/spapr.c1
-rw-r--r--hw/ppc/spapr_iommu.c1
-rw-r--r--hw/ppc/spapr_pci.c1
-rw-r--r--hw/ppc/spapr_vio.c1
-rw-r--r--hw/ppc/virtex_ml507.c1
-rw-r--r--hw/rdma/vmw/pvrdma_cmd.c1
-rw-r--r--hw/rdma/vmw/pvrdma_main.c1
-rw-r--r--hw/riscv/sifive_e.c1
-rw-r--r--hw/riscv/sifive_prci.c1
-rw-r--r--hw/riscv/sifive_test.c1
-rw-r--r--hw/riscv/sifive_u.c1
-rw-r--r--hw/riscv/sifive_uart.c1
-rw-r--r--hw/riscv/spike.c1
-rw-r--r--hw/riscv/virt.c1
-rw-r--r--hw/s390x/virtio-ccw.c1
-rw-r--r--hw/scsi/lsi53c895a.c1
-rw-r--r--hw/scsi/megasas.c1
-rw-r--r--hw/scsi/mptconfig.c1
-rw-r--r--hw/scsi/mptendian.c1
-rw-r--r--hw/scsi/mptsas.c1
-rw-r--r--hw/scsi/scsi-bus.c1
-rw-r--r--hw/scsi/spapr_vscsi.c1
-rw-r--r--hw/sd/milkymist-memcard.c1
-rw-r--r--hw/sd/omap_mmc.c1
-rw-r--r--hw/sd/pxa2xx_mmci.c1
-rw-r--r--hw/sd/sd.c1
-rw-r--r--hw/sd/sdhci-pci.c1
-rw-r--r--hw/sd/sdhci.c1
-rw-r--r--hw/sh4/r2d.c1
-rw-r--r--hw/sh4/sh7750.c1
-rw-r--r--hw/sh4/sh7750_regnames.c1
-rw-r--r--hw/sh4/shix.c1
-rw-r--r--hw/sparc/leon3.c1
-rw-r--r--hw/sparc64/niagara.c1
-rw-r--r--hw/sparc64/sun4u.c1
-rw-r--r--hw/timer/a9gtimer.c1
-rw-r--r--hw/timer/arm_mptimer.c1
-rw-r--r--hw/timer/exynos4210_mct.c1
-rw-r--r--hw/timer/exynos4210_rtc.c1
-rw-r--r--hw/timer/hpet.c1
-rw-r--r--hw/timer/i8254.c1
-rw-r--r--hw/timer/i8254_common.c1
-rw-r--r--hw/timer/lm32_timer.c1
-rw-r--r--hw/timer/m48t59.c1
-rw-r--r--hw/timer/mc146818rtc.c1
-rw-r--r--hw/timer/milkymist-sysctl.c1
-rw-r--r--hw/timer/mips_gictimer.c1
-rw-r--r--hw/timer/omap_gptimer.c1
-rw-r--r--hw/timer/omap_synctimer.c1
-rw-r--r--hw/timer/pxa2xx_timer.c1
-rw-r--r--hw/timer/sun4v-rtc.c1
-rw-r--r--hw/timer/twl92230.c1
-rw-r--r--hw/tpm/tpm_emulator.c1
-rw-r--r--hw/tpm/tpm_passthrough.c1
-rw-r--r--hw/tricore/tricore_testboard.c1
-rw-r--r--hw/usb/bus.c1
-rw-r--r--hw/usb/dev-audio.c1
-rw-r--r--hw/usb/dev-hid.c1
-rw-r--r--hw/usb/dev-wacom.c1
-rw-r--r--hw/usb/hcd-ehci.h1
-rw-r--r--hw/usb/hcd-ohci-pci.c1
-rw-r--r--hw/usb/hcd-ohci.c1
-rw-r--r--hw/usb/hcd-uhci.c1
-rw-r--r--hw/usb/hcd-xhci-nec.c1
-rw-r--r--hw/usb/hcd-xhci.c1
-rw-r--r--hw/usb/libhw.c1
-rw-r--r--hw/usb/tusb6010.c1
-rw-r--r--hw/vfio/pci-quirks.c1
-rw-r--r--hw/vfio/pci.c1
-rw-r--r--hw/virtio/vhost.c1
-rw-r--r--hw/virtio/virtio-bus.c1
-rw-r--r--hw/watchdog/wdt_i6300esb.c1
-rw-r--r--hw/watchdog/wdt_ib700.c1
-rw-r--r--hw/xen/xen-bus-helper.c1
-rw-r--r--hw/xen/xen-bus.c1
-rw-r--r--hw/xen/xen-legacy-backend.c1
-rw-r--r--hw/xen/xen_pt_load_rom.c1
-rw-r--r--hw/xenpv/xen_machine_pv.c1
-rw-r--r--hw/xtensa/mx_pic.c1
-rw-r--r--hw/xtensa/pic_cpu.c1
-rw-r--r--include/hw/audio/pcspk.h1
-rw-r--r--include/hw/audio/wm8750.h1
-rw-r--r--include/hw/char/serial.h1
-rw-r--r--include/hw/char/stm32f2xx_usart.h1
-rw-r--r--include/hw/dma/i8257.h1
-rw-r--r--include/hw/hw.h1
-rw-r--r--include/hw/i386/ich9.h1
-rw-r--r--include/hw/i386/ioapic_internal.h1
-rw-r--r--include/hw/input/i8042.h1
-rw-r--r--include/hw/isa/apm.h1
-rw-r--r--include/hw/isa/i8259_internal.h1
-rw-r--r--include/hw/misc/stm32f2xx_syscfg.h1
-rw-r--r--include/hw/net/ne2000-isa.h1
-rw-r--r--include/hw/pci-host/designware.h1
-rw-r--r--include/hw/pci-host/gpex.h1
-rw-r--r--include/hw/pci-host/q35.h1
-rw-r--r--include/hw/pci-host/uninorth.h1
-rw-r--r--include/hw/pci-host/xilinx-pcie.h1
-rw-r--r--include/hw/pci/pcie.h1
-rw-r--r--include/hw/pci/pcie_aer.h1
-rw-r--r--include/hw/qdev.h1
-rw-r--r--include/hw/riscv/riscv_htif.h1
-rw-r--r--include/hw/ssi/stm32f2xx_spi.h1
-rw-r--r--include/hw/timer/aspeed_rtc.h1
-rw-r--r--include/hw/timer/i8254.h1
-rw-r--r--include/hw/timer/i8254_internal.h1
-rw-r--r--include/hw/virtio/vhost.h1
-rw-r--r--include/hw/virtio/virtio.h1
-rw-r--r--include/hw/xen/xen_common.h1
-rw-r--r--include/sysemu/dma.h1
-rw-r--r--include/sysemu/hax.h1
-rw-r--r--include/sysemu/hvf.h1
-rw-r--r--monitor/misc.c1
-rw-r--r--target/alpha/machine.c1
-rw-r--r--target/arm/machine.c1
-rw-r--r--target/cris/machine.c1
-rw-r--r--target/hppa/machine.c1
-rw-r--r--target/i386/cpu.c1
-rw-r--r--target/i386/machine.c1
-rw-r--r--target/lm32/machine.c1
-rw-r--r--target/mips/machine.c1
-rw-r--r--target/moxie/machine.c1
-rw-r--r--target/openrisc/machine.c1
-rw-r--r--target/ppc/kvm.c1
-rw-r--r--target/ppc/machine.c1
-rw-r--r--target/s390x/cpu.c1
-rw-r--r--target/s390x/kvm.c1
-rw-r--r--target/s390x/machine.c1
-rw-r--r--target/s390x/mmu_helper.c1
-rw-r--r--target/sparc/machine.c1
-rw-r--r--ui/spice-core.c1
-rw-r--r--vl.c1
401 files changed, 27 insertions, 374 deletions
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index f450f25..d20da99 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -23,7 +23,6 @@
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/s390x/adapter.h"
diff --git a/audio/audio.c b/audio/audio.c
index cf65ae4..b9b2d07 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "audio.h"
#include "migration/vmstate.h"
#include "monitor/monitor.h"
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 0ead5ae..ec1c8fe 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qemu/host-utils.h"
#include "qemu/module.h"
#include "qemu/error-report.h"
diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 74320df..493edc6 100644
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
diff --git a/cpus.c b/cpus.c
index 4ebdacd..e70cc58 100644
--- a/cpus.c
+++ b/cpus.c
@@ -56,6 +56,7 @@
#include "hw/nmi.h"
#include "sysemu/replay.h"
#include "hw/boards.h"
+#include "hw/hw.h"
#ifdef CONFIG_LINUX
diff --git a/device-hotplug.c b/device-hotplug.c
index 6153259..f01d537 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
diff --git a/exec.c b/exec.c
index 3e78de3..78f849d 100644
--- a/exec.c
+++ b/exec.c
@@ -42,7 +42,6 @@
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#else /* !CONFIG_USER_ONLY */
-#include "hw/hw.h"
#include "exec/memory.h"
#include "exec/ioport.h"
#include "sysemu/dma.h"
diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c
index 25ab04d..c50b196 100644
--- a/hw/9pfs/xen-9p-backend.c
+++ b/hw/9pfs/xen-9p-backend.c
@@ -10,7 +10,6 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/9pfs/9p.h"
#include "hw/xen/xen-legacy-backend.h"
#include "hw/9pfs/xen-9pfs.h"
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 39e9fb1..f36d60f 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/acpi/acpi.h"
#include "hw/nvram/fw_cfg.h"
diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 5243918..a83567e 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -10,7 +10,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/acpi/cpu_hotplug.h"
#include "qapi/error.h"
#include "qom/cpu.h"
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 88eb7db..39649cb 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "hw/i386/pc.h"
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index 912ff6d..ac49a5a 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "hw/acpi/pcihp.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 1896dbb..ec47a91 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -20,7 +20,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
#include "hw/isa/apm.h"
diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c
index 9684653..4f9d485 100644
--- a/hw/adc/stm32f2xx_adc.c
+++ b/hw/adc/stm32f2xx_adc.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "hw/hw.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/adc/stm32f2xx_adc.h"
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 9dfb835..546b89b 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "elf.h"
#include "hw/loader.h"
#include "hw/boards.h"
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 6797eb0..5d7f8f3 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -11,7 +11,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index d082daf..8563672 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -12,7 +12,6 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include <libfdt.h>
-#include "hw/hw.h"
#include "hw/arm/boot.h"
#include "hw/arm/linux-boot-if.h"
#include "sysemu/kvm.h"
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 3db3c56..219643c 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "strongarm.h"
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 343cbfd..f26a0e8 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -36,7 +36,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index f8fbe40..ecccb41 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -21,6 +21,7 @@
#include "sysemu/sysemu.h"
#include "qemu/error-report.h"
#include "hw/char/pl011.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#define TYPE_INTEGRATOR_CM "integrator_core"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index cd1f904..1bad1ae 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm/boot.h"
#include "net/net.h"
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 72e522a..a3cfdc3 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -19,6 +19,7 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/char/serial.h"
+#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 397630e..af5e3d0 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -25,7 +25,6 @@
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
#include "hw/boards.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/arm/boot.h"
#include "hw/arm/omap.h"
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index cae78d0..75a05c3 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -27,7 +27,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index a5eccb7..bea47b9 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "audio/audio.h"
#include "sysemu/sysemu.h"
#include "sysemu/qtest.h"
diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c
index c8bd497..203d4d2 100644
--- a/hw/arm/pxa2xx_pic.c
+++ b/hw/arm/pxa2xx_pic.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 003929b..2eabb9c 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm/boot.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 80c61ae..7f136bf 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm/boot.h"
#include "hw/arm/sharpsl.h"
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 4f85eb5..fa9afd2 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -36,7 +36,6 @@
#include "hw/acpi/acpi.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/acpi/bios-linker-loader.h"
-#include "hw/hw.h"
#include "hw/acpi/aml-build.h"
#include "hw/acpi/utils.h"
#include "hw/acpi/pci.h"
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 810922d..1e3db42 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm/boot.h"
#include "hw/i2c/i2c.h"
diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index 26ac84b..9af584f 100644
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/audio/soundhw.h"
#include "audio/audio.h"
#include "hw/pci/pci.h"
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 7dd9a89..62e59cc 100644
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/audio/soundhw.h"
#include "audio/audio.h"
#include "hw/isa/isa.h"
diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index f7a39c0..383200e 100644
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/audio/soundhw.h"
#include "audio/audio.h"
#include "hw/irq.h"
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 0289f77..39deecb 100644
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -27,7 +27,6 @@
#define SILENT_ES1370
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/audio/soundhw.h"
#include "audio/audio.h"
#include "hw/pci/pci.h"
diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index 1a78cc4..787e047 100644
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/audio/soundhw.h"
#include "audio/audio.h"
#include "hw/irq.h"
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 4f6fbb8..4c33c47 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "intel-hda.h"
#include "migration/vmstate.h"
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index e6f150b..5a1fcde 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/msi.h"
#include "qemu/timer.h"
diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index 6345bc1..158a456 100644
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/audio/wm8750.h"
#include "audio/audio.h"
diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c
index 890a5fe..481dde1 100644
--- a/hw/audio/milkymist-ac97.c
+++ b/hw/audio/milkymist-ac97.c
@@ -22,7 +22,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 9039c97..016946d 100644
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/audio/soundhw.h"
#include "audio/audio.h"
diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 5991947..8186595 100644
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/audio/soundhw.h"
#include "audio/audio.h"
#include "hw/irq.h"
diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c
index 0f200c5..71c6333 100644
--- a/hw/block/dataplane/xen-block.c
+++ b/hw/block/dataplane/xen-block.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/xen/xen_common.h"
#include "hw/block/xen_blkif.h"
#include "sysemu/block-backend.h"
diff --git a/hw/block/ecc.c b/hw/block/ecc.c
index f846ab3..1a18236 100644
--- a/hw/block/ecc.c
+++ b/hw/block/ecc.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "migration/vmstate.h"
#include "hw/block/flash.h"
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 88feb0f..7542c8f 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -28,7 +28,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/block/fdc.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 9d39516..c213e2e 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "sysemu/block-backend.h"
#include "hw/ssi/ssi.h"
#include "migration/vmstate.h"
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 079a8ff..e08853f 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "hw/block/block.h"
-#include "hw/hw.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 2d6f260..7bfe9de 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -37,7 +37,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/block/block.h"
#include "hw/block/flash.h"
#include "sysemu/block-backend.h"
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index b7070cd..18ea50f 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -33,7 +33,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/block/block.h"
#include "hw/block/flash.h"
#include "qapi/error.h"
diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index d0fae24..9888f01 100644
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "hw/loader.h"
#include "sysemu/qtest.h"
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index 69d7319..848a0ad 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -17,7 +17,6 @@
#include "qapi/visitor.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h"
-#include "hw/hw.h"
#include "hw/xen/xen_common.h"
#include "hw/block/xen_blkif.h"
#include "hw/xen/xen-block.h"
diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index e1b6d11..b38d828 100644
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "chardev/char-fe.h"
#include "hw/isa/isa.h"
diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index 79ea922..cc50167 100644
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -27,7 +27,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "chardev/char-fe.h"
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 404002b..35c6952 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index f4488fa..69dd7ac 100644
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index 4b3215f..00832fb 100644
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index c403a1f..1712b22 100644
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index 53c1ca7..e90f84d 100644
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -22,7 +22,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index b3bb1cf..13e4f43 100644
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
#include "chardev/char.h"
-#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/char/serial.h"
#include "exec/address-spaces.h"
diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 1798fd0..3980eb5 100644
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -26,7 +26,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "chardev/char-parallel.h"
#include "chardev/char-fe.h"
#include "hw/irq.h"
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 7a40aa9..07dc16b 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sh4/sh.h"
#include "chardev/char-fe.h"
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index 47e1092..8cc9328 100644
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -24,7 +24,6 @@
#include <termios.h>
#include "qapi/error.h"
-#include "hw/hw.h"
#include "chardev/char-fe.h"
#include "hw/xen/xen-legacy-backend.h"
diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 250eed9..fa7451f 100644
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c
index c694532..3ba450e 100644
--- a/hw/core/empty_slot.c
+++ b/hw/core/empty_slot.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
#include "hw/empty_slot.h"
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 04a1e2b..30b1991 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 49b6028..d58e2df 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
#include "migration/vmstate.h"
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index d44fdec..2d2cc0c 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/loader.h"
#include "elf.h"
#include "boot.h"
diff --git a/hw/display/ati.c b/hw/display/ati.c
index a747c4c..df978a4 100644
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -24,7 +24,6 @@
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "ui/console.h"
#include "hw/display/i2c-ddc.h"
#include "trace.h"
diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 3d99d99..e606893 100644
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -26,6 +26,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/display/bcm2835_fb.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "framebuffer.h"
#include "ui/pixel_ops.h"
diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c
index 3acc1d5..1ddba5b 100644
--- a/hw/display/bochs-display.c
+++ b/hw/display/bochs-display.c
@@ -8,7 +8,6 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "hw/display/bochs-vbe.h"
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 3120b3c..0f5465b 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -38,7 +38,6 @@
#include "sysemu/reset.h"
#include "qapi/error.h"
#include "trace.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "ui/pixel_ops.h"
diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
index 69cdb9e..49f409b 100644
--- a/hw/display/cirrus_vga_isa.c
+++ b/hw/display/cirrus_vga_isa.c
@@ -26,7 +26,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/loader.h"
#include "hw/isa/isa.h"
#include "cirrus_vga_internal.h"
diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 8e1508a..c1071ec 100644
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/display/framebuffer.c b/hw/display/framebuffer.c
index 36e3db1..4485aa3 100644
--- a/hw/display/framebuffer.c
+++ b/hw/display/framebuffer.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "ui/console.h"
#include "framebuffer.h"
diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c
index 7bfffa5..199f122 100644
--- a/hw/display/milkymist-tmu2.c
+++ b/hw/display/milkymist-tmu2.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c
index b00ce04..6ad13f2 100644
--- a/hw/display/omap_lcdc.c
+++ b/hw/display/omap_lcdc.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "ui/console.h"
#include "hw/arm/omap.h"
diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index 4adfdb1..80eb0d2 100644
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -2,7 +2,6 @@
#define HW_QXL_H
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "vga_int.h"
#include "qemu/thread.h"
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 6f88aaa..6033963 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -29,7 +29,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/char/serial.h"
#include "ui/console.h"
#include "hw/sysbus.h"
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 74a77eb..49a676d 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/host-utils.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/display/tc6393xb.h"
#include "exec/memory.h"
diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 1c4f43b..e9c43e5 100644
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/bitops.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "migration/vmstate.h"
#include "hw/display/vga.h"
#include "vga_int.h"
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 945952a..189a4af 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "vga_int.h"
#include "ui/pixel_ops.h"
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index cb956b4..86299f5 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "vga_int.h"
diff --git a/hw/display/vga.c b/hw/display/vga.c
index f8098f6..573d223 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "sysemu/reset.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/display/vga.h"
#include "hw/pci/pci.h"
#include "vga_int.h"
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 79a145e..e5227fa 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/virtio/virtio-gpu.h"
#include "qapi/error.h"
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index ebfcc46..f0b136e 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -26,7 +26,6 @@
#include "qemu/module.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/loader.h"
#include "trace.h"
#include "ui/vnc.h"
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index 3c79913..838260b 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "ui/input.h"
#include "ui/console.h"
#include "hw/xen/xen-legacy-backend.h"
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index b7404cf..c626bd9 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
#include "hw/dma/i8257.h"
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 59bc929..3713d5d 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -14,6 +14,7 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/dma/pl080.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "qapi/error.h"
diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c
index 122f87a..5488d38 100644
--- a/hw/dma/puv3_dma.c
+++ b/hw/dma/puv3_dma.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#undef DEBUG_PUV3
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index d35fb59..d54e296 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/mips/mips.h"
#include "hw/sysbus.h"
diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index 8955fe2..16d53b9 100644
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sparc/sparc32_dma.h"
#include "hw/sparc/sun4m_iommu.h"
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 83b52e4..2c2d567 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -26,6 +26,7 @@
#include "hw/sysbus.h"
#include "qapi/error.h"
#include "qemu/timer.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ptimer.h"
#include "qemu/log.h"
diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index 432f0b0..87b0f24 100644
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -8,6 +8,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 6ab51a9..46a7217 100644
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/arm/omap.h"
#include "hw/sysbus.h"
diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c
index 54d30ca..d19e342 100644
--- a/hw/gpio/puv3_gpio.c
+++ b/hw/gpio/puv3_gpio.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#undef DEBUG_PUV3
diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index a1ba09c..9a12c68 100644
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/arm/sharpsl.h"
#include "hw/sysbus.h"
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index dfb9d7a..bb9d0e0 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -15,7 +15,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index bc74438..2736ce8 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -6,7 +6,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "elf.h"
#include "hw/loader.h"
#include "hw/boards.h"
diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
index 2289128..b000952 100644
--- a/hw/i2c/bitbang_i2c.c
+++ b/hw/i2c/bitbang_i2c.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/i2c/bitbang_i2c.h"
#include "hw/sysbus.h"
diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index 309a37b..34f34e3 100644
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
#include "hw/arm/omap.h"
diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index d9e3bad..36994ff 100644
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/i2c/pm_smbus.h"
#include "hw/i2c/smbus_master.h"
diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c
index d110b41..3f015a1 100644
--- a/hw/i2c/ppc4xx_i2c.c
+++ b/hw/i2c/ppc4xx_i2c.c
@@ -28,7 +28,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/i2c/ppc4xx_i2c.h"
#include "hw/irq.h"
diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index e05bc8c..8642f00 100644
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
#include "hw/i2c/smbus_slave.h"
diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index f7e626e..564198d 100644
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -21,7 +21,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i2c/pm_smbus.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/i2c/smbus_master.c b/hw/i2c/smbus_master.c
index 0a62237..dc43b86 100644
--- a/hw/i2c/smbus_master.c
+++ b/hw/i2c/smbus_master.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/i2c/smbus_master.h"
diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c
index 7b145a3..5d10e27 100644
--- a/hw/i2c/smbus_slave.c
+++ b/hw/i2c/smbus_slave.c
@@ -14,7 +14,6 @@
/* TODO: Implement PEC. */
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/i2c/smbus_slave.h"
#include "migration/vmstate.h"
diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h
index 3a694b1..e05a4ef 100644
--- a/hw/i386/amd_iommu.h
+++ b/hw/i386/amd_iommu.h
@@ -21,7 +21,6 @@
#ifndef AMD_IOMMU_H
#define AMD_IOMMU_H
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/i386/x86-iommu.h"
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index a3e33fb..9a59f95 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/option.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/nvram/fw_cfg.h"
#include "multiboot.h"
#include "hw/loader.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 1e8251d..14fe823 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 129f474..2fbb581 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -26,7 +26,6 @@
#include "config-devices.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/loader.h"
#include "hw/i386/pc.h"
#include "hw/i386/apic.h"
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 397e1fd..060b47f 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -30,7 +30,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/loader.h"
#include "sysemu/arch_init.h"
#include "hw/i2c/smbus_eeprom.h"
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index de43943..defea37 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -31,7 +31,6 @@
#include "qemu/option.h"
#include "qemu/units.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index a50f5d5..4f81504 100644
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "ui/console.h"
#include "hw/i386/pc.h"
#include "hw/input/i8042.h"
diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 3bf8cfe..26fcbe3 100644
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/i386/pc.h"
#include "hw/input/i8042.h"
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index f769cd9..63abace 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -15,6 +15,7 @@
#include "hw/pci/pci_host.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
+#include "hw/hw.h"
#include "hw/i386/apic-msidef.h"
#include "hw/xen/xen_common.h"
#include "hw/xen/xen-legacy-backend.h"
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 800687a..0f7b05e 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/ide.h"
#include "hw/pci/pci.h"
#include "hw/irq.h"
diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index 700db81..10c89cd 100644
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -32,7 +32,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "trace.h"
diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
index 8777122..bb8393d 100644
--- a/hw/ide/ahci-allwinner.c
+++ b/hw/ide/ahci-allwinner.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "sysemu/dma.h"
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index e0b1a91..1d5a54b 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -22,7 +22,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index a3763a1..c2ee427 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 0453a92..005b4d5 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
#include "qemu/error-report.h"
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 00fb43a..eff3188 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -61,7 +61,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c
index a0b3c1f..e608561 100644
--- a/hw/ide/ioport.c
+++ b/hw/ide/ioport.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index fda912f..939b473 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index aa447cd..44f2ff9 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/ppc/mac_dbdma.h"
#include "migration/vmstate.h"
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index be3cf87..b0272ea 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pcmcia.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index f3de6db..d2a377f 100644
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index c5b081a..cce1da8 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "sysemu/dma.h"
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 407d3e3..bcfd119 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index eea22c0..d85c31a 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "sysemu/dma.h"
#include "qapi/error.h"
#include "qapi/qapi-types-block.h"
diff --git a/hw/ide/via.c b/hw/ide/via.c
index 8fa1972..45f9293 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/input/hid.c b/hw/input/hid.c
index c570ca2..89239b5 100644
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "ui/console.h"
#include "qemu/timer.h"
#include "hw/input/hid.h"
diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index de03913..a37eb85 100644
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index e17666d..8f6fdf2 100644
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "trace.h"
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index cf16903..f2e32a1 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
#include "hw/i386/pc.h"
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 07d07ee..68b3022 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "hw/hw.h"
#include "hw/input/ps2.h"
#include "migration/vmstate.h"
#include "ui/console.h"
diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index 7582117..59892b0 100644
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/input/gamepad.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index b92a034..55d61cc 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "hw/hw.h"
#include "qemu/timer.h"
#include "sysemu/reset.h"
#include "ui/console.h"
diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c
index dc72dd5..88d3b0c 100644
--- a/hw/intc/etraxfs_pic.c
+++ b/hw/intc/etraxfs_pic.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/irq.h"
//#include "pc.h"
//#include "etraxfs.h"
diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index 3b49ce4..833e164 100644
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -33,6 +33,7 @@
#include "qemu/module.h"
#include "hw/arm/exynos4210.h"
+#include "hw/hw.h"
#include "hw/irq.h"
//#define DEBUG_COMBINER
diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
index 572e911..cb97c31 100644
--- a/hw/intc/heathrow_pic.c
+++ b/hw/intc/heathrow_pic.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
index e581e6b..211a989 100644
--- a/hw/intc/i8259.c
+++ b/hw/intc/i8259.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
#include "hw/isa/isa.h"
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index e99c37c..c346f50 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "monitor/monitor.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/i386/apic.h"
#include "hw/i386/ioapic.h"
diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c
index 4df4eef..36de670 100644
--- a/hw/intc/lm32_pic.c
+++ b/hw/intc/lm32_pic.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "migration/vmstate.h"
#include "monitor/monitor.h"
#include "qemu/module.h"
diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index 166eb6e..6b4322b 100644
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -13,7 +13,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "exec/memory.h"
#include "sysemu/sysemu.h"
diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index 4b3ddc0..f740578 100644
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/arm/omap.h"
#include "hw/sysbus.h"
diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
index 77591f8..8a4a422 100644
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -10,7 +10,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index bb869ca..312ac54 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -35,7 +35,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 49fc6fa..e91910b 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -27,7 +27,6 @@
#include "cpu.h"
#include <sys/ioctl.h>
#include "exec/address-spaces.h"
-#include "hw/hw.h"
#include "hw/ppc/openpic.h"
#include "hw/ppc/openpic_kvm.h"
#include "hw/pci/msi.h"
diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c
index 6252150..72a55e3 100644
--- a/hw/intc/sh_intc.c
+++ b/hw/intc/sh_intc.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "hw/sh4/sh_intc.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sh4/sh.h"
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 41da9b3..88709d4 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "trace.h"
#include "qemu/timer.h"
#include "hw/ppc/xics.h"
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 65c35f9..a4d2e87 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -29,7 +29,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "trace.h"
#include "sysemu/kvm.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
index 7cd3c93..6577be0 100644
--- a/hw/intc/xics_spapr.c
+++ b/hw/intc/xics_spapr.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "trace.h"
#include "qemu/timer.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c
index baf5353..3a5c7f8 100644
--- a/hw/intc/xilinx_intc.c
+++ b/hw/intc/xilinx_intc.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#define D(x)
diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index a837f91..2090c6f 100644
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/ipmi/ipmi.h"
#include "sysemu/sysemu.h"
#include "qom/object_interfaces.h"
diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 588dfba..33c800a 100644
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -26,7 +26,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/ipmi/ipmi.h"
#include "hw/irq.h"
#include "hw/isa/isa.h"
diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index e63753f..9a1de66 100644
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -26,7 +26,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/ipmi/ipmi.h"
#include "hw/irq.h"
#include "hw/isa/isa.h"
diff --git a/hw/isa/apm.c b/hw/isa/apm.c
index f22b2d7..6300b1b 100644
--- a/hw/isa/apm.c
+++ b/hw/isa/apm.c
@@ -22,7 +22,6 @@
#include "qemu/osdep.h"
#include "hw/isa/apm.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 79d44c1..a037c21 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -30,7 +30,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "qapi/visitor.h"
#include "qemu/range.h"
#include "hw/isa/isa.h"
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 8abd5da..3294056 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
#include "hw/isa/isa.h"
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index d98b94a..7379d90 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/vt82c686.h"
#include "hw/i2c/i2c.h"
#include "hw/pci/pci.h"
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index d710980..5ae308b 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -22,7 +22,6 @@
#include "qemu/error-report.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/block/flash.h"
#include "hw/boards.h"
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 864712d..5ec3ae0 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -23,7 +23,6 @@
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 68d15a6..54ccbe1 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/microblaze/boot.h b/hw/microblaze/boot.h
index dd1090d..5a8c2f7 100644
--- a/hw/microblaze/boot.h
+++ b/hw/microblaze/boot.h
@@ -1,7 +1,6 @@
#ifndef MICROBLAZE_BOOT_H
#define MICROBLAZE_BOOT_H
-#include "hw/hw.h"
void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
uint32_t ramsize,
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index a88bf16..03f6c1c 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -30,7 +30,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 8d83474..849bafc 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -28,7 +28,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
diff --git a/hw/mips/addr.c b/hw/mips/addr.c
index 4da46e1..2f138fe 100644
--- a/hw/mips/addr.c
+++ b/hw/mips/addr.c
@@ -21,7 +21,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/mips/cpudevs.h"
static int mips_um_ksegs;
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 9eeccbe..ce86b75 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -23,7 +23,6 @@
#include "exec/address-spaces.h"
#include "hw/boards.h"
#include "hw/char/serial.h"
-#include "hw/hw.h"
#include "hw/ide/pci.h"
#include "hw/ide/ahci.h"
#include "hw/loader.h"
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index b4412c6..f325bd6 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/log.h"
-#include "hw/hw.h"
#include "hw/mips/mips.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 0a1bf5e..6e4fba2 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -23,7 +23,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/dma/i8257.h"
#include "hw/isa/superio.h"
diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c
index ae4244c..74cf587 100644
--- a/hw/mips/mips_int.c
+++ b/hw/mips/mips_int.c
@@ -22,7 +22,6 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/mips/cpudevs.h"
#include "cpu.h"
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 6ea25cd..388c15c 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/hw.h"
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
#include "hw/i386/pc.h"
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 02200ab..bdba712 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/superio.h"
#include "hw/dma/i8257.h"
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 280e76a..1ca7e90 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -29,7 +29,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
#include "hw/char/serial.h"
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 1910478..a41b0b0 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -13,7 +13,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
#include "hw/i386/pc.h"
diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index 2d7eb3c..d9d3697 100644
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -31,7 +31,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "ui/console.h"
#include "qemu/module.h"
diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c
index 2646107..3e23201 100644
--- a/hw/misc/arm_integrator_debug.c
+++ b/hw/misc/arm_integrator_debug.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/misc/arm_integrator_debug.h"
#include "qemu/log.h"
diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 4705143..2a4e045 100644
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/timer.h"
#include "qemu/bitops.h"
diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c
index 8e4a2fc..752cb53 100644
--- a/hw/misc/debugexit.c
+++ b/hw/misc/debugexit.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "qemu/module.h"
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index 3b6dba2..d5e2bdb 100644
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "hw/pci/pci.h"
+#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "qemu/timer.h"
#include "qemu/main-loop.h" /* iothread mutex */
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index d9b7ea1..7a2334c 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -21,7 +21,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index feb80df..5e8ee80 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "migration/vmstate.h"
#include "hw/input/adb.h"
diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
index 6f90afe..e62b622 100644
--- a/hw/misc/macio/gpio.c
+++ b/hw/misc/macio/gpio.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "migration/vmstate.h"
#include "hw/misc/macio/macio.h"
diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
index beaf083..e220f1a 100644
--- a/hw/misc/macio/mac_dbdma.c
+++ b/hw/misc/macio/mac_dbdma.c
@@ -38,7 +38,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ppc/mac_dbdma.h"
#include "migration/vmstate.h"
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index c797bbd..222f163 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -26,7 +26,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/misc/macio/cuda.h"
#include "hw/pci/pci.h"
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 507f62b..d824a06 100644
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -30,7 +30,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "migration/vmstate.h"
#include "hw/input/adb.h"
diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c
index e9722d6..61e86e6 100644
--- a/hw/misc/milkymist-hpdmc.c
+++ b/hw/misc/milkymist-hpdmc.c
@@ -22,7 +22,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "trace.h"
diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c
index 8c6baf5..516825e 100644
--- a/hw/misc/milkymist-pfpu.c
+++ b/hw/misc/milkymist-pfpu.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index 6dcdb4a..6bddb23 100644
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "sysemu/sysemu.h"
diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index 7e6dead..f06cf0b 100644
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/input/adb.h"
#include "hw/irq.h"
#include "hw/misc/mos6522.h"
diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c
index d002870..81abdf8 100644
--- a/hw/misc/mst_fpga.c
+++ b/hw/misc/mst_fpga.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 6253b0b..10de7a5 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -20,7 +20,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/block/flash.h"
#include "hw/arm/omap.h"
diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c
index c217728..61b6df5 100644
--- a/hw/misc/omap_l4.c
+++ b/hw/misc/omap_l4.c
@@ -18,7 +18,6 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/arm/omap.h"
struct omap_l4_s {
diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
index 7b38c55..f2f72f6 100644
--- a/hw/misc/omap_sdrc.c
+++ b/hw/misc/omap_sdrc.c
@@ -18,7 +18,6 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/arm/omap.h"
/* SDRAM Controller Subsystem */
diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c
index 46adb6b..94cf554 100644
--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@@ -36,7 +36,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/qdev.h"
#include "qemu/module.h"
#include "hw/irq.h"
diff --git a/hw/misc/pca9552.c b/hw/misc/pca9552.c
index bb05811..73be28d 100644
--- a/hw/misc/pca9552.c
+++ b/hw/misc/pca9552.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/misc/pca9552.h"
#include "hw/misc/pca9552_regs.h"
#include "migration/vmstate.h"
diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index d4d89df..0eb9ed5 100644
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "qemu/event_notifier.h"
#include "qemu/module.h"
diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c
index b538b4a..c213500 100644
--- a/hw/misc/puv3_pm.c
+++ b/hw/misc/puv3_pm.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#undef DEBUG_PUV3
diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index 2899647..75ddad3 100644
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c
index 6728aa7..9f04470 100644
--- a/hw/misc/tmp421.c
+++ b/hw/misc/tmp421.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c
index 7f8e42c..0e1cb24 100644
--- a/hw/misc/unimp.c
+++ b/hw/misc/unimp.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/misc/unimp.h"
#include "qemu/log.h"
diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c
index edfe76b..7745df4 100644
--- a/hw/misc/zynq-xadc.c
+++ b/hw/misc/zynq-xadc.c
@@ -14,7 +14,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/misc/zynq-xadc.h"
#include "migration/vmstate.h"
diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index 82430a1..d4fdd2c 100644
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 16a7d58..57af1b4 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -30,7 +30,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "net/net.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c
index 10963ef..401da73 100644
--- a/hw/net/can/can_kvaser_pci.c
+++ b/hw/net/can/can_kvaser_pci.c
@@ -36,7 +36,6 @@
#include "qemu/sockets.h"
#include "qapi/error.h"
#include "chardev/char.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c
index 9e060df..0f0ca91 100644
--- a/hw/net/can/can_mioe3680_pci.c
+++ b/hw/net/can/can_mioe3680_pci.c
@@ -32,7 +32,6 @@
#include "qemu/sockets.h"
#include "qapi/error.h"
#include "chardev/char.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c
index 5d12f0c..632eb0b 100644
--- a/hw/net/can/can_pcm3680_pci.c
+++ b/hw/net/can/can_pcm3680_pci.c
@@ -32,7 +32,6 @@
#include "qemu/sockets.h"
#include "qapi/error.h"
#include "chardev/char.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index 6c84be6..1f81341 100644
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "chardev/char.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
#include "net/can_emu.h"
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index e4e9138..da5f364 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -26,7 +26,6 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "net/net.h"
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 22e3132..270ff93 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -40,6 +40,7 @@
#include "qemu/module.h"
#include "qemu/range.h"
#include "sysemu/sysemu.h"
+#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "migration/vmstate.h"
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index 2a221c2..40e41fd 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -37,6 +37,7 @@
#include "sysemu/sysemu.h"
#include "net/net.h"
#include "net/tap.h"
+#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
diff --git a/hw/net/e1000x_common.c b/hw/net/e1000x_common.c
index 0904780..717f9df 100644
--- a/hw/net/e1000x_common.c
+++ b/hw/net/e1000x_common.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "net/net.h"
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 3c1c534..2ad1b32 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -42,7 +42,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "net/net.h"
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 937d560..1d32cb7 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -15,6 +15,7 @@
#include "migration/vmstate.h"
#include "net/net.h"
#include "net/eth.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/net/lan9118.h"
#include "sysemu/sysemu.h"
diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index a7d879f..1e3fb9c 100644
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c
index 3910beb..013f762 100644
--- a/hw/net/mipsnet.c
+++ b/hw/net/mipsnet.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "net/net.h"
#include "qemu/module.h"
diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h
index 2cd193e..fc75843 100644
--- a/hw/net/ne2000.h
+++ b/hw/net/ne2000.h
@@ -2,7 +2,6 @@
#define HW_NE2000_H
#include "qemu/units.h"
-#include "hw/hw.h"
#include "net/net.h"
#define NE2000_PMEM_SIZE (32 * KiB)
diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index 3e759d7..a9e96cd 100644
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -32,7 +32,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/net/mii.h"
#include "hw/sysbus.h"
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 4ce8f62..789e5c4 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "hw/pci/msix.h"
diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c
index b009da4..01845f1 100644
--- a/hw/net/rocker/rocker_desc.c
+++ b/hw/net/rocker/rocker_desc.c
@@ -16,7 +16,6 @@
#include "qemu/osdep.h"
#include "net/net.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "rocker.h"
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 9975af4..89156ed 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -53,7 +53,6 @@
#include "qemu/osdep.h"
#include <zlib.h>
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "sysemu/dma.h"
diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 0ce5e37..60085b1 100644
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c
index 9d8fd70..359bd4f 100644
--- a/hw/net/sunhme.c
+++ b/hw/net/sunhme.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "hw/net/mii.h"
diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index ffb3b58..00a7fdf 100644
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -24,7 +24,6 @@
#include <sys/ioctl.h>
#include <sys/wait.h>
-#include "hw/hw.h"
#include "net/net.h"
#include "net/checksum.h"
#include "net/util.h"
diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index b1247a1..b22e344 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -30,6 +30,7 @@
#include "net/net.h"
#include "net/checksum.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/stream.h"
diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 27a4fc8..a963087 100644
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -26,7 +26,6 @@
#include "qemu/module.h"
#include "cpu.h" /* FIXME should not use tswap* */
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "net/net.h"
diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
index 2c3388f..3c01e4f 100644
--- a/hw/nios2/10m50_devboard.c
+++ b/hw/nios2/10m50_devboard.c
@@ -27,7 +27,6 @@
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/char/serial.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/nios2/boot.h b/hw/nios2/boot.h
index 3116753..59b9fbf 100644
--- a/hw/nios2/boot.h
+++ b/hw/nios2/boot.h
@@ -1,7 +1,6 @@
#ifndef NIOS2_BOOT_H
#define NIOS2_BOOT_H
-#include "hw/hw.h"
#include "cpu.h"
void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, uint32_t ramsize,
diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
index 1788ffa..2ec91e8 100644
--- a/hw/nios2/generic_nommu.c
+++ b/hw/nios2/generic_nommu.c
@@ -32,7 +32,6 @@
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/char/serial.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/nvram/chrp_nvram.c b/hw/nvram/chrp_nvram.c
index 3837510..d969f26 100644
--- a/hw/nvram/chrp_nvram.c
+++ b/hw/nvram/chrp_nvram.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
-#include "hw/hw.h"
#include "hw/nvram/chrp_nvram.h"
#include "sysemu/sysemu.h"
diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index c2b012d..5b01b9b 100644
--- a/hw/nvram/eeprom93xx.c
+++ b/hw/nvram/eeprom93xx.c
@@ -36,7 +36,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/nvram/eeprom93xx.h"
#include "migration/qemu-file-types.h"
#include "migration/vmstate.h"
diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
index f75a485..00f942d 100644
--- a/hw/nvram/eeprom_at24c.c
+++ b/hw/nvram/eeprom_at24c.c
@@ -11,7 +11,6 @@
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
#include "sysemu/block-backend.h"
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index a5e6140..f192c3e 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
#include "sysemu/reset.h"
diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index 4f0d2f6..853b693 100644
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/nvram/chrp_nvram.h"
#include "hw/ppc/mac.h"
#include "migration/vmstate.h"
diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c
index e9f8933..9326881 100644
--- a/hw/openrisc/cputimer.c
+++ b/hw/openrisc/cputimer.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "migration/vmstate.h"
#include "qemu/timer.h"
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 965d5b4..13572b8 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -22,7 +22,6 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/boards.h"
#include "elf.h"
diff --git a/hw/openrisc/pic_cpu.c b/hw/openrisc/pic_cpu.c
index d3f179f..36f9350 100644
--- a/hw/openrisc/pic_cpu.c
+++ b/hw/openrisc/pic_cpu.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "cpu.h"
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 58870e0..30e0787 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -39,7 +39,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index 1a45c30..93f28ef 100644
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -31,7 +31,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci-host/gpex.h"
#include "migration/vmstate.h"
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 9e8c854..bc97260 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 840869f..241e7e7 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ppc/e500-ccsr.h"
#include "migration/vmstate.h"
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 34a3681..588c7dc 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -27,7 +27,6 @@
#include "qemu-common.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 25335a8..1688a89 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -29,7 +29,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci-host/q35.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index 4ffb2d0..76293ab 100644
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ppc/mac.h"
#include "qemu/module.h"
diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index 81a23ac..2918789 100644
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index de3691e..d84ecd8 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index d6768b8..3534006 100644
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -20,7 +20,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
#include "qemu/module.h"
diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c
index c16b12d..03d13e7 100644
--- a/hw/pcmcia/pcmcia.c
+++ b/hw/pcmcia/pcmcia.c
@@ -6,7 +6,6 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/pcmcia.h"
static const TypeInfo pcmcia_card_type_info = {
diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c
index 26ab226..14e4dfe 100644
--- a/hw/pcmcia/pxa2xx.c
+++ b/hw/pcmcia/pxa2xx.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 0451a4e..3f0c3de 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -22,7 +22,6 @@
#include "e500-ccsr.h"
#include "net/net.h"
#include "qemu/config-file.h"
-#include "hw/hw.h"
#include "hw/char/serial.h"
#include "hw/pci/pci.h"
#include "hw/boards.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 0f9f351..94a958e 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -49,7 +49,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/mac.h"
#include "hw/input/adb.h"
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 6640057..aeeddd1 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -28,7 +28,6 @@
#include "qemu-common.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "mac.h"
#include "hw/input/adb.h"
diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index 2b7cc14..ad9c219 100644
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 9660888..114d582 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -26,7 +26,6 @@
#include "sysemu/reset.h"
#include "sysemu/cpus.h"
#include "sysemu/device_tree.h"
-#include "hw/hw.h"
#include "target/ppc/cpu.h"
#include "qemu/log.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
index 4b76d34..a27776a 100644
--- a/hw/ppc/pnv_bmc.c
+++ b/hw/ppc/pnv_bmc.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "target/ppc/cpu.h"
#include "qemu/log.h"
diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c
index 636f91f..6120405 100644
--- a/hw/ppc/pnv_occ.c
+++ b/hw/ppc/pnv_occ.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "target/ppc/cpu.h"
#include "qapi/error.h"
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index e66aeec..f10d519 100644
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "target/ppc/cpu.h"
#include "qemu/log.h"
diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index 2b81c75..0e31c57 100644
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "sysemu/hw_accel.h"
diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index 5cc3218..a1192d7 100644
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc_e500.h"
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 5b278e7..388cae0 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -27,7 +27,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "ppc405.h"
#include "hw/timer/m48t59.h"
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index bb62714..ba092f2 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/boards.h"
#include "hw/i2c/ppc4xx_i2c.h"
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 1bd92aa..4d95c0f 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -17,7 +17,6 @@
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "net/net.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/boards.h"
#include "sysemu/kvm.h"
diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c
index 77a7838..2ee2d4f 100644
--- a/hw/ppc/ppc440_pcix.c
+++ b/hw/ppc/ppc440_pcix.c
@@ -23,7 +23,6 @@
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 6570c2d..e7f42d7 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -15,7 +15,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "exec/address-spaces.h"
#include "exec/memory.h"
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index 49d7147..c2e5013 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "sysemu/reset.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 7334d75..3ea47df 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -20,7 +20,6 @@
* 4xx SoCs, such as the 440EP. */
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c
index ba5f513..ce0e140 100644
--- a/hw/ppc/ppc_booke.c
+++ b/hw/ppc/ppc_booke.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "qemu/timer.h"
#include "sysemu/reset.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 01dc7e1..4f3c6bf 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/timer/m48t59.h"
#include "hw/char/serial.h"
#include "hw/block/fdc.h"
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index c1d6f74..7ed5518 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -16,7 +16,6 @@
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7030a75..0258ca0 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -32,7 +32,6 @@
#include "sysemu/numa.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
-#include "hw/hw.h"
#include "qemu/log.h"
#include "hw/fw-path-provider.h"
#include "elf.h"
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index 57834e6..8223bdb 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "hw/hw.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "sysemu/kvm.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index e5f5923..53b799f 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -26,7 +26,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 1095aa5..31ff0be 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -23,7 +23,6 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/log.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 06f5a28..099b94c 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -27,7 +27,6 @@
#include "qemu/units.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/char/serial.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index 8d70c0d..692125a 100644
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_ids.h"
diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
index adcf79c..b924843 100644
--- a/hw/rdma/vmw/pvrdma_main.c
+++ b/hw/rdma/vmw/pvrdma_main.c
@@ -16,7 +16,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index 2a499d8..862903d 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -32,7 +32,6 @@
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
diff --git a/hw/riscv/sifive_prci.c b/hw/riscv/sifive_prci.c
index f406682..562bc3d 100644
--- a/hw/riscv/sifive_prci.c
+++ b/hw/riscv/sifive_prci.c
@@ -22,6 +22,7 @@
#include "hw/sysbus.h"
#include "qemu/module.h"
#include "target/riscv/cpu.h"
+#include "hw/hw.h"
#include "hw/riscv/sifive_prci.h"
static uint64_t sifive_prci_read(void *opaque, hwaddr addr, unsigned int size)
diff --git a/hw/riscv/sifive_test.c b/hw/riscv/sifive_test.c
index 24a04d7..3a14f9f 100644
--- a/hw/riscv/sifive_test.c
+++ b/hw/riscv/sifive_test.c
@@ -22,6 +22,7 @@
#include "hw/sysbus.h"
#include "qemu/module.h"
#include "target/riscv/cpu.h"
+#include "hw/hw.h"
#include "hw/riscv/sifive_test.h"
static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size)
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 71b8083..0b3c5df 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -29,7 +29,6 @@
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c
index d18613f..9de42b1 100644
--- a/hw/riscv/sifive_uart.c
+++ b/hw/riscv/sifive_uart.c
@@ -22,6 +22,7 @@
#include "chardev/char.h"
#include "chardev/char-fe.h"
#include "target/riscv/cpu.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/riscv/sifive_uart.h"
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index 2991b34..9cc786b 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -27,7 +27,6 @@
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 25faf3b..c72198b 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -23,7 +23,6 @@
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index fa537bf..a371370 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
#include "net/net.h"
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index 175eb79..222a286 100644
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "hw/scsi/scsi.h"
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 970b100..3706294 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"
#include "sysemu/block-backend.h"
diff --git a/hw/scsi/mptconfig.c b/hw/scsi/mptconfig.c
index 87a416a..3b2a857 100644
--- a/hw/scsi/mptconfig.c
+++ b/hw/scsi/mptconfig.c
@@ -16,7 +16,6 @@
* Lesser General Public License for more details.
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/scsi/scsi.h"
diff --git a/hw/scsi/mptendian.c b/hw/scsi/mptendian.c
index 79f9973..313f40e 100644
--- a/hw/scsi/mptendian.c
+++ b/hw/scsi/mptendian.c
@@ -21,7 +21,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"
#include "hw/pci/msi.h"
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index 7950177..b32f4c0 100644
--- a/hw/scsi/mptsas.c
+++ b/hw/scsi/mptsas.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"
#include "hw/pci/msi.h"
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 42928a6..1f99147 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index 5290f75..fedeec6 100644
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -35,7 +35,6 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/scsi/scsi.h"
#include "migration/vmstate.h"
#include "scsi/constants.h"
diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index dcb7169..e3c7cf5 100644
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "sysemu/sysemu.h"
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 15a0bbe..c6e516b 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/arm/omap.h"
#include "hw/sd/sd.h"
diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index 020cd54..db2f2ad 100644
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 0292432..3f26b38 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -33,7 +33,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "hw/qdev.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/registerfields.h"
#include "sysemu/block-backend.h"
diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c
index 9370181..438cb30 100644
--- a/hw/sd/sdhci-pci.c
+++ b/hw/sd/sdhci-pci.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/sd/sdhci.h"
#include "sdhci-internal.h"
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index f9db39c..1adc16e 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "sysemu/dma.h"
#include "qemu/timer.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 9838ea3..571e594 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -28,7 +28,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index b35d072..d660714 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sh4/sh.h"
#include "sysemu/sysemu.h"
diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c
index 34b4f99..0630fe3 100644
--- a/hw/sh4/sh7750_regnames.c
+++ b/hw/sh4/sh7750_regnames.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sh7750_regs.h"
#include "sh7750_regnames.h"
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 6a1c723..2fc2915 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -30,7 +30,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/sysemu.h"
#include "sysemu/qtest.h"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 9c43806..655939a 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -28,7 +28,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index dc0ce7e..1efcff6 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/char/serial.h"
#include "hw/misc/unimp.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index c95ed94..54a3859 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -28,7 +28,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index b310dfb..0339b92 100644
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -21,6 +21,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/timer/a9gtimer.h"
#include "migration/vmstate.h"
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index a13255d..abfc5ba 100644
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -20,6 +20,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/ptimer.h"
#include "hw/timer/arm_mptimer.h"
diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index 7f2af52..79b2918 100644
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -62,6 +62,7 @@
#include "hw/ptimer.h"
#include "hw/arm/exynos4210.h"
+#include "hw/hw.h"
#include "hw/irq.h"
//#define DEBUG_MCT
diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c
index 5614510..f79b970 100644
--- a/hw/timer/exynos4210_rtc.c
+++ b/hw/timer/exynos4210_rtc.c
@@ -35,7 +35,6 @@
#include "qemu/bcd.h"
#include "hw/ptimer.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "sysemu/sysemu.h"
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 305704a..1ddae4e 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
#include "ui/console.h"
diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 9725875..a4be733 100644
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/module.h"
#include "qemu/timer.h"
diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
index 062e869..57bf10c 100644
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "qemu/module.h"
#include "qemu/timer.h"
diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
index bfa9de7..a381e39 100644
--- a/hw/timer/lm32_timer.c
+++ b/hw/timer/lm32_timer.c
@@ -22,7 +22,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index 1240315..1990030 100644
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/timer/m48t59.h"
#include "qemu/timer.h"
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index b432662..4739353 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -27,7 +27,6 @@
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "qemu/bcd.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c
index 7c56224..900b0b6 100644
--- a/hw/timer/milkymist-sysctl.c
+++ b/hw/timer/milkymist-sysctl.c
@@ -22,7 +22,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/timer/mips_gictimer.c b/hw/timer/mips_gictimer.c
index f5c5806..bc44cd9 100644
--- a/hw/timer/mips_gictimer.c
+++ b/hw/timer/mips_gictimer.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/timer/mips_gictimer.h"
diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c
index c34f60b..c407190 100644
--- a/hw/timer/omap_gptimer.c
+++ b/hw/timer/omap_gptimer.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/timer.h"
#include "hw/arm/omap.h"
diff --git a/hw/timer/omap_synctimer.c b/hw/timer/omap_synctimer.c
index 0d75a90..72b9979 100644
--- a/hw/timer/omap_synctimer.c
+++ b/hw/timer/omap_synctimer.c
@@ -18,7 +18,6 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/arm/omap.h"
struct omap_synctimer_s {
diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index f61053b..99e6c1e 100644
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c
index ba62adc..54272a8 100644
--- a/hw/timer/sun4v-rtc.c
+++ b/hw/timer/sun4v-rtc.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
#include "qemu/timer.h"
diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index 6b2a25b..63bd13d 100644
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index 76c1e16..22f9113 100644
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -33,7 +33,6 @@
#include "io/channel-socket.h"
#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
-#include "hw/hw.h"
#include "tpm_util.h"
#include "tpm_ioctl.h"
#include "migration/blocker.h"
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 897e3d5..f67244b 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -29,7 +29,6 @@
#include "qemu/sockets.h"
#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
-#include "hw/hw.h"
#include "qapi/clone-visitor.h"
#include "qapi/qapi-visit-tpm.h"
#include "tpm_util.h"
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index be397eb..c6305dc 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -22,7 +22,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 6aff15e..be18221 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/usb.h"
#include "hw/qdev.h"
#include "qapi/error.h"
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index d4074ed..c0f35c5 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -34,7 +34,6 @@
#include "hw/usb.h"
#include "migration/vmstate.h"
#include "desc.h"
-#include "hw/hw.h"
#include "audio/audio.h"
#define USBAUDIO_VENDOR_NUM 0x46f4 /* CRC16() of "QEMU" */
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index c7c65a8..79b3be3 100644
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "ui/console.h"
#include "hw/usb.h"
#include "migration/vmstate.h"
diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index 9a8a2d3..8ed57b3 100644
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -27,7 +27,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "ui/console.h"
#include "hw/usb.h"
#include "migration/vmstate.h"
diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index fedf82c..fdbcfdc 100644
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -18,7 +18,6 @@
#ifndef HW_USB_HCD_EHCI_H
#define HW_USB_HCD_EHCI_H
-#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/usb.h"
#include "sysemu/dma.h"
diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
index 67fcfc4..25b0ced 100644
--- a/hw/usb/hcd-ohci-pci.c
+++ b/hw/usb/hcd-ohci-pci.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qapi/error.h"
#include "qemu/timer.h"
#include "hw/usb.h"
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 438dfb4..94b3410 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qapi/error.h"
#include "qemu/module.h"
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 887885e..7c6edd1 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -27,7 +27,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/usb.h"
#include "hw/usb/uhci-regs.h"
#include "migration/vmstate.h"
diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c
index e099382..aba3716 100644
--- a/hw/usb/hcd-xhci-nec.c
+++ b/hw/usb/hcd-xhci-nec.c
@@ -20,7 +20,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/usb.h"
#include "qemu/module.h"
#include "hw/pci/pci.h"
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index fc67476..d60ad89 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -20,7 +20,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qemu/timer.h"
#include "qemu/module.h"
#include "qemu/queue.h"
diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index adbee2f..9c33a16 100644
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -20,7 +20,6 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/usb.h"
#include "sysemu/dma.h"
diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c
index a61b0f6..1758087 100644
--- a/hw/usb/tusb6010.c
+++ b/hw/usb/tusb6010.c
@@ -24,6 +24,7 @@
#include "qemu/timer.h"
#include "hw/usb.h"
#include "hw/arm/omap.h"
+#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index b35a640..62d765a 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -19,6 +19,7 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include <sys/ioctl.h>
+#include "hw/hw.h"
#include "hw/nvram/fw_cfg.h"
#include "pci.h"
#include "trace.h"
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 8a58ad6..48ac0f5 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -22,6 +22,7 @@
#include <linux/vfio.h>
#include <sys/ioctl.h>
+#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci_bridge.h"
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index ba1006a..34accdf 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -16,7 +16,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/virtio/vhost.h"
-#include "hw/hw.h"
#include "qemu/atomic.h"
#include "qemu/range.h"
#include "qemu/error-report.h"
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index 1d29a63..207e955 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qapi/error.h"
diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index 288be8f..370cf92 100644
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -24,7 +24,6 @@
#include "qemu/module.h"
#include "qemu/timer.h"
#include "sysemu/watchdog.h"
-#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index e233945..985944a 100644
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -23,7 +23,6 @@
#include "qemu/module.h"
#include "qemu/timer.h"
#include "sysemu/watchdog.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
diff --git a/hw/xen/xen-bus-helper.c b/hw/xen/xen-bus-helper.c
index 5f7a4b2..b459bb9 100644
--- a/hw/xen/xen-bus-helper.c
+++ b/hw/xen/xen-bus-helper.c
@@ -6,7 +6,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/xen/xen.h"
#include "hw/xen/xen-bus.h"
diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c
index 7503eea..3f39a89 100644
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -9,7 +9,6 @@
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/uuid.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/xen/xen.h"
#include "hw/xen/xen-backend.h"
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 3715c94..2831940 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include <sys/signal.h>
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "qemu/log.h"
diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c
index e6a86ca..d111eca 100644
--- a/hw/xen/xen_pt_load_rom.c
+++ b/hw/xen/xen_pt_load_rom.c
@@ -3,7 +3,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "qemu/error-report.h"
#include "ui/console.h"
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index dcaf2a0..524d608 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/xen/xen-legacy-backend.h"
#include "hw/xen/xen-bus.h"
diff --git a/hw/xtensa/mx_pic.c b/hw/xtensa/mx_pic.c
index 912de66..d889f95 100644
--- a/hw/xtensa/mx_pic.c
+++ b/hw/xtensa/mx_pic.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/xtensa/mx_pic.h"
#include "qemu/log.h"
diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c
index b708290..edd53c9 100644
--- a/hw/xtensa/pic_cpu.c
+++ b/hw/xtensa/pic_cpu.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/log.h"
#include "qemu/timer.h"
diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h
index 172afbf..0f5d4f9 100644
--- a/include/hw/audio/pcspk.h
+++ b/include/hw/audio/pcspk.h
@@ -25,7 +25,6 @@
#ifndef HW_PCSPK_H
#define HW_PCSPK_H
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#define TYPE_PC_SPEAKER "isa-pcspk"
diff --git a/include/hw/audio/wm8750.h b/include/hw/audio/wm8750.h
index e12cb88..f7bafd5 100644
--- a/include/hw/audio/wm8750.h
+++ b/include/hw/audio/wm8750.h
@@ -14,7 +14,6 @@
#ifndef HW_DAC_WM8750_H
#define HW_DAC_WM8750_H
-#include "hw/hw.h"
#define TYPE_WM8750 "wm8750"
#define TYPE_MV88W8618_AUDIO "mv88w8618_audio"
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index abd5cf7..bfcbbb6 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -26,7 +26,6 @@
#ifndef HW_SERIAL_H
#define HW_SERIAL_H
-#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "chardev/char-fe.h"
#include "exec/memory.h"
diff --git a/include/hw/char/stm32f2xx_usart.h b/include/hw/char/stm32f2xx_usart.h
index 84c4029..8e11267 100644
--- a/include/hw/char/stm32f2xx_usart.h
+++ b/include/hw/char/stm32f2xx_usart.h
@@ -27,7 +27,6 @@
#include "hw/sysbus.h"
#include "chardev/char-fe.h"
-#include "hw/hw.h"
#define USART_SR 0x00
#define USART_DR 0x04
diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h
index 2cab50b..03e2c16 100644
--- a/include/hw/dma/i8257.h
+++ b/include/hw/dma/i8257.h
@@ -1,7 +1,6 @@
#ifndef HW_I8257_H
#define HW_I8257_H
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "exec/ioport.h"
diff --git a/include/hw/hw.h b/include/hw/hw.h
index 8079b91..fc5301f 100644
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -1,4 +1,3 @@
-/* Declarations for use by hardware emulation. */
#ifndef QEMU_HW_H
#define QEMU_HW_H
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
index 046bcf3..72e803f 100644
--- a/include/hw/i386/ich9.h
+++ b/include/hw/i386/ich9.h
@@ -1,7 +1,6 @@
#ifndef HW_ICH9_H
#define HW_ICH9_H
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
#include "hw/i386/pc.h"
diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h
index 3d2eec2..d46c87c 100644
--- a/include/hw/i386/ioapic_internal.h
+++ b/include/hw/i386/ioapic_internal.h
@@ -22,7 +22,6 @@
#ifndef QEMU_IOAPIC_INTERNAL_H
#define QEMU_IOAPIC_INTERNAL_H
-#include "hw/hw.h"
#include "exec/memory.h"
#include "hw/i386/ioapic.h"
#include "hw/sysbus.h"
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index f6ff146..246e6f3 100644
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -8,7 +8,6 @@
#ifndef HW_INPUT_I8042_H
#define HW_INPUT_I8042_H
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#define TYPE_I8042 "i8042"
diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h
index 0f93602..b6e070c 100644
--- a/include/hw/isa/apm.h
+++ b/include/hw/isa/apm.h
@@ -1,7 +1,6 @@
#ifndef APM_H
#define APM_H
-#include "hw/hw.h"
#include "exec/memory.h"
#define APM_CNT_IOPORT 0xb2
diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h
index f742c2a..ee189e4 100644
--- a/include/hw/isa/i8259_internal.h
+++ b/include/hw/isa/i8259_internal.h
@@ -25,7 +25,6 @@
#ifndef QEMU_I8259_INTERNAL_H
#define QEMU_I8259_INTERNAL_H
-#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
#include "hw/intc/intc.h"
diff --git a/include/hw/misc/stm32f2xx_syscfg.h b/include/hw/misc/stm32f2xx_syscfg.h
index 69e6a30..84e06fd 100644
--- a/include/hw/misc/stm32f2xx_syscfg.h
+++ b/include/hw/misc/stm32f2xx_syscfg.h
@@ -26,7 +26,6 @@
#define HW_STM32F2XX_SYSCFG_H
#include "hw/sysbus.h"
-#include "hw/hw.h"
#define SYSCFG_MEMRMP 0x00
#define SYSCFG_PMC 0x04
diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index 5acf4a4..1233928 100644
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -10,7 +10,6 @@
#ifndef HW_NET_NE2000_ISA_H
#define HW_NET_NE2000_ISA_H
-#include "hw/hw.h"
#include "hw/qdev.h"
#include "hw/isa/isa.h"
#include "net/net.h"
diff --git a/include/hw/pci-host/designware.h b/include/hw/pci-host/designware.h
index 186bb36..31c4123 100644
--- a/include/hw/pci-host/designware.h
+++ b/include/hw/pci-host/designware.h
@@ -21,7 +21,6 @@
#ifndef DESIGNWARE_H
#define DESIGNWARE_H
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h
index 2af1c4a..faea040 100644
--- a/include/hw/pci-host/gpex.h
+++ b/include/hw/pci-host/gpex.h
@@ -20,7 +20,6 @@
#ifndef HW_GPEX_H
#define HW_GPEX_H
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
index 5ed77fa..b3bcf2e 100644
--- a/include/hw/pci-host/q35.h
+++ b/include/hw/pci-host/q35.h
@@ -22,7 +22,6 @@
#ifndef HW_Q35_H
#define HW_Q35_H
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
#include "hw/i386/pc.h"
diff --git a/include/hw/pci-host/uninorth.h b/include/hw/pci-host/uninorth.h
index 9a5cabd..72d2a97 100644
--- a/include/hw/pci-host/uninorth.h
+++ b/include/hw/pci-host/uninorth.h
@@ -25,7 +25,6 @@
#ifndef UNINORTH_H
#define UNINORTH_H
-#include "hw/hw.h"
#include "hw/pci/pci_host.h"
#include "hw/ppc/openpic.h"
diff --git a/include/hw/pci-host/xilinx-pcie.h b/include/hw/pci-host/xilinx-pcie.h
index 74c04dc..c0f1531 100644
--- a/include/hw/pci-host/xilinx-pcie.h
+++ b/include/hw/pci-host/xilinx-pcie.h
@@ -20,7 +20,6 @@
#ifndef HW_XILINX_PCIE_H
#define HW_XILINX_PCIE_H
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index 8cf3361..7064875 100644
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -21,7 +21,6 @@
#ifndef QEMU_PCIE_H
#define QEMU_PCIE_H
-#include "hw/hw.h"
#include "hw/pci/pci_regs.h"
#include "hw/pci/pcie_regs.h"
#include "hw/pci/pcie_aer.h"
diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h
index 502dcd7..65e71d9 100644
--- a/include/hw/pci/pcie_aer.h
+++ b/include/hw/pci/pcie_aer.h
@@ -21,7 +21,6 @@
#ifndef QEMU_PCIE_AER_H
#define QEMU_PCIE_AER_H
-#include "hw/hw.h"
#include "hw/pci/pci_regs.h"
/* definitions which PCIExpressDevice uses */
diff --git a/include/hw/qdev.h b/include/hw/qdev.h
index 5cb8b08..d68991a 100644
--- a/include/hw/qdev.h
+++ b/include/hw/qdev.h
@@ -1,7 +1,6 @@
#ifndef QDEV_H
#define QDEV_H
-#include "hw/hw.h"
#include "hw/qdev-core.h"
#include "hw/qdev-properties.h"
diff --git a/include/hw/riscv/riscv_htif.h b/include/hw/riscv/riscv_htif.h
index fb5f881..aabc059 100644
--- a/include/hw/riscv/riscv_htif.h
+++ b/include/hw/riscv/riscv_htif.h
@@ -20,7 +20,6 @@
#ifndef HW_RISCV_HTIF_H
#define HW_RISCV_HTIF_H
-#include "hw/hw.h"
#include "chardev/char.h"
#include "chardev/char-fe.h"
#include "sysemu/sysemu.h"
diff --git a/include/hw/ssi/stm32f2xx_spi.h b/include/hw/ssi/stm32f2xx_spi.h
index 1cd73e4..e24b007 100644
--- a/include/hw/ssi/stm32f2xx_spi.h
+++ b/include/hw/ssi/stm32f2xx_spi.h
@@ -26,7 +26,6 @@
#define HW_STM32F2XX_SPI_H
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "hw/ssi/ssi.h"
#define STM_SPI_CR1 0x00
diff --git a/include/hw/timer/aspeed_rtc.h b/include/hw/timer/aspeed_rtc.h
index 1f1155a..15ba429 100644
--- a/include/hw/timer/aspeed_rtc.h
+++ b/include/hw/timer/aspeed_rtc.h
@@ -10,7 +10,6 @@
#include <stdint.h>
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h
index 5b12eb9..608b116 100644
--- a/include/hw/timer/i8254.h
+++ b/include/hw/timer/i8254.h
@@ -25,7 +25,6 @@
#ifndef HW_I8254_H
#define HW_I8254_H
-#include "hw/hw.h"
#include "hw/qdev.h"
#include "hw/isa/isa.h"
diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h
index e611c6f..3db462a 100644
--- a/include/hw/timer/i8254_internal.h
+++ b/include/hw/timer/i8254_internal.h
@@ -25,7 +25,6 @@
#ifndef QEMU_I8254_INTERNAL_H
#define QEMU_I8254_INTERNAL_H
-#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/timer/i8254.h"
#include "qemu/timer.h"
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index 619498c..085450c 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -1,7 +1,6 @@
#ifndef VHOST_H
#define VHOST_H
-#include "hw/hw.h"
#include "hw/virtio/vhost-backend.h"
#include "hw/virtio/virtio.h"
#include "exec/memory.h"
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index e6a2a0a..7bae09e 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -15,7 +15,6 @@
#define QEMU_VIRTIO_H
#include "exec/memory.h"
-#include "hw/hw.h"
#include "net/net.h"
#include "hw/qdev.h"
#include "sysemu/sysemu.h"
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 0504b43..1e3ec4e 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -14,7 +14,6 @@
#include <xenstore.h>
#include "hw/xen/interface/io/xenbus.h"
-#include "hw/hw.h"
#include "hw/xen/xen.h"
#include "hw/pci/pci.h"
#include "qemu/queue.h"
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index 5da3c4e..80c5bc3 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -12,7 +12,6 @@
#include "exec/memory.h"
#include "exec/address-spaces.h"
-#include "hw/hw.h"
#include "block/block.h"
#include "block/accounting.h"
diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h
index f005995..9b27e65 100644
--- a/include/sysemu/hax.h
+++ b/include/sysemu/hax.h
@@ -37,7 +37,6 @@ void hax_cpu_synchronize_pre_loadvm(CPUState *cpu);
int hax_enabled(void);
-#include "hw/hw.h"
#include "qemu/bitops.h"
#include "exec/memory.h"
int hax_vcpu_destroy(CPUState *cpu);
diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h
index dd1722f..d211e80 100644
--- a/include/sysemu/hvf.h
+++ b/include/sysemu/hvf.h
@@ -24,7 +24,6 @@ extern bool hvf_allowed;
#include <Hypervisor/hv_vmx.h>
#include <Hypervisor/hv_error.h>
#include "target/i386/cpu.h"
-#include "hw/hw.h"
uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
int reg);
#define hvf_enabled() (hvf_allowed)
diff --git a/monitor/misc.c b/monitor/misc.c
index 00338c0..117a172 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "monitor-internal.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "monitor/qdev.h"
#include "hw/usb.h"
#include "hw/pci/pci.h"
diff --git a/target/alpha/machine.c b/target/alpha/machine.c
index fdab596..b26ec29 100644
--- a/target/alpha/machine.c
+++ b/target/alpha/machine.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "migration/cpu.h"
diff --git a/target/arm/machine.c b/target/arm/machine.c
index 3fd319a..bf2a0a6 100644
--- a/target/arm/machine.c
+++ b/target/arm/machine.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "qemu/error-report.h"
#include "sysemu/kvm.h"
diff --git a/target/cris/machine.c b/target/cris/machine.c
index ecec41c..be38a89 100644
--- a/target/cris/machine.c
+++ b/target/cris/machine.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "migration/cpu.h"
static const VMStateDescription vmstate_tlbset = {
diff --git a/target/hppa/machine.c b/target/hppa/machine.c
index 73e8121..9fb82a5 100644
--- a/target/hppa/machine.c
+++ b/target/hppa/machine.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "migration/cpu.h"
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 80f1443..ff65e11 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -54,7 +54,6 @@
#include "hw/i386/topology.h"
#ifndef CONFIG_USER_ONLY
#include "exec/address-spaces.h"
-#include "hw/hw.h"
#include "hw/xen/xen.h"
#include "hw/i386/apic_internal.h"
#include "hw/boards.h"
diff --git a/target/i386/machine.c b/target/i386/machine.c
index b114609..f8c6fee 100644
--- a/target/i386/machine.c
+++ b/target/i386/machine.c
@@ -1,7 +1,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
diff --git a/target/lm32/machine.c b/target/lm32/machine.c
index cc46f77..db43ef0 100644
--- a/target/lm32/machine.c
+++ b/target/lm32/machine.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "migration/cpu.h"
diff --git a/target/mips/machine.c b/target/mips/machine.c
index eb2d970..7f4b5d5 100644
--- a/target/mips/machine.c
+++ b/target/mips/machine.c
@@ -1,7 +1,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "internal.h"
-#include "hw/hw.h"
#include "migration/cpu.h"
static int cpu_post_load(void *opaque, int version_id)
diff --git a/target/moxie/machine.c b/target/moxie/machine.c
index 322a724..675272f 100644
--- a/target/moxie/machine.c
+++ b/target/moxie/machine.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "machine.h"
#include "migration/cpu.h"
diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c
index 9fa2852..99c0470 100644
--- a/target/openrisc/machine.c
+++ b/target/openrisc/machine.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "migration/cpu.h"
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 4bd95be..4b05014 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -37,6 +37,7 @@
#include "hw/sysbus.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_cpu_core.h"
+#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "migration/qemu-file-types.h"
#include "sysemu/watchdog.h"
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index e82f5de..199f5ce 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -1,7 +1,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/kvm.h"
#include "helper_regs.h"
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 3caba8d..9466cd8 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -37,7 +37,6 @@
#include "sysemu/hw_accel.h"
#include "hw/qdev-properties.h"
#ifndef CONFIG_USER_ONLY
-#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/arch_init.h"
#include "sysemu/sysemu.h"
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 6e814c2..b465bb5 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -36,7 +36,6 @@
#include "qemu/log.h"
#include "sysemu/sysemu.h"
#include "sysemu/hw_accel.h"
-#include "hw/hw.h"
#include "sysemu/device_tree.h"
#include "exec/gdbstub.h"
#include "exec/ram_addr.h"
diff --git a/target/s390x/machine.c b/target/s390x/machine.c
index 12a2cd6..549bb6c 100644
--- a/target/s390x/machine.c
+++ b/target/s390x/machine.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "cpu.h"
#include "internal.h"
#include "kvm_s390x.h"
diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 6e9c4d6..7a56311 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -25,6 +25,7 @@
#include "sysemu/tcg.h"
#include "exec/exec-all.h"
#include "trace.h"
+#include "hw/hw.h"
#include "hw/s390x/storage-keys.h"
/* #define DEBUG_S390 */
diff --git a/target/sparc/machine.c b/target/sparc/machine.c
index 32d453c..7309c27 100644
--- a/target/sparc/machine.c
+++ b/target/sparc/machine.c
@@ -1,7 +1,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "qemu/timer.h"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 2ffc333..16478ec 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -34,7 +34,6 @@
#include "qemu/notify.h"
#include "qemu/option.h"
#include "migration/misc.h"
-#include "hw/hw.h"
#include "hw/pci/pci_bus.h"
#include "ui/spice-display.h"
diff --git a/vl.c b/vl.c
index 1abfd30..20328e6 100644
--- a/vl.c
+++ b/vl.c
@@ -55,7 +55,6 @@ int main(int argc, char **argv)
#include "qemu/error-report.h"
#include "qemu/sockets.h"
-#include "hw/hw.h"
#include "sysemu/accel.h"
#include "hw/usb.h"
#include "hw/isa/isa.h"