all: 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-16-git-send-email-peter.maydell@linaro.org
2016-01-29 17:50:05 +00:00 · 2016-01-29 17:50:05 +00:00 · d38ea87ac5
commit d38ea87ac5
parent ccd241b5a2
65 changed files with 65 additions and 100 deletions
--- a/accel.c
+++ b/accel.c
@ -23,6 +23,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "sysemu/accel.h"
 #include "hw/boards.h"
 #include "qemu-common.h"
--- a/aio-posix.c
+++ b/aio-posix.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 "block/block.h"
 #include "qemu/queue.h"
--- a/aio-win32.c
+++ b/aio-win32.c
@ -15,6 +15,7 @@
 * GNU GPL, version 2 or (at your option) any later version.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block.h"
 #include "qemu/queue.h"
--- a/arch_init.c
+++ b/arch_init.c
@ -21,7 +21,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
-#include <stdint.h>
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
 #include "hw/pci/pci.h"
--- a/async.c
+++ b/async.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/aio.h"
 #include "block/thread-pool.h"
--- a/balloon.c
+++ b/balloon.c
@ -24,6 +24,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "exec/cpu-common.h"
 #include "sysemu/kvm.h"
--- a/block.c
+++ b/block.c
@ -21,7 +21,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "block/block_int.h"
@ -42,8 +42,6 @@
 #include "block/throttle-groups.h"

 #ifdef CONFIG_BSD
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/queue.h>
 #ifndef __DragonFly__
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@ -9,6 +9,7 @@
 * later.  See the COPYING file in the top-level directory.
 */

+#include "qemu/osdep.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"
--- a/blockdev.c
+++ b/blockdev.c
@ -30,6 +30,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"
--- a/blockjob.c
+++ b/blockjob.c
@ -23,7 +23,7 @@
 * THE SOFTWARE.
 */

-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "block/block.h"
--- a/bootdevice.c
+++ b/bootdevice.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"
--- a/bt-host.c
+++ b/bt-host.c
@ -17,12 +17,12 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/bt.h"
 #include "qemu/main-loop.h"

 #ifndef _WIN32
-# include <errno.h>
 # include <sys/ioctl.h>
 # include <sys/uio.h>
 # ifdef CONFIG_BLUEZ
--- a/bt-vhci.c
+++ b/bt-vhci.c
@ -17,6 +17,7 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/bt.h"
 #include "hw/bt.h"
--- a/device-hotplug.c
+++ b/device-hotplug.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/block-backend.h"
--- a/device_tree.c
+++ b/device_tree.c
@ -11,12 +11,7 @@
 *
 */

-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
+#include "qemu/osdep.h"

 #include "qemu-common.h"
 #include "qemu/error-report.h"
--- a/disas.c
+++ b/disas.c
@ -1,9 +1,8 @@
 /* General "disassemble this chunk" code.  Used for debugging. */
-#include "config.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "disas/bfd.h"
 #include "elf.h"
-#include <errno.h>

 #include "cpu.h"
 #include "disas/disas.h"
--- a/dma-helpers.c
+++ b/dma-helpers.c
@ -7,6 +7,7 @@
 * (GNU GPL), version 2 or later.
 */

+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 #include "trace.h"
--- a/dump.c
+++ b/dump.c
@ -11,6 +11,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "elf.h"
 #include "cpu.h"
@ -22,7 +23,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/memory_mapping.h"
 #include "sysemu/cpus.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"

--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@ -82,12 +82,11 @@ this code that are retained.
 /* softfloat (and in particular the code in softfloat-specialize.h) is
 * target-dependent and needs the TARGET_* macros.
 */
-#include "config.h"
+#include "qemu/osdep.h"

 #include "fpu/softfloat.h"

 /* We only need stdlib for abort() */
-#include <stdlib.h>

 /*----------------------------------------------------------------------------
 | Primitive arithmetic functions, including multi-word arithmetic, and
--- a/gdbstub.c
+++ b/gdbstub.c
@ -16,16 +16,9 @@
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "config.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #ifdef CONFIG_USER_ONLY
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>

 #include "qemu.h"
 #else
--- a/hmp.c
+++ b/hmp.c
@ -13,6 +13,7 @@
 * GNU GPL, version 2 or (at your option) any later version.
 */

+#include "qemu/osdep.h"
 #include "hmp.h"
 #include "net/net.h"
 #include "net/eth.h"
--- a/iohandler.c
+++ b/iohandler.c
@ -22,7 +22,7 @@
 * THE SOFTWARE.
 */

-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/queue.h"
 #include "block/aio.h"
--- a/ioport.c
+++ b/ioport.c
@ -25,6 +25,7 @@
 * splitted out ioport related stuffs from vl.c.
 */

+#include "qemu/osdep.h"
 #include "exec/ioport.h"
 #include "trace.h"
 #include "exec/memory.h"
--- a/iothread.c
+++ b/iothread.c
@ -11,6 +11,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"
--- a/kvm-all.c
+++ b/kvm-all.c
@ -13,10 +13,9 @@
 *
 */

