[Qemu-devel] [PATCH 12/15] qom: Clean up includes

[Peter Maydell <peter.maydell@linaro.org>]

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 qom/container.c         | 2 +-
 qom/object.c            | 1 +
 qom/object_interfaces.c | 1 +
 qom/qom-qobject.c       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/qom/container.c b/qom/container.c
index 62b1648..c9eb49b 100644
--- a/qom/container.c
+++ b/qom/container.c
@@ -10,9 +10,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "qemu/module.h"
-#include <assert.h>
 
 static const TypeInfo container_info = {
     .name          = "container",
diff --git a/qom/object.c b/qom/object.c
index 5ff97ab..5904081 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "qom/object_interfaces.h"
 #include "qemu-common.h"
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index a66cd60..f1218f0 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"
 
diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c
index 9649890..9cbc4c6 100644
--- a/qom/qom-qobject.c
+++ b/qom/qom-qobject.c
@@ -9,6 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qom/object.h"
 #include "qom/qom-qobject.h"
-- 
1.9.1