From 9bbc853bd4fc6e4cbdbfc8d52eab0730d3ba94ba Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 29 Jan 2016 17:50:02 +0000
Subject: [PATCH] qom: Clean up includes

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>
Message-id: 1454089805-5470-13-git-send-email-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 62b1648add..c9eb49b01e 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 5ff97ab91e..5904081ba9 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 a66cd6026c..f1218f0cc1 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 964989065b..9cbc4c69a6 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"