Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging

[mirror_qemu.git] / qobject / qobject.c

diff --git a/qobject/qobject.c b/qobject/qobject.c
index a3ef14eb55a158083e95d87a3f24eb4f50e574b4..fe4fa1098958fa96ca43a92e9ecc6056bd121290 100644 (file)
--- a/qobject/qobject.c
+++ b/qobject/qobject.c
@@ -7,13 +7,9 @@
  * or later.  See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qfloat.h"
-#include "qapi/qmp/qint.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/types.h"
 
 static void (*qdestroy[QTYPE__MAX])(QObject *) = {
     [QTYPE_NONE] = NULL,               /* No such object exists */