-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <stdarg.h>

 #include <linux/kvm.h>

--- a/kvm-stub.c
+++ b/kvm-stub.c
@ -10,6 +10,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "cpu.h"
--- a/main-loop.c
+++ b/main-loop.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"	// struct in_addr needed for libslirp.h
--- a/memory.c
+++ b/memory.c
@ -13,6 +13,7 @@
 * GNU GPL, version 2 or (at your option) any later version.
 */

+#include "qemu/osdep.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #include "exec/ioport.h"
@ -21,7 +22,6 @@
 #include "qemu/error-report.h"
 #include "qom/object.h"
 #include "trace.h"
-#include <assert.h>

 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"
--- a/memory_mapping.c
+++ b/memory_mapping.c
@ -11,6 +11,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include <glib.h>

 #include "qemu-common.h"
--- a/module-common.c
+++ b/module-common.c
@ -1,4 +1,4 @@
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu/module.h"

 void qemu_module_dummy(void)
--- a/monitor.c
+++ b/monitor.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 <dirent.h>
 #include "hw/hw.h"
 #include "monitor/qdev.h"
@ -59,7 +60,6 @@
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/json-parser.h"
 #include <qom/object_interfaces.h>
-#include "qemu/osdep.h"
 #include "cpu.h"
 #include "trace.h"
 #include "trace/control.h"
--- a/nbd/client.c
+++ b/nbd/client.c
@ -16,6 +16,7 @@
 *  along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "nbd-internal.h"

 static int nbd_errno_to_system_errno(int err)
--- a/nbd/common.c
+++ b/nbd/common.c
@ -16,6 +16,7 @@
 *  along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "nbd-internal.h"

 ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read)
--- a/nbd/server.c
+++ b/nbd/server.c
@ -16,6 +16,7 @@
 *  along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "nbd-internal.h"

 static int system_errno_to_nbd_errno(int err)
--- a/numa.c
+++ b/numa.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "sysemu/numa.h"
 #include "exec/cpu-common.h"
 #include "qemu/bitmap.h"
--- a/os-posix.c
+++ b/os-posix.c
@ -23,10 +23,7 @@
 * THE SOFTWARE.
 */

-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/wait.h>
 /*needed for MAP_POPULATE before including qemu-options.h */
 #include <sys/mman.h>
@ -35,7 +32,6 @@
 #include <libgen.h>

 /* Needed early for CONFIG_BSD etc. */
-#include "config-host.h"
 #include "sysemu/sysemu.h"
 #include "net/slirp.h"
 #include "qemu-options.h"
--- a/os-win32.c
+++ b/os-win32.c
@ -22,14 +22,9 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
+#include "qemu/osdep.h"
 #include <windows.h>
 #include <mmsystem.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>
-#include "config-host.h"
 #include "sysemu/sysemu.h"
 #include "qemu-options.h"

--- a/page_cache.c
+++ b/page_cache.c
@ -12,13 +12,7 @@
 *
 */

-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <stdbool.h>
+#include "qemu/osdep.h"
 #include <glib.h>

 #include "qemu-common.h"
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@ -17,6 +17,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "hw/qdev.h"
 #include "hw/sysbus.h"
 #include "monitor/monitor.h"
--- a/qemu-bridge-helper.c
+++ b/qemu-bridge-helper.c
@ -13,19 +13,10 @@
 *
 */

-#include "config-host.h"
+#include "qemu/osdep.h"

-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <ctype.h>
 #include <glib.h>

-#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
--- a/qemu-char.c
+++ b/qemu-char.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-common.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
@ -37,11 +38,6 @@
 #include "io/channel-file.h"
 #include "io/channel-tls.h"

-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>
 #include <zlib.h>

 #ifndef _WIN32
@ -58,7 +54,6 @@
 #include <netdb.h>
 #include <sys/select.h>
 #ifdef CONFIG_BSD
-#include <sys/stat.h>
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
 #include <dev/ppbus/ppbconf.h>
@ -72,7 +67,6 @@
 #include <linux/parport.h>
 #endif
 #ifdef __sun__
-#include <sys/stat.h>
 #include <sys/ethernet.h>
 #include <sys/sockio.h>
 #include <netinet/arp.h>
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@ -16,6 +16,7 @@
 *  along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
@ -27,15 +28,11 @@
 #include "qapi/util.h"
 #include "qapi/qmp/qstring.h"

-#include <stdarg.h>
-#include <stdio.h>
 #include <getopt.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <signal.h>
 #include <libgen.h>
 #include <pthread.h>

--- a/qemu-seccomp.c
+++ b/qemu-seccomp.c
@ -12,7 +12,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 "qemu/osdep.h"
 #include <seccomp.h>
 #include "sysemu/seccomp.h"

--- a/qemu-timer.c
+++ b/qemu-timer.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "qemu/main-loop.h"
 #include "qemu/timer.h"
 #include "sysemu/replay.h"
