remove some double-includes

Some source files #include the same header more than
once for no good reason.  Remove second #includes in
such cases.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
index 58690524c474ca69c2557f52279e7e167bcf9b95..e1324056a47949e5442e2300b597b8a560d3b9e2 100644 (file)
--- a/audio/audio_win_int.c
+++ b/audio/audio_win_int.c
@@ -1,7 +1,6 @@
 /* public domain */
 
 #include "qemu-common.h"
-#include "audio.h"
 
 #define AUDIO_CAP "win-int"
 #include <windows.h>

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 0fd9465cfad691120fe29e870382ae995c5badca..4405dbd3bd9e0bdf26b7da435012c6c8da28d598 100644 (file)
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -24,7 +24,6 @@
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
-#include "hw/sysbus.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index de06dfd7d2e397bc46840ed897121433767f4426..c5d88a7841921e528ccd7031092c668912f05193 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -12,7 +12,6 @@
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
-#include "hw/sysbus.h"
 #include "audio/audio.h"
 
 #define MP_AUDIO_SIZE           0x00001000

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 9d521ccb1921a25a6b8e476ee9e3550af5f14e19..5033d51224cd4a1a14db057da50a9443492857f1 100644 (file)
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -37,7 +37,6 @@
 #include "sysemu/char.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
-#include "hw/boards.h"
 #include "qemu/log.h"
 #include "hw/mips/bios.h"
 #include "hw/ide.h"

diff --git a/hw/misc/lm32_sys.c b/hw/misc/lm32_sys.c
index 33a3b80ce779410a323dd33b8effa5c50e7e5a9d..aeaf2b7b7b388f691a3647c470325ab31d0cf264 100644 (file)
--- a/hw/misc/lm32_sys.c
+++ b/hw/misc/lm32_sys.c
@@ -34,7 +34,6 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
-#include "qemu/log.h"
 
 enum {
     R_CTRL = 0,

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c96ac8131fd195c50262755c13cf3cbf63e9f78c..218ea23da8e84a3bc4a2110d34c16270ffffaf13 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -43,8 +43,6 @@
 #include "hw/ppc/xics.h"
 #include "hw/pci/msi.h"
 
-#include "sysemu/kvm.h"
-#include "kvm_ppc.h"
 #include "hw/pci/pci.h"
 
 #include "exec/address-spaces.h"

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index f518aee21661be914300d86e8e0432f6b1e2ac90..8f0b7e8076e053274058bc2e85c7b19d40456241 100644 (file)
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1,6 +1,5 @@
 #include "sysemu/sysemu.h"
 #include "cpu.h"
-#include "sysemu/sysemu.h"
 #include "helper_regs.h"
 #include "hw/ppc/spapr.h"
 #include "mmu-hash64.h"

diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c
index bceee44cb26aa9d009a1718006b3b2483495f529..3ac77f9262ddfc51050abc05b61c28574ea4254e 100644 (file)
--- a/hw/timer/exynos4210_rtc.c
+++ b/hw/timer/exynos4210_rtc.c
@@ -31,7 +31,6 @@
 #include "hw/ptimer.h"
 
 #include "hw/hw.h"
-#include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 
 #include "hw/arm/exynos4210.h"

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 2bd7090248d7fe1cafe0e105af9d10b8fee875a5..740cf4976381e114b75251baa539e10cdd4f6b58 100644 (file)
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -7,7 +7,6 @@
 #include "hw/isa/isa.h"
 #include "hw/block/fdc.h"
 #include "net/net.h"
-#include "exec/memory.h"
 #include "hw/i386/ioapic.h"
 
 /* PC-style peripherals (also used by other machines).  */

diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h
index 382f04c3c4a50d55055fe0dd16a09e0ace3a6a48..6cc4831df3edbdcbdae6614ad5c5ddb275923c4a 100644 (file)
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -15,7 +15,6 @@
 
 #include "qapi/qmp/qobject.h"
 #include "qemu/queue.h"
-#include "qemu/queue.h"
 
 typedef struct QListEntry {
     QObject *value;

diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h
index ccfccae2b4ff7c5383294d8400eebf4be03b4997..ad4a9e5c3ab7f2d4239924fd211ab07da2a4d126 100644 (file)
--- a/include/qemu/config-file.h
+++ b/include/qemu/config-file.h
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include "qemu/option.h"
 #include "qapi/error.h"
-#include "qemu/option.h"
 
 QemuOptsList *qemu_find_opts(const char *group);
 QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);

diff --git a/monitor.c b/monitor.c
index 62aaebe660eeb2fc4e737b3d721f97829e2c69e7..6ce2a4e61b95040ea334fca31e5af0cacf6ba3e8 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -63,7 +63,6 @@
 #ifdef CONFIG_TRACE_SIMPLE
 #include "trace/simple.h"
 #endif
-#include "ui/qemu-spice.h"
 #include "exec/memory.h"
 #include "qmp-commands.h"
 #include "hmp.h"

diff --git a/page_cache.c b/page_cache.c
index 938a79c9ea7999b4a46a639c35ff27bc639e6892..a05db643ccd711b3cccaf68a6d042f095a6fa247 100644 (file)
--- a/page_cache.c
+++ b/page_cache.c
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 #include <stdbool.h>
 #include <glib.h>
-#include <strings.h>
 
 #include "qemu-common.h"
 #include "migration/page_cache.h"

diff --git a/slirp/misc.c b/slirp/misc.c
index 8ecced547f3cf2c002dfa7d2f4ac0943864d2ec2..0bcc48193947a474f39fe413500c97d1582f54e4 100644 (file)
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -242,8 +242,6 @@ strdup(str)
 }
 #endif
 
-#include "monitor/monitor.h"
-
 void lprint(const char *format, ...)
 {
     va_list args;

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 725071e6a730dac8cb7686816399ccaeb013d1b1..3ab2946cfb75228ade17717d420c6b003b3d8d9b 100644 (file)
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -30,8 +30,6 @@
 #include "cpu.h"
 #include "sysemu/cpus.h"
 #include "sysemu/device_tree.h"
-#include "hw/sysbus.h"
-#include "hw/ppc/spapr.h"
 #include "mmu-hash64.h"
 
 #include "hw/sysbus.h"

diff --git a/tests/tcg/linux-test.c b/tests/tcg/linux-test.c
index 83cb32ddb91266c4322c8f00d564647e443fca88..1c6c01318ecf95a16070671baf66a772f9fb11a2 100644 (file)
--- a/tests/tcg/linux-test.c
+++ b/tests/tcg/linux-test.c
@@ -39,7 +39,6 @@
 #include <dirent.h>
 #include <setjmp.h>
 #include <sys/shm.h>
-#include <sched.h>
 
 #define TESTPATH "/tmp/linux-test.tmp"
 #define TESTPORT 7654