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.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1454089805-5470-6-git-send-email-peter.maydell@linaro.org

diff --git a/util/acl.c b/util/acl.c
index 571d686156595e01638dd4060cc3aa70f22b1c23..723b6a89b42e5c5f6a9b520b7eee75487fda383e 100644 (file)
--- a/util/acl.c
+++ b/util/acl.c
@@ -23,6 +23,7 @@
  */
 
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/acl.h"
 

diff --git a/util/base64.c b/util/base64.c
index f82caa7c8b646faecb42df635ca94a8cd44d6477..8aa2a5b3ac68c0c42981cdac64d17d7868235f7e 100644 (file)
--- a/util/base64.c
+++ b/util/base64.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <config-host.h>
 
 #include "qemu/base64.h"

diff --git a/util/bitmap.c b/util/bitmap.c
index 44f0f481beed300a1afdfcb737349384b19813c9..40aadfb4f32ee1dae896f0bc25c71c29826b1bc5 100644 (file)
--- a/util/bitmap.c
+++ b/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/util/bitops.c b/util/bitops.c
index 227c38b883d6adb3443e902aba110a8b05dc9a75..b0c35dd5f1e348d66f7ec0079239dc377703753f 100644 (file)
--- a/util/bitops.c
+++ b/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/util/buffer.c b/util/buffer.c
index 8b27c08aaca25c3523ca7671144ffe1d64b4d5ce..a6118bf5b25fbb50fcddfba7cb71d2fc80b02982 100644 (file)
--- a/util/buffer.c
+++ b/util/buffer.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu/buffer.h"
 #include "trace.h"
 

diff --git a/util/compatfd.c b/util/compatfd.c
index e8571502beffc7c841809d7a173965e0123ffd7f..9a43042ae662d36785eeea419e6dd7905237f03b 100644 (file)
--- a/util/compatfd.c
+++ b/util/compatfd.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/compatfd.h"
 #include "qemu/thread.h"

diff --git a/util/coroutine-gthread.c b/util/coroutine-gthread.c
index 0bcd77867d457a366bc1dc39108bebbde8db7f1a..fb697eb0b7a09b1f157d56eeef45eaab69c2cd65 100644 (file)
--- a/util/coroutine-gthread.c
+++ b/util/coroutine-gthread.c
@@ -18,6 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "qemu-common.h"
 #include "qemu/coroutine_int.h"

diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
index 39842a4a904deeff5fcbccaa5039261cc666ec90..6b8aee7a2b779dbc571ff6de921e90cfa58f9ab9 100644 (file)
--- a/util/coroutine-sigaltstack.c
+++ b/util/coroutine-sigaltstack.c
@@ -25,11 +25,9 @@
 #ifdef _FORTIFY_SOURCE
 #undef _FORTIFY_SOURCE
 #endif
-#include <stdlib.h>
+#include "qemu/osdep.h"
 #include <setjmp.h>
-#include <stdint.h>
 #include <pthread.h>
-#include <signal.h>
 #include "qemu-common.h"
 #include "qemu/coroutine_int.h"
 

diff --git a/util/coroutine-ucontext.c b/util/coroutine-ucontext.c
index 26cbebb7a71f3cb02852eccf89a064952fc18152..4914f6019916eba9273e6c9710de95ff602f0e81 100644 (file)
--- a/util/coroutine-ucontext.c
+++ b/util/coroutine-ucontext.c
@@ -22,9 +22,8 @@
 #ifdef _FORTIFY_SOURCE
 #undef _FORTIFY_SOURCE
 #endif
-#include <stdlib.h>
+#include "qemu/osdep.h"
 #include <setjmp.h>
-#include <stdint.h>
 #include <ucontext.h>
 #include "qemu-common.h"
 #include "qemu/coroutine_int.h"