--- a/qjson.c
+++ b/qjson.c
@ -11,8 +11,8 @@
 *
 */

+#include "qemu/osdep.h"
 #include <qapi/qmp/qstring.h>
-#include <stdbool.h>
 #include <glib.h>
 #include <qjson.h>
 #include <qemu/module.h>
--- a/qmp.c
+++ b/qmp.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 "monitor/monitor.h"
 #include "sysemu/sysemu.h"
--- a/qtest.c
+++ b/qtest.c
@ -11,6 +11,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "sysemu/qtest.h"
 #include "hw/qdev.h"
 #include "sysemu/char.h"
--- a/replay/replay-events.c
+++ b/replay/replay-events.c
@ -9,6 +9,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "sysemu/replay.h"
--- a/replay/replay-input.c
+++ b/replay/replay-input.c
@ -9,6 +9,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
--- a/replay/replay-internal.c
+++ b/replay/replay-internal.c
@ -9,6 +9,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
--- a/replay/replay-time.c
+++ b/replay/replay-time.c
@ -9,6 +9,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
--- a/replay/replay.c
+++ b/replay/replay.c
@ -9,6 +9,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@ -1,11 +1,10 @@
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "ui/qemu-spice.h"
 #include "sysemu/char.h"
 #include <spice.h>
 #include <spice/protocol.h>

-#include "qemu/osdep.h"

 typedef struct SpiceCharDriver {
    CharDriverState*      chr;
--- a/tcg-runtime.c
+++ b/tcg-runtime.c
@ -21,7 +21,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
-#include <stdint.h>
+#include "qemu/osdep.h"
 #include "qemu/host-utils.h"

 /* This file is compiled once, and thus we can't include the standard
--- a/tci.c
+++ b/tci.c
@ -17,7 +17,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "config.h"
+#include "qemu/osdep.h"

 /* Defining NDEBUG disables assertions (which makes the code faster). */
 #if !defined(CONFIG_DEBUG_TCG) && !defined(NDEBUG)
--- a/thread-pool.c
+++ b/thread-pool.c
@ -14,10 +14,10 @@
 * Contributions after 2012-01-13 are licensed under the terms of the
 * GNU GPL, version 2 or (at your option) any later version.
 */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/queue.h"
 #include "qemu/thread.h"
-#include "qemu/osdep.h"
 #include "qemu/coroutine.h"
 #include "trace.h"
 #include "block/thread-pool.h"
--- a/thunk.c
+++ b/thunk.c
@ -16,9 +16,7 @@
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
+#include "qemu/osdep.h"

 #include "qemu.h"
 #include "exec/user/thunk.h"
--- a/tpm.c
+++ b/tpm.c
@ -11,7 +11,7 @@
 *
 * Based on net.c
 */
-#include "config-host.h"
+#include "qemu/osdep.h"

 #include "qapi/qmp/qerror.h"
 #include "sysemu/tpm_backend.h"
--- a/trace/control.c
+++ b/trace/control.c
@ -7,6 +7,7 @@
 * See the COPYING file in the top-level directory.
 */

+#include "qemu/osdep.h"
 #include "trace/control.h"
 #ifdef CONFIG_TRACE_SIMPLE
 #include "trace/simple.h"
--- a/trace/ftrace.c
+++ b/trace/ftrace.c
@ -9,10 +9,7 @@
 *
 */

-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <limits.h>
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "trace/control.h"

--- a/trace/qmp.c
+++ b/trace/qmp.c
@ -7,6 +7,7 @@
 * See the COPYING file in the top-level directory.
 */

+#include "qemu/osdep.h"
 #include "qemu/typedefs.h"
 #include "qmp-commands.h"
 #include "trace/control.h"
--- a/trace/simple.c
+++ b/trace/simple.c
@ -8,12 +8,8 @@
 *
 */

-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <time.h>
+#include "qemu/osdep.h"
 #ifndef _WIN32
-#include <signal.h>
 #include <pthread.h>
 #endif
 #include "qemu/timer.h"
--- a/user-exec.c
+++ b/user-exec.c
@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "config.h"
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg.h"
@ -33,7 +33,6 @@
 #undef ESI
 #undef EDI
 #undef EIP
-#include <signal.h>
 #ifdef __linux__
 #include <sys/ucontext.h>
 #endif
--- a/util/log.c
+++ b/util/log.c
@ -17,6 +17,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/log.h"
 #include "trace/control.h"
--- a/vl.c
+++ b/vl.c
@ -21,14 +21,8 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>
+#include "qemu/osdep.h"

-#include "config-host.h"

 #ifdef CONFIG_SECCOMP
 #include "sysemu/seccomp.h"
@ -113,7 +107,6 @@ int main(int argc, char **argv)
 #include "qemu/queue.h"
 #include "sysemu/cpus.h"
 #include "sysemu/arch_init.h"
-#include "qemu/osdep.h"

 #include "ui/qemu-spice.h"
 #include "qapi/string-input-visitor.h"