From 56d213f16c9132e0d455fb60f15a1724abeecf98 Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 19 Feb 2018 01:27:52 -0500
Subject: [PATCH] util: 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 aafd758410015e08b1aa8964d739ba8587ce58dc from qemu
---
 qemu/util/bitmap.c            | 1 +
 qemu/util/bitops.c            | 1 +
 qemu/util/crc32c.c            | 1 +
 qemu/util/cutils.c            | 3 +--
 qemu/util/error.c             | 1 +
 qemu/util/getauxval.c         | 2 +-
 qemu/util/host-utils.c        | 2 +-
 qemu/util/mmap-alloc.c        | 4 ++--
 qemu/util/module.c            | 1 +
 qemu/util/oslib-posix.c       | 2 +-
 qemu/util/oslib-win32.c       | 3 +--
 qemu/util/qemu-error.c        | 2 +-
 qemu/util/qemu-thread-posix.c | 9 ++-------
 qemu/util/qemu-thread-win32.c | 3 +--
 qemu/util/qemu-timer-common.c | 1 +
 15 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/qemu/util/bitmap.c b/qemu/util/bitmap.c
index 4c1541d3..086d8c8d 100644
--- a/qemu/util/bitmap.c
+++ b/qemu/util/bitmap.c
@@ -9,6 +9,7 @@
  * Version 2.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/bitops.h"
 #include "qemu/bitmap.h"
 #include "qemu/atomic.h"
diff --git a/qemu/util/bitops.c b/qemu/util/bitops.c
index f1641bf8..f5fadf1f 100644
--- a/qemu/util/bitops.c
+++ b/qemu/util/bitops.c
@@ -11,6 +11,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/bitops.h"
 
 #define BITOP_WORD(nr)		((nr) / BITS_PER_LONG)
diff --git a/qemu/util/crc32c.c b/qemu/util/crc32c.c
index 88663278..7e99555c 100644
--- a/qemu/util/crc32c.c
+++ b/qemu/util/crc32c.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/crc32c.h"
 
diff --git a/qemu/util/cutils.c b/qemu/util/cutils.c
index f7fa35cb..81683def 100644
--- a/qemu/util/cutils.c
+++ b/qemu/util/cutils.c
@@ -21,11 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"
 #include <math.h>
-#include <limits.h>
-#include <errno.h>
 
 void strpadcpy(char *buf, int buf_size, const char *str, char pad)
 {
diff --git a/qemu/util/error.c b/qemu/util/error.c
index becaee1c..3c24d94d 100644
--- a/qemu/util/error.c
+++ b/qemu/util/error.c
@@ -10,6 +10,7 @@
  * the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/error.h"
 
diff --git a/qemu/util/getauxval.c b/qemu/util/getauxval.c
index 208bfa39..272ef820 100644
--- a/qemu/util/getauxval.c
+++ b/qemu/util/getauxval.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "qemu-common.h"
 #include "qemu/osdep.h"
+#include "qemu-common.h"
 
 #ifdef CONFIG_GETAUXVAL
 /* Don't inline this in qemu/osdep.h, because pulling in <sys/auxv.h> for
diff --git a/qemu/util/host-utils.c b/qemu/util/host-utils.c
index 5f1d7a79..0bd675d1 100644
--- a/qemu/util/host-utils.c
+++ b/qemu/util/host-utils.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdlib.h>
+#include "qemu/osdep.h"
 #include "unicorn/platform.h"
 #include "qemu/host-utils.h"
 
diff --git a/qemu/util/mmap-alloc.c b/qemu/util/mmap-alloc.c
index c37acbe5..33ee7f1c 100644
--- a/qemu/util/mmap-alloc.c
+++ b/qemu/util/mmap-alloc.c
@@ -9,10 +9,10 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or
  * later.  See the COPYING file in the top-level directory.
  */
+
+#include "qemu/osdep.h"
 #include <qemu/mmap-alloc.h>
-#include <sys/types.h>
 #include <sys/mman.h>
-#include <assert.h>
 
 void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared)
 {
diff --git a/qemu/util/module.c b/qemu/util/module.c
index 9d9cd238..4573a991 100644
--- a/qemu/util/module.c
+++ b/qemu/util/module.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/queue.h"
 
diff --git a/qemu/util/oslib-posix.c b/qemu/util/oslib-posix.c
index 43edfeaa..05dc0a36 100644
--- a/qemu/util/oslib-posix.c
+++ b/qemu/util/oslib-posix.c
@@ -39,8 +39,8 @@
 #endif
 #define HUGETLBFS_MAGIC       0x958458f6
 
+#include "qemu/osdep.h"
 #include "unicorn/platform.h"
-#include "config-host.h"
 #include "sysemu/sysemu.h"
 #include <sys/mman.h>
 #include <libgen.h>
diff --git a/qemu/util/oslib-win32.c b/qemu/util/oslib-win32.c
index 7182c776..9681a573 100644
--- a/qemu/util/oslib-win32.c
+++ b/qemu/util/oslib-win32.c
@@ -26,11 +26,10 @@
  * THE SOFTWARE.
  *
  */
+#include "qemu/osdep.h"
 #include <winsock2.h>
 #include <windows.h>
 
-#include <stdlib.h>
-#include "config-host.h"
 #include "sysemu/sysemu.h"
 
 /* this must come after including "trace.h" */
diff --git a/qemu/util/qemu-error.c b/qemu/util/qemu-error.c
index 2476f694..ec18ffe1 100644
--- a/qemu/util/qemu-error.c
+++ b/qemu/util/qemu-error.c
@@ -10,7 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <stdarg.h>
 #include <string.h>
 
diff --git a/qemu/util/qemu-thread-posix.c b/qemu/util/qemu-thread-posix.c
index c4611443..5794247c 100644
--- a/qemu/util/qemu-thread-posix.c
+++ b/qemu/util/qemu-thread-posix.c
@@ -10,14 +10,9 @@
  * See the COPYING file in the top-level directory.
  *
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <time.h>
-#include <signal.h>
+
+#include "qemu/osdep.h"
 #include "unicorn/platform.h"
-#include <string.h>
-#include <limits.h>
 #ifdef __linux__
 #include <sys/syscall.h>
 #include <linux/futex.h>
diff --git a/qemu/util/qemu-thread-win32.c b/qemu/util/qemu-thread-win32.c
index 3a85e6a4..6b0b851e 100644
--- a/qemu/util/qemu-thread-win32.c
+++ b/qemu/util/qemu-thread-win32.c
@@ -10,11 +10,10 @@
  * See the COPYING file in the top-level directory.
  *
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/thread.h"
 #include <process.h>
-#include <assert.h>
-#include <limits.h>
 
 #include "uc_priv.h"
 
diff --git a/qemu/util/qemu-timer-common.c b/qemu/util/qemu-timer-common.c
index 3ab3326b..0e4b6bea 100644
--- a/qemu/util/qemu-timer-common.c
+++ b/qemu/util/qemu-timer-common.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu/timer.h"
 
 /***********************************************************/