diff --git a/util/coroutine-win32.c b/util/coroutine-win32.c
index 4f922c53af2cdc344773f80a71d14730e5652c90..02e28e825fe569f0ac1eea480cd71d66add39a94 100644 (file)
--- a/util/coroutine-win32.c
+++ b/util/coroutine-win32.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/coroutine_int.h"
 

diff --git a/util/crc32c.c b/util/crc32c.c
index 88663278012ea162d0770a203f49f46cbdda7a22..7e99555c162c45f051f44c14d1f8d429284aa943 100644 (file)
--- a/util/crc32c.c
+++ b/util/crc32c.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/crc32c.h"
 

diff --git a/util/cutils.c b/util/cutils.c
index cfeb848d190c3131bc59861bbbed4b708931ef7e..59e1f70d5f4fb77d2d89a38998e8de71bb08efca 100644 (file)
--- a/util/cutils.c
+++ b/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>
 
 #include "qemu/sockets.h"
 #include "qemu/iov.h"

diff --git a/util/envlist.c b/util/envlist.c
index 099a544a41b0ebaf816bf86b71f82513104ccfea..e86857e70ac2a0787e39e0e54c4cd93b9f89e671 100644 (file)
--- a/util/envlist.c
+++ b/util/envlist.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/queue.h"
 #include "qemu/envlist.h"

diff --git a/util/error.c b/util/error.c
index 57303fd05c0c2f18ec240efa930e0f930358ac75..471b8b3c1ef23464a7d44f4fcd8f2669fde17bd4 100644 (file)
--- a/util/error.c
+++ b/util/error.c
@@ -12,8 +12,8 @@
  * the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qemu/error-report.h"
 
 struct Error

diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index d4a0c63e1242d4653e8e3d95fd3c30ac9f54004e..2e30e74bd63f800dbd520b37cbf64d1ca016d08f 100644 (file)
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/event_notifier.h"
 #include "sysemu/char.h"

diff --git a/util/event_notifier-win32.c b/util/event_notifier-win32.c
index 6dbb530cfae21c1c7d0f6b9a1745049a80a6e028..14b4f7d2c04c0a9f2d5011ae86f93b502ac8204b 100644 (file)
--- a/util/event_notifier-win32.c
+++ b/util/event_notifier-win32.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/event_notifier.h"
 #include "qemu/main-loop.h"

diff --git a/util/fifo8.c b/util/fifo8.c
index 0ea5ad98e3b515bce2f622fcc2677ba520aea15b..5c64101b3372c5a50ae84944457b894f43ca9c24 100644 (file)
--- a/util/fifo8.c
+++ b/util/fifo8.c
@@ -12,6 +12,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/fifo8.h"
 

diff --git a/util/getauxval.c b/util/getauxval.c
index 1732ace2b178fb147abab3ddceb7254f2cff04c6..0b3bae2dcb764ea4e2ea15b7dcbe3f5c5f8617ea 100644 (file)
--- a/util/getauxval.c
+++ b/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/util/hbitmap.c b/util/hbitmap.c
index 50b888fd607bdeab5c02fb2faa5c388588be4850..b22b87d0a68fd4be77af276fd12a0a1168a85195 100644 (file)
--- a/util/hbitmap.c
+++ b/util/hbitmap.c
@@ -9,10 +9,8 @@
  * later.  See the COPYING file in the top-level directory.
  */
 
-#include <string.h>
-#include <glib.h>
-#include <assert.h>
 #include "qemu/osdep.h"
+#include <glib.h>
 #include "qemu/hbitmap.h"
 #include "qemu/host-utils.h"
 #include "trace.h"

diff --git a/util/hexdump.c b/util/hexdump.c
index 969b3406c07b20fcf014aead3b140b1a0fa7b33f..1d9c12967b4e5452ce86911b5497e0479df2506d 100644 (file)
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)

