From 728aabd4c38ae6b8bab74c07571cb7b46b454af9 Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 19 Feb 2018 01:31:32 -0500
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.

Backports commit 9bbc853bd4fc6e4cbdbfc8d52eab0730d3ba94ba from qemu
---
 qemu/qom/container.c   | 2 +-
 qemu/qom/cpu.c         | 1 +
 qemu/qom/object.c      | 1 +
 qemu/qom/qom-qobject.c | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/qemu/qom/container.c b/qemu/qom/container.c
index e0e18f75..e9210268 100644
--- a/qemu/qom/container.c
+++ b/qemu/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 = {
     "container",
diff --git a/qemu/qom/cpu.c b/qemu/qom/cpu.c
index 217cf770..db0f4789 100644
--- a/qemu/qom/cpu.c
+++ b/qemu/qom/cpu.c
@@ -18,6 +18,7 @@
  * <http://www.gnu.org/licenses/gpl-2.0.html>
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/log.h"
 #include "uc_priv.h"
diff --git a/qemu/qom/object.c b/qemu/qom/object.c
index 9241db69..04616856 100644
--- a/qemu/qom/object.c
+++ b/qemu/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 "qemu-common.h"
 #include "qapi/visitor.h"
diff --git a/qemu/qom/qom-qobject.c b/qemu/qom/qom-qobject.c
index f1579ff2..4b684dac 100644
--- a/qemu/qom/qom-qobject.c
+++ b/qemu/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"