Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.2-pull-request...

[qemu.git] / hw / acpi / pcihp.c

diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index 613406d09ba634270f338fae3f236a6b1a2c4a63..8413348a33fde248caa93ac1e50e96da21141378 100644 (file)
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -27,14 +27,13 @@
 #include "qemu/osdep.h"
 #include "hw/acpi/pcihp.h"
 
-#include "hw/hw.h"
-#include "hw/i386/pc.h"
+#include "hw/pci-host/i440fx.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/acpi/acpi.h"
-#include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "hw/pci/pci_bus.h"
+#include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qom/qom-qobject.h"
 #include "trace.h"