diff --git a/util/host-utils.c b/util/host-utils.c
index 102e5bf3025a47472aaf1d0f56b351e13992e2a0..b166e57586af82ec8dc402f74a2095c9cc74b93a 100644 (file)
--- a/util/host-utils.c
+++ b/util/host-utils.c
@@ -23,8 +23,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <stdint.h>
+#include "qemu/osdep.h"
 #include "qemu/host-utils.h"
 
 /* Long integer helpers */

diff --git a/util/id.c b/util/id.c
index 7883fbec794b5186203b3b8ea519b60c781537ad..bbbadcc7841cac091c59d39f1e5c69fdba1dec9b 100644 (file)
--- a/util/id.c
+++ b/util/id.c
@@ -10,6 +10,7 @@
  * or later.  See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 bool id_wellformed(const char *id)

diff --git a/util/iov.c b/util/iov.c
index a0d5934e8eecb011089390df92cbd1f7cd532e6f..e802ee15bcb9d74be37de710ffd0eb741ddfe2d8 100644 (file)
--- a/util/iov.c
+++ b/util/iov.c
@@ -16,6 +16,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/iov.h"
 #include "qemu/sockets.h"
 

diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 5cd7f71ac3425193941b3c6c32435a1d4337680c..0b4cc7f7f1177f727c39b463782a71dc0b00d5ef 100644 (file)
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -9,10 +9,9 @@
  * 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>
 
 #define HUGETLBFS_MAGIC       0x958458f6
 

diff --git a/util/module.c b/util/module.c
index 4bd4a94d87f290d374a456c28d9f802fc426c9bd..ce058aef6f086b38455b4d13daf4a68df66ba45b 100644 (file)
--- a/util/module.c
+++ b/util/module.c
@@ -13,7 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include <stdlib.h>
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #ifdef CONFIG_MODULES
 #include <gmodule.h>

diff --git a/util/notify.c b/util/notify.c
index f215dfc2142d230ce155e9c1970ee199efb1c779..06de63a839a15b98b8a2d17c33a17e8f4677ee54 100644 (file)
--- a/util/notify.c
+++ b/util/notify.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/notify.h"
 

diff --git a/util/osdep.c b/util/osdep.c
index 534b51147c5bcbe11aadc0f3cecf0d5f89588726..8356bdd3d842588e6997fef48c7299d51df8ba5d 100644 (file)
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -21,24 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include "qemu/osdep.h"
 
 /* Needed early for CONFIG_BSD etc. */
-#include "config-host.h"
 
 #if defined(CONFIG_MADVISE) || defined(CONFIG_POSIX_MADVISE)
 #include <sys/mman.h>
 #endif
 
 #ifdef CONFIG_SOLARIS
-#include <sys/types.h>
 #include <sys/statvfs.h>
 /* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for
    discussion about Solaris header problems */

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index d25f6715c75c042a71014ede79460d94f720aaae..d844387b79043febd5e464b8c1ac03a28dd385ca 100644 (file)
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -47,13 +47,12 @@ extern int daemon(int, int);
 #  define QEMU_VMALLOC_ALIGN getpagesize()
 #endif
 
+#include "qemu/osdep.h"
 #include <termios.h>
-#include <unistd.h>
 #include <termios.h>
 
 #include <glib/gprintf.h>
 
-#include "config-host.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
 #include "qemu/sockets.h"

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 6a47019dfbe4a4fd6ae935868f9af709b4b9ebe8..438cfa4f6ab7ffd5ac39884de19409c5b67edf94 100644 (file)
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -29,10 +29,9 @@
  * this file are based on code from GNOME glib-2 and use a different license,
  * see the license comment there.
  */
+#include "qemu/osdep.h"
 #include <windows.h>
 #include <glib.h>
-#include <stdlib.h>
-#include "config-host.h"
 #include "sysemu/sysemu.h"
 #include "qemu/main-loop.h"
 #include "trace.h"

