clean-up: removed duplicate #includes

Some files contain multiple #includes of the same header file.
Removed most of those unnecessary duplicate entries using
scripts/clean-includes.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Anand J <anand.indukala@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/accel.c b/accel.c
index 403eb5e94d585cf606d99cf9e5155d585633aa9e..664bb88422a4babeaaa47416d64e8bba6f143172 100644 (file)
--- a/accel.c
+++ b/accel.c
@@ -33,7 +33,6 @@
 #include "sysemu/qtest.h"
 #include "hw/xen/xen.h"
 #include "qom/object.h"
-#include "hw/boards.h"
 
 int tcg_tb_size;
 static bool tcg_allowed = true;

diff --git a/cputlb.c b/cputlb.c
index cc4da4d7ebc943752b214c72a493f5b25f96ed17..813279f3bca8b7dc8517d180667d2a4178a24092 100644 (file)
--- a/cputlb.c
+++ b/cputlb.c
@@ -26,7 +26,6 @@
 #include "exec/cputlb.h"
 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg.h"
 #include "qemu/error-report.h"
 #include "exec/log.h"

diff --git a/gdbstub.c b/gdbstub.c
index b2e1b79ca35b2d3e8a78524e4fdcd5041a542051..de62d2609647ec52dd1aaef0e6eab87bfc69fe1d 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -31,7 +31,6 @@
 
 #define MAX_PACKET_LENGTH 4096
 
-#include "cpu.h"
 #include "qemu/sockets.h"
 #include "sysemu/kvm.h"
 #include "exec/semihost.h"

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 93be96f89cf4ba25add53a66f79df340cd4d2076..5cd1da9a8778614c26c3f3c1d5089289c41d5422 100644 (file)
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -53,7 +53,6 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/pci-host/q35.h"
 #include "hw/i386/x86-iommu.h"
-#include "hw/timer/hpet.h"
 
 #include "hw/acpi/aml-build.h"
 

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 9eebb1a521ae99500343c801169152a9d26b54a2..1834d22a61f1c92f4d20874298009a21247b86a4 100644 (file)
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -30,7 +30,6 @@
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
-#include "qemu-common.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"
 #include "hw/loader.h"

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index cf9bd3eb45e1665ccaeda7b1f7e56272ede956ee..cf48f420ccff94062ae4f9d302c653b352b7c220 100644 (file)
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -47,7 +47,6 @@
 #include "elf.h"
 #include "hw/timer/mc146818rtc.h"
 #include "hw/timer/i8254.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 #include "hw/sysbus.h"             /* SysBusDevice */

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 92aa5639294e7bbba7b61d488a7e271a6dce2704..1f0c3e9910537f861d9da5a06dd7fa8280fe6019 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -29,7 +29,6 @@
 #include "hw/isa/isa.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/sysbus.h"
-#include "hw/boards.h"
 #include "trace.h"
 #include "qemu/error-report.h"
 #include "qemu/config-file.h"

diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index 1cc598f7e96d13dc443a5aca5aa1f351053859ba..6ac187fa32a97c0d62747ca9dd12e0bef01831b7 100644 (file)
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -15,7 +15,6 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
-#include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/i386/pc.h"
 #include "qemu/range.h"

diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 4b2f07aecb98cde5e3da335e3d7ec80eb4ea6830..d01798f245c2cfcc948099b17cd9cc53744fad98 100644 (file)
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -37,7 +37,6 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "hw/loader.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 486f57d6f6555da2ddb35537492e3821808305cd..17d5d6d7e635b2d5d576a1640db6d024875ac700 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -37,7 +37,6 @@
 #include "sysemu/block-backend.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"
-#include "sysemu/device_tree.h"
 #include "kvm_ppc.h"
 #include "migration/migration.h"
 #include "mmu-hash64.h"

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 712d1aece5a0ba6961357e9551378c363b8c31b7..4ed96e970a78865923c66ee4cabbd7dc01e01cda 100644 (file)
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -26,7 +26,6 @@
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
-#include "qemu/timer.h"
 #include "qemu/main-loop.h"
 
 #include "trace.h"

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 381e7266eada32db0e6938dc5a7ddd10b0035ca5..a6440fef917bab50ec9b6263270b4cd5f1808cc9 100644 (file)
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -34,7 +34,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
-#include "sysemu/tpm_backend.h"
 
 #define DEBUG_TIS 0
 

diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 31cd171016a8ab11db9a780204469366d357f427..032078fd3ebf1521c392bf58ec58149134f66f33 100644 (file)
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -13,7 +13,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "elf.h"
 #include "exec/address-spaces.h"

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 58d95fffb26e0e50067f8d61f0599bbe3880f6fa..9cb0f50750aa00b7cedb745c5226a068fbb0d535 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -17,7 +17,6 @@
 #include <sys/statvfs.h>
 #ifdef CONFIG_INOTIFY1
 #include <sys/inotify.h>
-#include "qapi/error.h"
 #include "qemu/main-loop.h"
 #endif
 

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 17fff80c8a7dda1bd06ec285bea01c22062d18c9..98dc7722c398dd217db6a649801ba153b576e332 100644 (file)
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -13,7 +13,6 @@
 #include "qemu/bitmap.h"
 #include "sysemu/sysemu.h"
 #include "hw/pci/pci.h"
-#include "hw/boards.h"
 #include "hw/compat.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/mem/nvdimm.h"

diff --git a/monitor.c b/monitor.c
index c4b6e26b6142f2c3d8329f3030d81a64af7b998b..7b963ad1ad62d5d5651539669c8c24cd2ca13086 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -59,7 +59,6 @@
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/json-parser.h"
 #include "qom/object_interfaces.h"
