Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu

[mirror_qemu.git] / hw / qdev-properties-system.c

diff --git a/hw/qdev-properties-system.c b/hw/qdev-properties-system.c
index 86b4cf6e99896b00baaed66b6ea900e0a537bcf0..c73c7130802a6a757232ddd29bbd4999c5d9e870 100644 (file)
--- a/hw/qdev-properties-system.c
+++ b/hw/qdev-properties-system.c
@@ -10,13 +10,14 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "net.h"
+#include "net/net.h"
 #include "qdev.h"
-#include "qerror.h"
-#include "blockdev.h"
+#include "qapi/qmp/qerror.h"
+#include "sysemu/blockdev.h"
 #include "hw/block-common.h"
 #include "net/hub.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
+#include "char/char.h"
 
 static void get_pointer(Object *obj, Visitor *v, Property *prop,
                         const char *(*print)(void *ptr),