diff --git a/util/path.c b/util/path.c
index 4e4877e821914078d8180623376a5bc5965c5542..d09e8c5e142582aab7004d8e175d4065d73fd3c5 100644 (file)
--- a/util/path.c
+++ b/util/path.c
@@ -3,14 +3,9 @@
 
    The assumption is that this area does not change.
 */
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/param.h>
 #include <dirent.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
 #include "qemu-common.h"
 
 struct pathelem

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 687fd34cc67a5702c54fd75f9b68790f92f4c0d2..fb973074d304cb1aaed5fd3a9a22d71174b65934 100644 (file)
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -1,8 +1,8 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
-#include "qapi/error.h"
 #include "qmp-commands.h"
 
 static QemuOptsList *vm_config_groups[48];

diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
index e1eae7331e025b4cf9f8de40c84bfd40007f4f62..0d5041c1c384e5d01b4219f447af38b817e35c51 100644 (file)
--- a/util/qemu-coroutine-io.c
+++ b/util/qemu-coroutine-io.c
@@ -22,6 +22,7 @@
  * 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/sockets.h"
 #include "qemu/coroutine.h"

diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c
index 130ee19d178ce2e906eda161b079460c94a25caa..da37ca7f9526280d26e9f8221f9f11c9d89ebd73 100644 (file)
--- a/util/qemu-coroutine-lock.c
+++ b/util/qemu-coroutine-lock.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/coroutine.h"
 #include "qemu/coroutine_int.h"

diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index b35db56356dd90f05a89d57ab293b1db8a6156ac..6966831d370e60f7e707e36205e2ceae5757c2dd 100644 (file)
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu/coroutine.h"
 #include "qemu/timer.h"
 #include "block/aio.h"

diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c
index 8953560223b4e5290e9701db83ab0c16ace292ac..5816702cc5e5044b6e56c583cd7b60036ed719e6 100644 (file)
--- a/util/qemu-coroutine.c
+++ b/util/qemu-coroutine.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "qemu-common.h"
 #include "qemu/thread.h"

diff --git a/util/qemu-error.c b/util/qemu-error.c
index ecf570847820c198fc34cce0a6db9fc3738b6567..1ef35664af3d925d302d798a53639aaa491b4aae 100644 (file)
--- a/util/qemu-error.c
+++ b/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 "monitor/monitor.h"
 #include "qemu/error-report.h"
 

diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c
index 4c5321116ba38dd3dbbb39df501be68551b2c6fa..2e8b43bdf571f968d975625960bd6bf07ae2222a 100644 (file)
--- a/util/qemu-openpty.c
+++ b/util/qemu-openpty.c
@@ -32,7 +32,7 @@
  * linked with -lutil.
  */
 
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 #if defined(__GLIBC__)

diff --git a/util/qemu-option.c b/util/qemu-option.c
index a2d593ad2bcc6c7cd18cbd557f8de7b33bbfabce..e7aa43f857da87a0b879fec1b677ca72a1f4c43e 100644 (file)
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -23,13 +23,11 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qapi/qmp/types.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/option_int.h"
 

diff --git a/util/qemu-progress.c b/util/qemu-progress.c
index 532333e7573d23dedae3d4b896ebbeab53473c43..f745233763aa8417ebf7599e6c2ca50271d60db1 100644 (file)
--- a/util/qemu-progress.c
+++ b/util/qemu-progress.c
@@ -22,9 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "qemu-common.h"
 #include "qemu/osdep.h"