-#include "cpu.h"
 #include "trace.h"
 #include "trace/control.h"
 #include "monitor/hmp-target.h"
@@ -76,7 +75,6 @@
 #include "qapi/qmp-event.h"
 #include "qapi-event.h"
 #include "qmp-introspect.h"
-#include "sysemu/block-backend.h"
 #include "sysemu/qtest.h"
 #include "qemu/cutils.h"
 #include "qapi/qmp/dispatch.h"

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 3a3838a079fb47f457463061066f9a6e84ba6ed6..e0249e282e83343c07e5c2e982fee445d55a8324 100644 (file)
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -18,7 +18,6 @@
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/timer.h"
-#include "sysemu/block-backend.h"
 #include "qemu/cutils.h"
 
 #define CMD_NOFILE_OK   0x01

diff --git a/qmp.c b/qmp.c
index a06cb7ba62863e10efb01a37b1e8e51127a93578..0028f0b30e1900c271826b3ff8e4c6f1a9947b54 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -36,7 +36,6 @@
 #include "qom/object_interfaces.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/acpi/acpi_dev_interface.h"
-#include "qemu/uuid.h"
 
 NameInfo *qmp_query_name(Error **errp)
 {

diff --git a/target-i386/machine.c b/target-i386/machine.c
index 71c0e4dc4711d67dd627c9808d37173316d104bb..48037f1575c671c17d2128682a45a4a45c202859 100644 (file)
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -7,10 +7,7 @@
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "migration/cpu.h"
-#include "exec/exec-all.h"
 
-#include "cpu.h"
-#include "exec/exec-all.h"
 #include "sysemu/kvm.h"
 
 #include "qemu/error-report.h"

diff --git a/target-mips/machine.c b/target-mips/machine.c
index a27f2f156da9d901dbcb87b56f84a86f241b09b7..d20d94845772a57b52f3047c272dc81f7f75a7f3 100644 (file)
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -2,7 +2,6 @@
 #include "qemu-common.h"
 #include "cpu.h"
 #include "hw/hw.h"
-#include "cpu.h"
 #include "migration/cpu.h"
 
 static int cpu_post_load(void *opaque, int version_id)

diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index 4820f22377e226da551bb265c7d16f7b8262b254..e43cb6c39d15ad1dea223a3109acb80abe8aaa0a 100644 (file)
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -8,7 +8,6 @@
 #include "helper_regs.h"
 #include "mmu-hash64.h"
 #include "migration/cpu.h"
-#include "exec/exec-all.h"
 
 static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
 {

diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
index 6548715831b7d3a6d9dea2580eb1c86004ba0f6c..1ab8a6eab4ee2e56789ca8ddfb8ec2a68bd7326a 100644 (file)
--- a/target-ppc/mem_helper.c
+++ b/target-ppc/mem_helper.c
@@ -23,7 +23,6 @@
 #include "exec/helper-proto.h"
 
 #include "helper_regs.h"
-#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 //#define DEBUG_OP

diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index 59c92f75828588d34a4d837d26e432d230c28eac..aea63978611b77d3ef3eb44463e22b5f0ea351ca 100644 (file)
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -6,10 +6,7 @@
 #include "hw/boards.h"
 #include "qemu/timer.h"
 
-#include "cpu.h"
-#include "exec/exec-all.h"
 #include "migration/cpu.h"
-#include "exec/exec-all.h"
 
 #ifdef TARGET_SPARC64
 static const VMStateDescription vmstate_cpu_timer = {

diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index 4c1e48748b794f7de0aa2eb54f34aab747eb81b8..fb0fa56f1eee0f1f10549070d08e48953dffc73b 100644 (file)
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -36,7 +36,6 @@
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
-#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/semihost.h"
 

diff --git a/tests/crypto-tls-x509-helpers.h b/tests/crypto-tls-x509-helpers.h
index a8faa92bc07c3fc4ec99a877c5310cab0adc5ee8..921341c649de918eef1ebff48c5dc33890c0790e 100644 (file)
--- a/tests/crypto-tls-x509-helpers.h
+++ b/tests/crypto-tls-x509-helpers.h
@@ -21,9 +21,6 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
-
 #if !(defined WIN32) && \
     defined(CONFIG_TASN1) && \
     (LIBGNUTLS_VERSION_NUMBER >= 0x020600)

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index a7f06291cb11b63fdf9eafb3639be382218bdc5a..8b10afbf102a2312213b598559a695f71389a13c 100644 (file)
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -22,8 +22,6 @@
 #include "libqos/virtio-pci.h"
 #include "qapi/error.h"
 
-#include "libqos/pci-pc.h"
-#include "libqos/virtio-pci.h"
 #include "libqos/malloc-pc.h"
 #include "hw/virtio/virtio-net.h"
 

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 8ec99ccb4f0649fb8e55c4f0315bd7c13b71fc3a..67c65893a4fef130e9e2389fe4c6f79cd5b74aeb 100644 (file)
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -28,7 +28,6 @@
 
 #include "qemu/osdep.h"
 #include <termios.h>
-#include <termios.h>
 
 #include <glib/gprintf.h>
 

diff --git a/vl.c b/vl.c
index 496e65525b959de344e5d1c02c5d46f9f27557a6..55763f7084a5f154b89409845662103b48083500 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -110,7 +110,6 @@ int main(int argc, char **argv)
 #include "trace.h"
 #include "trace/control.h"
 #include "qemu/queue.h"
-#include "sysemu/cpus.h"
 #include "sysemu/arch_init.h"
 
 #include "ui/qemu-spice.h"