From 30456d5ba3736b8f0c73560e559cdd2f76a4885e Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 23 Feb 2016 11:58:03 +0000 Subject: [PATCH] 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 Reviewed-by: Eric Blake --- audio/audio.h | 1 - bsd-user/qemu.h | 3 --- contrib/ivshmem-client/ivshmem-client.h | 1 - contrib/ivshmem-server/ivshmem-server.h | 3 --- fsdev/file-op-9p.h | 3 --- hw/9pfs/9p-synth.h | 3 --- hw/9pfs/9p.h | 2 -- hw/audio/gusemu.h | 1 - hw/display/vga_int.h | 1 - hw/net/fsl_etsec/registers.h | 1 - hw/usb/desc.h | 1 - io/channel-util.c | 1 + linux-user/arm/nwfpe/fpa11.h | 3 --- linux-user/qemu.h | 3 --- nbd/nbd-internal.h | 4 ---- net/tap-linux.h | 1 - net/util.h | 1 - qemu-nbd.c | 2 -- qga/vss-win32.h | 1 - qga/vss-win32/requester.h | 1 - qga/vss-win32/vss-common.h | 1 - replay/replay-internal.h | 1 - slirp/slirp.h | 18 ------------------ target-alpha/cpu.h | 1 - target-arm/cpu.h | 1 - target-arm/kvm-consts.h | 1 - target-cris/cpu.h | 1 - target-i386/cpu-qom.h | 1 - target-i386/cpu.h | 1 - target-i386/mpx_helper.c | 1 + target-lm32/cpu.h | 1 - target-m68k/cpu.h | 1 - target-microblaze/cpu.h | 1 - target-mips/cpu.h | 1 - target-moxie/cpu.h | 1 - target-openrisc/cpu.h | 1 - target-ppc/cpu.h | 1 - target-s390x/cpu.h | 1 - target-sh4/cpu.h | 1 - target-sparc/cpu.h | 1 - target-tilegx/cpu.h | 1 - target-tricore/cpu.h | 1 - target-unicore32/cpu.h | 1 - target-xtensa/cpu.h | 1 - tcg/tci/tcg-target.h | 1 - tests/libqos/ahci.h | 3 --- tests/libqos/fw_cfg.h | 2 -- tests/libqos/i2c.h | 1 - tests/libqos/malloc.h | 2 -- tests/libqos/pci.h | 1 - tests/libqtest.h | 6 ------ trace/control-internal.h | 1 - trace/ftrace.h | 1 - trace/simple.h | 3 --- ui/vnc-palette.h | 2 -- ui/vnc.h | 1 - 56 files changed, 2 insertions(+), 100 deletions(-) diff --git a/audio/audio.h b/audio/audio.h index e7ea39777e..b41a97053d 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -24,7 +24,6 @@ #ifndef QEMU_AUDIO_H #define QEMU_AUDIO_H -#include "config-host.h" #include "qemu/queue.h" typedef void (*audio_callback_fn) (void *opaque, int avail); diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 735cb4042a..1b5f9983d1 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -17,15 +17,12 @@ #ifndef QEMU_H #define QEMU_H -#include -#include #include "cpu.h" #include "exec/cpu_ldst.h" #undef DEBUG_REMAP #ifdef DEBUG_REMAP -#include #endif /* DEBUG_REMAP */ #include "exec/user/abitypes.h" diff --git a/contrib/ivshmem-client/ivshmem-client.h b/contrib/ivshmem-client/ivshmem-client.h index 3a4f809682..54cde17d93 100644 --- a/contrib/ivshmem-client/ivshmem-client.h +++ b/contrib/ivshmem-client/ivshmem-client.h @@ -19,7 +19,6 @@ * purposes. */ -#include #include #include "qemu/queue.h" diff --git a/contrib/ivshmem-server/ivshmem-server.h b/contrib/ivshmem-server/ivshmem-server.h index c9359a0a8a..e9de8a369d 100644 --- a/contrib/ivshmem-server/ivshmem-server.h +++ b/contrib/ivshmem-server/ivshmem-server.h @@ -26,10 +26,7 @@ * associated to the ivshmem shared memory. */ -#include #include -#include -#include #include "qemu/event_notifier.h" #include "qemu/queue.h" diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 956fda0919..b8c26024a9 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -12,11 +12,8 @@ */ #ifndef _FILEOP_H #define _FILEOP_H -#include #include -#include #include -#include #include #include diff --git a/hw/9pfs/9p-synth.h b/hw/9pfs/9p-synth.h index eaf5a0c293..82962512a1 100644 --- a/hw/9pfs/9p-synth.h +++ b/hw/9pfs/9p-synth.h @@ -13,9 +13,6 @@ #ifndef HW_9PFS_SYNTH_H #define HW_9PFS_SYNTH_H 1 -#include -#include -#include typedef struct V9fsSynthNode V9fsSynthNode; typedef ssize_t (*v9fs_synth_read)(void *buf, int len, off_t offset, diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index edcd51be15..1a19418a8c 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -1,9 +1,7 @@ #ifndef _QEMU_9P_H #define _QEMU_9P_H -#include #include -#include #include #include #include diff --git a/hw/audio/gusemu.h b/hw/audio/gusemu.h index 331bb6fec0..b7f0751268 100644 --- a/hw/audio/gusemu.h +++ b/hw/audio/gusemu.h @@ -34,7 +34,6 @@ typedef signed char GUSchar; typedef signed short GUSsample; #else - #include typedef int8_t GUSchar; typedef uint8_t GUSbyte; typedef uint16_t GUSword; diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 40ba6a4207..bdb43a5a34 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -25,7 +25,6 @@ #define HW_VGA_INT_H 1 #include -#include "qapi/error.h" #include "exec/memory.h" #define ST01_V_RETRACE 0x08 diff --git a/hw/net/fsl_etsec/registers.h b/hw/net/fsl_etsec/registers.h index 7ad7686470..6fb96842b8 100644 --- a/hw/net/fsl_etsec/registers.h +++ b/hw/net/fsl_etsec/registers.h @@ -24,7 +24,6 @@ #ifndef _ETSEC_REGISTERS_H_ #define _ETSEC_REGISTERS_H_ -#include enum eTSEC_Register_Access_Type { ACC_RW = 1, /* Read/Write */ diff --git a/hw/usb/desc.h b/hw/usb/desc.h index 8e8db03a0c..4d81c68e0e 100644 --- a/hw/usb/desc.h +++ b/hw/usb/desc.h @@ -1,7 +1,6 @@ #ifndef QEMU_HW_USB_DESC_H #define QEMU_HW_USB_DESC_H -#include #include /* binary representation */ diff --git a/io/channel-util.c b/io/channel-util.c index f96907cb5c..0fb4bd0837 100644 --- a/io/channel-util.c +++ b/io/channel-util.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "io/channel-util.h" #include "io/channel-file.h" #include "io/channel-socket.h" diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h index bb9ac6554e..7e114eee8a 100644 --- a/linux-user/arm/nwfpe/fpa11.h +++ b/linux-user/arm/nwfpe/fpa11.h @@ -21,9 +21,6 @@ #ifndef __FPA11_H__ #define __FPA11_H__ -#include -#include -#include #include diff --git a/linux-user/qemu.h b/linux-user/qemu.h index bd90cc3799..ba5b433d99 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -1,15 +1,12 @@ #ifndef QEMU_H #define QEMU_H -#include -#include #include "cpu.h" #include "exec/cpu_ldst.h" #undef DEBUG_REMAP #ifdef DEBUG_REMAP -#include #endif /* DEBUG_REMAP */ #include "exec/user/abitypes.h" diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index db6ab65ced..d09b4ee308 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -16,16 +16,12 @@ #include "qemu/coroutine.h" #include "qemu/iov.h" -#include -#include #ifndef _WIN32 #include #endif #if defined(__sun__) || defined(__HAIKU__) #include #endif -#include -#include #ifdef __linux__ #include diff --git a/net/tap-linux.h b/net/tap-linux.h index 01dc6f8a2d..1dc3a9f279 100644 --- a/net/tap-linux.h +++ b/net/tap-linux.h @@ -16,7 +16,6 @@ #ifndef QEMU_TAP_LINUX_H #define QEMU_TAP_LINUX_H -#include #ifdef __linux__ #include diff --git a/net/util.h b/net/util.h index 10c7da95f0..60b73d372d 100644 --- a/net/util.h +++ b/net/util.h @@ -25,7 +25,6 @@ #ifndef QEMU_NET_UTIL_H #define QEMU_NET_UTIL_H -#include int net_parse_macaddr(uint8_t *macaddr, const char *p); diff --git a/qemu-nbd.c b/qemu-nbd.c index efc427c4f4..5fe94d0e7b 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -31,8 +31,6 @@ #include "io/channel-socket.h" #include -#include -#include #include #include diff --git a/qga/vss-win32.h b/qga/vss-win32.h index 298927dfa5..4d1d15081e 100644 --- a/qga/vss-win32.h +++ b/qga/vss-win32.h @@ -13,7 +13,6 @@ #ifndef VSS_WIN32_H #define VSS_WIN32_H -#include "qapi/error.h" bool vss_init(bool init_requester); void vss_deinit(bool deinit_requester); diff --git a/qga/vss-win32/requester.h b/qga/vss-win32/requester.h index c3093cf4b6..ad2bf3df61 100644 --- a/qga/vss-win32/requester.h +++ b/qga/vss-win32/requester.h @@ -14,7 +14,6 @@ #define VSS_WIN32_REQUESTER_H #include /* STDAPI */ -#include "qemu/compiler.h" #ifdef __cplusplus extern "C" { diff --git a/qga/vss-win32/vss-common.h b/qga/vss-win32/vss-common.h index ce14e14290..91dae0c38d 100644 --- a/qga/vss-win32/vss-common.h +++ b/qga/vss-win32/vss-common.h @@ -14,7 +14,6 @@ #define VSS_WIN32_H #define __MIDL_user_allocate_free_DEFINED__ -#include "config-host.h" #include #include diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 77e0d292c7..5438ebdb9c 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -12,7 +12,6 @@ * */ -#include enum ReplayEvents { /* for instruction event */ diff --git a/slirp/slirp.h b/slirp/slirp.h index 239fe2917a..07c13b4725 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -1,11 +1,9 @@ #ifndef __COMMON_H__ #define __COMMON_H__ -#include "config-host.h" #include "slirp_config.h" #ifdef _WIN32 -# include typedef char *caddr_t; @@ -23,43 +21,31 @@ typedef char *caddr_t; # endif #endif -#include #ifdef HAVE_SYS_BITYPES_H # include #endif -#include #ifdef HAVE_UNISTD_H -# include #endif #ifdef HAVE_STDLIB_H -# include #endif -#include -#include #ifndef HAVE_MEMMOVE #define memmove(x, y, z) bcopy(y, x, z) #endif #if TIME_WITH_SYS_TIME -# include -# include #else # ifdef HAVE_SYS_TIME_H -# include # else -# include # endif #endif #ifdef HAVE_STRING_H -# include #else -# include #endif #ifndef _WIN32 @@ -82,11 +68,9 @@ void *malloc(size_t arg); void free(void *ptr); #endif -#include #ifndef NO_UNIX_SOCKETS #include #endif -#include #ifdef HAVE_SYS_SIGNAL_H # include #endif @@ -115,12 +99,10 @@ void free(void *ptr); #endif #ifdef __STDC__ -#include #else #include #endif -#include /* Avoid conflicting with the libc insque() and remque(), which have different prototypes. */ diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index bcd8076abb..420f2a53fe 100644 --- a/target-alpha/cpu.h +++ b/target-alpha/cpu.h @@ -20,7 +20,6 @@ #if !defined (__CPU_ALPHA_H__) #define __CPU_ALPHA_H__ -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 64 diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 16238216f4..3cbda73578 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -19,7 +19,6 @@ #ifndef CPU_ARM_H #define CPU_ARM_H -#include "config.h" #include "kvm-consts.h" diff --git a/target-arm/kvm-consts.h b/target-arm/kvm-consts.h index 943bf8980a..a2c9518592 100644 --- a/target-arm/kvm-consts.h +++ b/target-arm/kvm-consts.h @@ -15,7 +15,6 @@ #define ARM_KVM_CONSTS_H #ifdef CONFIG_KVM -#include "qemu/compiler.h" #include #include diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 32204607ca..415cf91436 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -20,7 +20,6 @@ #ifndef CPU_CRIS_H #define CPU_CRIS_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index 5f9d960b25..cb750176c0 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -22,7 +22,6 @@ #include "qom/cpu.h" #include "cpu.h" -#include "qapi/error.h" #include "qemu/notify.h" #ifdef TARGET_X86_64 diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 94cb4db27d..7febc3f5ec 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -19,7 +19,6 @@ #ifndef CPU_I386_H #define CPU_I386_H -#include "config.h" #include "qemu-common.h" #include "standard-headers/asm-x86/hyperv.h" diff --git a/target-i386/mpx_helper.c b/target-i386/mpx_helper.c index 1bf717af05..052a69c52f 100644 --- a/target-i386/mpx_helper.c +++ b/target-i386/mpx_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h index 2b7620c7da..f220fc0bb9 100644 --- a/target-lm32/cpu.h +++ b/target-lm32/cpu.h @@ -24,7 +24,6 @@ #define CPUArchState struct CPULM32State -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" struct CPULM32State; diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 224c16967c..48b4c872fc 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -24,7 +24,6 @@ #define CPUArchState struct CPUM68KState -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 6b212ab7f0..2f7335eaa7 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -19,7 +19,6 @@ #ifndef CPU_MICROBLAZE_H #define CPU_MICROBLAZE_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target-mips/cpu.h b/target-mips/cpu.h index 86b6333634..bd23c2a054 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -7,7 +7,6 @@ #define CPUArchState struct CPUMIPSState -#include "config.h" #include "qemu-common.h" #include "mips-defs.h" #include "exec/cpu-defs.h" diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h index a612744011..4ee207796c 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -19,7 +19,6 @@ #ifndef _CPU_MOXIE_H #define _CPU_MOXIE_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h index eb71607395..4b63f25804 100644 --- a/target-openrisc/cpu.h +++ b/target-openrisc/cpu.h @@ -27,7 +27,6 @@ /* cpu_openrisc_map_address_* in CPUOpenRISCTLBContext need this decl. */ struct OpenRISCCPU; -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" #include "fpu/softfloat.h" diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 892f4dc949..2b10597fa9 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -19,7 +19,6 @@ #if !defined (__CPU_PPC_H__) #define __CPU_PPC_H__ -#include "config.h" #include "qemu-common.h" //#define PPC_EMULATE_32BITS_HYPV diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 06ca60b25f..6ae5699e0b 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -22,7 +22,6 @@ #ifndef CPU_S390X_H #define CPU_S390X_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 64 diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 5b022c5973..3b23e967bb 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -19,7 +19,6 @@ #ifndef _CPU_SH4_H #define _CPU_SH4_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 58ff4743b4..dc46122758 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -1,7 +1,6 @@ #ifndef CPU_SPARC_H #define CPU_SPARC_H -#include "config.h" #include "qemu-common.h" #include "qemu/bswap.h" diff --git a/target-tilegx/cpu.h b/target-tilegx/cpu.h index 03df107a67..022cad186a 100644 --- a/target-tilegx/cpu.h +++ b/target-tilegx/cpu.h @@ -19,7 +19,6 @@ #ifndef CPU_TILEGX_H #define CPU_TILEGX_H -#include "config.h" #include "qemu-common.h" #define TARGET_LONG_BITS 64 diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h index 20a12f3a40..be6f12170d 100644 --- a/target-tricore/cpu.h +++ b/target-tricore/cpu.h @@ -20,7 +20,6 @@ #define __TRICORE_CPU_H__ #include "tricore-defs.h" -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" #include "fpu/softfloat.h" diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h index 01c370c30d..9c1fbf9b77 100644 --- a/target-unicore32/cpu.h +++ b/target-unicore32/cpu.h @@ -19,7 +19,6 @@ #define CPUArchState struct CPUUniCore32State -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" #include "fpu/softfloat.h" diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index 15ce0107d6..d0bd9dada8 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -33,7 +33,6 @@ #define CPUArchState struct CPUXtensaState -#include "config.h" #include "qemu-common.h" #include "exec/cpu-defs.h" #include "fpu/softfloat.h" diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index 77e5952781..3942f9cccf 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -40,7 +40,6 @@ #if !defined(TCG_TARGET_H) #define TCG_TARGET_H -#include "config-host.h" #define TCG_TARGET_INTERPRETER 1 #define TCG_TARGET_INSN_UNIT_SIZE 1 diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h index 69dc4d7ca9..71dd7a6e5a 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -25,9 +25,6 @@ * THE SOFTWARE. */ -#include -#include -#include #include "libqos/libqos.h" #include "libqos/pci.h" #include "libqos/malloc-pc.h" diff --git a/tests/libqos/fw_cfg.h b/tests/libqos/fw_cfg.h index 61b1548b4e..e8371b2317 100644 --- a/tests/libqos/fw_cfg.h +++ b/tests/libqos/fw_cfg.h @@ -13,8 +13,6 @@ #ifndef LIBQOS_FW_CFG_H #define LIBQOS_FW_CFG_H -#include -#include typedef struct QFWCFG QFWCFG; diff --git a/tests/libqos/i2c.h b/tests/libqos/i2c.h index c21f1dcbd5..6e648f922a 100644 --- a/tests/libqos/i2c.h +++ b/tests/libqos/i2c.h @@ -9,7 +9,6 @@ #ifndef LIBQOS_I2C_H #define LIBQOS_I2C_H -#include typedef struct I2CAdapter I2CAdapter; struct I2CAdapter { diff --git a/tests/libqos/malloc.h b/tests/libqos/malloc.h index 0c6c9b7f30..ae9dac8f61 100644 --- a/tests/libqos/malloc.h +++ b/tests/libqos/malloc.h @@ -13,8 +13,6 @@ #ifndef LIBQOS_MALLOC_H #define LIBQOS_MALLOC_H -#include -#include #include "qemu/queue.h" typedef enum { diff --git a/tests/libqos/pci.h b/tests/libqos/pci.h index dfaee9ec37..c06add8dbf 100644 --- a/tests/libqos/pci.h +++ b/tests/libqos/pci.h @@ -13,7 +13,6 @@ #ifndef LIBQOS_PCI_H #define LIBQOS_PCI_H -#include #include "libqtest.h" #define QPCI_DEVFN(dev, fn) (((dev) << 3) | (fn)) diff --git a/tests/libqtest.h b/tests/libqtest.h index ebdd5bbe53..37f37adbf7 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -17,13 +17,7 @@ #ifndef LIBQTEST_H #define LIBQTEST_H -#include -#include -#include -#include -#include #include "qapi/qmp/qdict.h" -#include "glib-compat.h" typedef struct QTestState QTestState; diff --git a/trace/control-internal.h b/trace/control-internal.h index 07cb1c1685..dcf67f505a 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -10,7 +10,6 @@ #ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H -#include extern TraceEvent trace_events[]; diff --git a/trace/ftrace.h b/trace/ftrace.h index 863e052e90..92372e3caa 100644 --- a/trace/ftrace.h +++ b/trace/ftrace.h @@ -1,7 +1,6 @@ #ifndef TRACE_FTRACE_H #define TRACE_FTRACE_H -#include #define MAX_TRACE_STRLEN 512 diff --git a/trace/simple.h b/trace/simple.h index 8d1a32eba0..1e7de45575 100644 --- a/trace/simple.h +++ b/trace/simple.h @@ -11,9 +11,6 @@ #ifndef TRACE_SIMPLE_H #define TRACE_SIMPLE_H -#include -#include -#include #include "trace/generated-events.h" diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h index d02f0236c1..1bd4318f53 100644 --- a/ui/vnc-palette.h +++ b/ui/vnc-palette.h @@ -31,8 +31,6 @@ #include "qapi/qmp/qlist.h" #include "qemu/queue.h" -#include -#include #define VNC_PALETTE_HASH_SIZE 256 #define VNC_PALETTE_MAX_SIZE 256 diff --git a/ui/vnc.h b/ui/vnc.h index a95cc15678..81a326116b 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -38,7 +38,6 @@ #include "io/channel-socket.h" #include "io/channel-tls.h" #include -#include #include "keymaps.h" #include "vnc-palette.h"