-#include <stdio.h>
+#include "qemu-common.h"
 
 struct progress_state {
     float current;

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index f455a1748fd68f8414084c9a51043d44673aa42b..51354dfb6d1a81bc61a279f5ae215f03d880d355 100644 (file)
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -15,12 +15,7 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
 
 #include "monitor/monitor.h"
 #include "qemu/sockets.h"

diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c
index dbd8094fcee63a78016f145d2d7e25a9d14d662e..74a3023f3e5929eb5750492bbeef79cfa2418f86 100644 (file)
--- a/util/qemu-thread-posix.c
+++ b/util/qemu-thread-posix.c
@@ -10,16 +10,7 @@
  * 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 <stdint.h>
-#include <string.h>
-#include <limits.h>
-#include <unistd.h>
-#include <sys/time.h>
+#include "qemu/osdep.h"
 #ifdef __linux__
 #include <sys/syscall.h>
 #include <linux/futex.h>

diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c
index 6cdd553e9ac61ce1358482419d9d35778485c2a6..98a5ddff8246665f536fc642a1d24125c528c042 100644 (file)
--- a/util/qemu-thread-win32.c
+++ b/util/qemu-thread-win32.c
@@ -10,12 +10,11 @@
  * See the COPYING file in the top-level directory.
  *
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/thread.h"
 #include "qemu/notify.h"
 #include <process.h>
-#include <assert.h>
-#include <limits.h>
 
 static bool name_threads;
 

diff --git a/util/qemu-timer-common.c b/util/qemu-timer-common.c
index 95e0847c76f3b88ee713f19f119134093a0454da..06d084d3646aa693136b28b339e1df2bda046eb1 100644 (file)
--- a/util/qemu-timer-common.c
+++ b/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"
 
 /***********************************************************/

diff --git a/util/rcu.c b/util/rcu.c
index 8ba304dc44118b3295151aebdeb496dd015c66b2..bceb3e47200a4e20b0d0b0b0d9ac6f6a113b9c0a 100644 (file)
--- a/util/rcu.c
+++ b/util/rcu.c
@@ -26,12 +26,8 @@
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
-#include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <errno.h>
 #include "qemu/rcu.h"
 #include "qemu/atomic.h"
 #include "qemu/thread.h"

diff --git a/util/readline.c b/util/readline.c
index cc1302ac0adcd195c9ad70f1043d798503dde752..e94c97521b51c9776d8ac95010ae1c7fdc22a86d 100644 (file)
--- a/util/readline.c
+++ b/util/readline.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/readline.h"
 

diff --git a/util/rfifolock.c b/util/rfifolock.c
index afbf7488df0c9faef76884ba24d5ab70481f927e..c22f5feeeebe2a4f5d142b5f558039d83ad50a8f 100644 (file)
--- a/util/rfifolock.c
+++ b/util/rfifolock.c
@@ -11,7 +11,7 @@
  *
  */
 
-#include <assert.h>
+#include "qemu/osdep.h"
 #include "qemu/rfifolock.h"
 
 void rfifolock_init(RFifoLock *r, void (*cb)(void *), void *opaque)

diff --git a/util/throttle.c b/util/throttle.c
index af4bc95ba3476b63bd4f6aae64d3de2d574d1273..2f9b23d925df070b68323be8f53d91de05a038c1 100644 (file)
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -22,6 +22,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/throttle.h"
 #include "qemu/timer.h"
 #include "block/aio.h"

diff --git a/util/timed-average.c b/util/timed-average.c
index a2dfb4834dad80f4a27e2c741d626998e0e92800..2eef9cbb19f1505bd3a9b66e15b608c805c625f5 100644 (file)
--- a/util/timed-average.c
+++ b/util/timed-average.c
@@ -22,7 +22,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include "qemu/osdep.h"
 
 #include "qemu/timed-average.h"
 

diff --git a/util/unicode.c b/util/unicode.c
index d1c865885058a3aa4cb5849309d6dfaaa023c8a6..524dca8c7c4f1ea92857fc5005a865d83d0892c0 100644 (file)
--- a/util/unicode.c
+++ b/util/unicode.c
@@ -10,6 +10,7 @@
  * later.  See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 /**

diff --git a/util/uri.c b/util/uri.c
index 550b9845870d850ce69829411ab92828c0f98658..d109d6c01dcfd32463e74e73e0f0fd5bb6cbd22e 100644 (file)
--- a/util/uri.c
+++ b/util/uri.c
@@ -51,9 +51,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "qemu/uri.h"