qapi: move include files to include/qobject/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

10 files changed, 12 insertions, 12 deletions

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 5c648d9..d15760b 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -22,7 +22,7 @@
 #include "pci/msix.h"
 #include "kvm.h"
 #include "migration.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "event_notifier.h"
 #include "qemu-char.h"
 
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index c79fca7..2a1278f 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -25,7 +25,7 @@
 #include "qemu-timer.h"
 #include "sysemu.h"
 #include "mc146818rtc.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
 
 #ifdef TARGET_I386
 #include "apic.h"
diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
index b850400..5ba7558 100644
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -32,7 +32,7 @@
 #include "hw/virtio-blk.h"
 #include "qemu-config.h"
 #include "blockdev.h"
-#include "error.h"
+#include "qapi/error.h"
 
 #if defined(TARGET_I386)
 static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 8a2032c..b6f4f85 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -19,7 +19,7 @@
  */
 
 #include "sysemu.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 #include "monitor.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pcie.h"
diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c
index ea32c31..552ee21 100644
--- a/hw/qdev-addr.c
+++ b/hw/qdev-addr.c
@@ -1,7 +1,7 @@
 #include "qdev.h"
 #include "qdev-addr.h"
 #include "hwaddr.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
 
 /* --- target physical address --- */
 
diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index d672cca..506977c 100644
--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@@ -6,7 +6,7 @@
 #include "qemu-types.h"
 #include "qemu/object.h"
 #include "hw/irq.h"
-#include "error.h"
+#include "qapi/error.h"
 
 enum DevState {
     DEV_STATE_CREATED = 1,
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 7ab55ef..ba6c648 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,10 +1,10 @@
 #include "net/net.h"
 #include "qdev.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "blockdev.h"
 #include "hw/block-common.h"
 #include "net/hub.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
 #include "qemu-char.h"
 
 void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
diff --git a/hw/qdev.c b/hw/qdev.c
index 6b91fb9..0a2a32d 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -28,8 +28,8 @@
 #include "net/net.h"
 #include "qdev.h"
 #include "sysemu.h"
-#include "error.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/error.h"
+#include "qapi/visitor.h"
 
 int qdev_hotplug = 0;
 static bool qdev_hot_added = false;
diff --git a/hw/vga_int.h b/hw/vga_int.h
index ad02404..5efaee8 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -25,7 +25,7 @@
 #define HW_VGA_INT_H 1
 
 #include <hw/hw.h>
-#include "error.h"
+#include "qapi/error.h"
 #include "memory.h"
 
 #define ST01_V_RETRACE      0x08
diff --git a/hw/watchdog.c b/hw/watchdog.c
index 5c82c17..f878bec 100644
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -23,7 +23,7 @@
 #include "qemu-option.h"
 #include "qemu-config.h"
 #include "qemu-queue.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 #include "monitor.h"
 #include "sysemu.h"
 #include "hw/watchdog.h"