include: 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.

NB: If this commit breaks compilation for your out-of-tree
patchseries or fork, then you need to make sure you add
#include "qemu/osdep.h" to any new .c files that you have.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>

diff --git a/include/block/accounting.h b/include/block/accounting.h
index 0f46cb4ec122590675b7a9261b39b74ec40cfa96..2db2a009a1adde34a5776248aafafbee54508a1c 100644 (file)
--- a/include/block/accounting.h
+++ b/include/block/accounting.h
@@ -25,8 +25,6 @@
 #ifndef BLOCK_ACCOUNTING_H
 #define BLOCK_ACCOUNTING_H
 
-#include <stdint.h>
-#include <stdbool.h>
 
 #include "qemu/typedefs.h"
 #include "qemu/timed-average.h"

diff --git a/include/block/nbd.h b/include/block/nbd.h
index b197adca1c2b758dddb6171d6e3983f161d07ec1..b86a9769840a0d8656316cdb423fa56de69ab6e1 100644 (file)
--- a/include/block/nbd.h
+++ b/include/block/nbd.h
@@ -19,7 +19,6 @@
 #ifndef NBD_H
 #define NBD_H
 
-#include <sys/types.h>
 
 #include "qemu-common.h"
 #include "qemu/option.h"

diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index c6910da63a43ae1983f2103795a0f96b7982c090..e5c055311557e86f219503d629be4b88c94e1fe5 100644 (file)
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -26,7 +26,6 @@
 #define SNAPSHOT_H
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qemu/option.h"
 
 

diff --git a/include/block/write-threshold.h b/include/block/write-threshold.h
index f1b899cd5f5ff4061fe11e16c8ac66dfd31195a4..8a79505ada920caea26ed0fb9bd0f34395dd2221 100644 (file)
--- a/include/block/write-threshold.h
+++ b/include/block/write-threshold.h
@@ -12,7 +12,6 @@
 #ifndef BLOCK_WRITE_THRESHOLD_H
 #define BLOCK_WRITE_THRESHOLD_H
 
-#include <stdint.h>
 
 #include "qemu/typedefs.h"
 #include "qemu-common.h"

diff --git a/include/config.h b/include/config.h
index e20f78696a1b7c8c0c3b4d6b7b6c1c9dbdfad427..992d761053137ba23ee2160a7a9fbbdfa72d4b1c 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -1,2 +1 @@
-#include "config-host.h"
 #include "config-target.h"

diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h
index f90ac7956747213bc324b91e95f0573bab630f0b..c04c3ac9b9b50a19d0e8a793f9915790bf6cf29c 100644 (file)
--- a/include/crypto/cipher.h
+++ b/include/crypto/cipher.h
@@ -22,7 +22,6 @@
 #define QCRYPTO_CIPHER_H__
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 
 typedef struct QCryptoCipher QCryptoCipher;
 

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index 5e8d9a1372e1c69f5118bd27fde78d46bce1cce5..aebccd138663da99aa7972680820da1eb85998fd 100644 (file)
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -22,7 +22,6 @@
 #define QCRYPTO_HASH_H__
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 
 /* See also "QCryptoHashAlgorithm" defined in qapi/crypto.json */
 

diff --git a/include/crypto/init.h b/include/crypto/init.h
index 5fc510c4f8aa9df5f153a8bf68cb05b17ea11d90..4836a37e3f9fa43f2221e9e7e5ffc066b1f3fdaf 100644 (file)
--- a/include/crypto/init.h
+++ b/include/crypto/init.h
@@ -22,7 +22,6 @@
 #define QCRYPTO_INIT_H__
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 
 int qcrypto_init(Error **errp);
 

diff --git a/include/crypto/secret.h b/include/crypto/secret.h
index 913519ae278257b3de7152ffed64be6c542df6cb..60f2a502b78556a9890e6a161fa08d3bc1d16f8c 100644 (file)
--- a/include/crypto/secret.h
+++ b/include/crypto/secret.h
@@ -22,7 +22,6 @@
 #define QCRYPTO_SECRET_H__
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qom/object.h"
 
 #define TYPE_QCRYPTO_SECRET "secret"

diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index 21761b7ce14c2c05215bb7226b485d6b895a1e01..4bf1d2e255ae954e980a09e2490f13a0db3d74f4 100644 (file)
--- a/include/crypto/tlscreds.h
+++ b/include/crypto/tlscreds.h
@@ -22,7 +22,6 @@
 #define QCRYPTO_TLSCRED_H__
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qom/object.h"
 
 #ifdef CONFIG_GNUTLS

diff --git a/include/elf.h b/include/elf.h
index 1098d217ec7ff24b26885aa9589027cb913e20ea..28d448bbcc3d6d817aaa60d6a5e9b53ff7fe4d77 100644 (file)
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,7 +1,6 @@
 #ifndef _QEMU_ELF_H
 #define _QEMU_ELF_H
 
-#include <inttypes.h>
 
 /* 32-bit ELF base types. */
 typedef uint32_t Elf32_Addr;

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 83b1781afc132cc8ab3f8bd76f422c36ce4625a2..08e5093d0ee5ef1324749fae53dae58b64626b4c 100644 (file)
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -154,7 +154,6 @@ static inline void tswap64s(uint64_t *s)
 /* MMU memory access macros */
 
 #if defined(CONFIG_USER_ONLY)
-#include <assert.h>
 #include "exec/user/abitypes.h"
 
 /* On some host systems the guest address space is reserved on the host.

diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index 5093be26ac9a5477f091192f5fb40d72bddd12e6..854e7e3566e135371dbd1096c0cf61630dc21504 100644 (file)
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -23,9 +23,6 @@
 #error cpu.h included from common code
 #endif
 
-#include "config.h"
-#include <inttypes.h>
-#include "qemu/osdep.h"
 #include "qemu/queue.h"
 #include "tcg-target.h"
 #ifndef CONFIG_USER_ONLY

diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h
index b009ccb11aaaac27456f1efedbdf91209d33dfbc..ec790432d51397bd101b28e6f6e63e57b425618e 100644 (file)
--- a/include/exec/helper-head.h
+++ b/include/exec/helper-head.h
@@ -18,7 +18,6 @@
 #ifndef DEF_HELPER_H
 #define DEF_HELPER_H 1
 
-#include "qemu/osdep.h"
 
 #define HELPER(name) glue(helper_, name)
 

diff --git a/include/exec/memory.h b/include/exec/memory.h
index c92734ae2bf853cc4a3d060348b5dfb4eb6a3257..d5f2b2ce6ffa3a0ed48c197686f8cf91837f3ef7 100644 (file)
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -21,8 +21,6 @@
 #define DIRTY_MEMORY_MIGRATION 2
 #define DIRTY_MEMORY_NUM       3        /* num of dirty bits */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "exec/cpu-common.h"
 #ifndef CONFIG_USER_ONLY
 #include "exec/hwaddr.h"
@@ -31,7 +29,6 @@
 #include "qemu/queue.h"
 #include "qemu/int128.h"
 #include "qemu/notify.h"
-#include "qapi/error.h"
 #include "qom/object.h"
 #include "qemu/rcu.h"
 

diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index 3b6746272664d266847a3c2501ad7f34ea89c5b7..ad1d60266e1a7563332324918c7fea9d3cb2204a 100644 (file)
--- a/include/exec/user/thunk.h
+++ b/include/exec/user/thunk.h
@@ -19,7 +19,6 @@
 #ifndef THUNK_H
 #define THUNK_H
 
-#include <inttypes.h>
 #include "cpu.h"
 
 /* types enums definitions */

diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
index 624ed61661fc5a5b3cd5c9b545f6365ff7314b01..c9370625309fbef41b4ea71567d315b7d44fefb6 100644 (file)
--- a/include/fpu/softfloat.h
+++ b/include/fpu/softfloat.h
@@ -86,9 +86,6 @@ this code that are retained.
 #include <sunmath.h>
 #endif
 
-#include <inttypes.h>
-#include "config-host.h"
-#include "qemu/osdep.h"
 
 /* This 'flag' type must be able to hold at least 0 and 1. It should
  * probably be replaced with 'bool' but the uses would need to be audited

diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index 2de30211f2ce7336963ec328e7f95c45db75c1fe..7462e20fe344697769276793316df10f92d713a3 100644 (file)
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -19,7 +19,6 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include "qapi/error.h"
 #include "qemu/typedefs.h"
 #include "qemu/notify.h"
 #include "qemu/option.h"

diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index aa29d30d1fee7490218e415bc8586e7a561c8b5b..d3e0c8fe8737af3dcbcbacb3918f4f85caec61bd 100644 (file)
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -1,9 +1,7 @@
 #ifndef HW_ACPI_GEN_UTILS_H
 #define HW_ACPI_GEN_UTILS_H
 
-#include <stdint.h>
 #include <glib.h>
-#include "qemu/compiler.h"
 #include "hw/acpi/acpi-defs.h"
 
 /* Reserve RAM space for tables: add another order of magnitude. */

diff --git a/include/hw/acpi/bios-linker-loader.h b/include/hw/acpi/bios-linker-loader.h
index 498c0af7737cba11292a4656c0c0a36524b091ed..721b7b9e250e0d8926f1585ce4664552596e62c2 100644 (file)
--- a/include/hw/acpi/bios-linker-loader.h
+++ b/include/hw/acpi/bios-linker-loader.h
@@ -2,8 +2,6 @@
 #define BIOS_LINKER_LOADER_H
 
 #include <glib.h>
-#include <stdbool.h>
-#include <inttypes.h>
 
 GArray *bios_linker_loader_init(void);
 

diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
index f3526d4aaf493635cc5ee98bea795cac389e2c01..31b7820b6f640222a10243067f60dbb25451dc4d 100644 (file)
--- a/include/hw/acpi/pcihp.h
+++ b/include/hw/acpi/pcihp.h
@@ -27,7 +27,6 @@
 #ifndef HW_ACPI_PCIHP_H
 #define HW_ACPI_PCIHP_H
 
-#include <inttypes.h>
 #include <qemu/typedefs.h>
 #include "hw/acpi/acpi.h"
 #include "migration/vmstate.h"

diff --git a/include/hw/block/block.h b/include/hw/block/block.h
index 8d7c4b413f26edcc2141979e48a813ffccb1c903..984660efd62877bbd9666718141317b4d18bad80 100644 (file)
--- a/include/hw/block/block.h
+++ b/include/hw/block/block.h
@@ -12,7 +12,6 @@
 #define HW_BLOCK_COMMON_H
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 
 /* Configuration */
 

diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
index 148cc1bbc833a32930697102465ce7e7eee2ce26..fc95572394a312b9d4f63554dd9ec0a6556d4c17 100644 (file)
--- a/include/hw/i386/topology.h
+++ b/include/hw/i386/topology.h
@@ -38,8 +38,6 @@
  *  CPUID Fn8000_0008_ECX[ApicIdCoreIdSize[3:0]] is set to apicid_core_width().
  */
 
-#include <stdint.h>
-#include <string.h>
 
 #include "qemu/bitops.h"
 

diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h
index 3edea5f623a93ed9583898a5480b678286192a3c..4839ff1df2522202ff028aa3667396c87d7f82d5 100644 (file)
--- a/include/hw/isa/apm.h
+++ b/include/hw/isa/apm.h
@@ -1,7 +1,6 @@
 #ifndef APM_H
 #define APM_H
 
-#include <stdint.h>
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "exec/memory.h"

diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index 664eaf6452b8bcb8a4671115db3ac37cfdfd3c6c..5d19975df5b95e540c8adc45eb2fe5f8f8d58fed 100644 (file)
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -2,8 +2,6 @@
 #define FW_CFG_H
 
 #ifndef NO_QEMU_PROTOS
-#include <stdint.h>
-#include <stddef.h>
 
 #include "exec/hwaddr.h"
 #include "qemu/typedefs.h"

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index dedf2776278f35e709cec161141d4142a9f49353..0be07c83520e3dc6476d72b1403b2e13a40832f7 100644 (file)
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -6,7 +6,6 @@
 #include "hw/qdev.h"
 #include "exec/memory.h"
 #include "sysemu/dma.h"
-#include "qapi/error.h"
 
 /* PCI includes legacy ISA access.  */
 #include "hw/isa/isa.h"

diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
index 2c871b947b80cbfae2d7808bcc837c052f866d20..b2085543d75b98f1856cc9756ad78fa1636a293e 100644 (file)
--- a/include/hw/pci/shpc.h
+++ b/include/hw/pci/shpc.h
@@ -4,7 +4,6 @@
 #include "qemu-common.h"
 #include "exec/memory.h"
 #include "migration/vmstate.h"
-#include "qapi/error.h"
 #include "hw/hotplug.h"
 #include "hw/pci/pci.h"
 

diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index abcdee852b8dd57a255dc0de43f0c9f85ed63e2a..c3ff99f9759f265e1657be07d64f52a05142fbc3 100644 (file)
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -7,7 +7,6 @@
 #include "qemu/bitmap.h"
 #include "qom/object.h"
 #include "hw/irq.h"
-#include "qapi/error.h"
 #include "hw/hotplug.h"
 
 enum {

diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
index c59cc8191561bf0bf0162084b7b04e499af522b5..d6b012f6be58ffea63bccc3176bfe36cef3e27c2 100644 (file)
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -11,7 +11,6 @@
 #ifndef VHOST_BACKEND_H_
 #define VHOST_BACKEND_H_
 
-#include <stdbool.h>
 
 typedef enum VhostBackendType {
     VHOST_BACKEND_TYPE_NONE = 0,

diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index df334818c1bf9d000430d5082bea18f13aa59d9a..bf3fe9792775b6705bec13ab43673b21e6471a1b 100644 (file)
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -6,7 +6,6 @@
  *   must not depend on any xen headers being present in
  *   /usr/include/xen, so it can be included unconditionally.
  */
-#include <inttypes.h>
 
 #include "hw/irq.h"
 #include "qemu-common.h"

diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 7a3cce0b8ce0d1243877c38e59af5fdca408fe87..bd65e670542903760412b5d94baa11cf45f007d3 100644 (file)
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -1,10 +1,7 @@
 #ifndef QEMU_HW_XEN_COMMON_H
 #define QEMU_HW_XEN_COMMON_H 1
 
-#include "config-host.h"
 
-#include <stddef.h>
-#include <inttypes.h>
 
 /*
  * If we have new enough libxenctrl then we do not want/need these compat

diff --git a/include/io/channel.h b/include/io/channel.h
index 3e17fe7129096500164dce9aa9bc028cde7d25d0..0a1f1ce7fc438ef85e4b083ff485c47feaf79549 100644 (file)
--- a/include/io/channel.h
+++ b/include/io/channel.h
@@ -22,7 +22,6 @@
 #define QIO_CHANNEL_H__
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qom/object.h"
 
 #define TYPE_QIO_CHANNEL "qio-channel"

diff --git a/include/io/task.h b/include/io/task.h
index 2418714156e664a8416cf27ba144c1be9fc17b4a..2e69d8a47f2d1bcd40b2d71863af7135788c749d 100644 (file)
--- a/include/io/task.h
+++ b/include/io/task.h
@@ -22,7 +22,6 @@
 #define QIO_TASK_H__
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qom/object.h"
 
 typedef struct QIOTask QIOTask;

diff --git a/include/libdecnumber/dconfig.h b/include/libdecnumber/dconfig.h
index 2f0455a06ad9f0657d51c4e3fd25c56f30f4584d..0f7dccef1f4ea21a1567c01077b119593d64f4da 100644 (file)
--- a/include/libdecnumber/dconfig.h
+++ b/include/libdecnumber/dconfig.h
@@ -27,7 +27,6 @@
    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-#include "config-host.h"
 
 #if defined(HOST_WORDS_BIGENDIAN)
 #define WORDS_BIGENDIAN 1

diff --git a/include/libdecnumber/decContext.h b/include/libdecnumber/decContext.h
index c3e46f405fa6e2faf3ed9cac862884cadde3176c..01365e2313011e77f09df40e4a7dcacc05f8d9b6 100644 (file)
--- a/include/libdecnumber/decContext.h
+++ b/include/libdecnumber/decContext.h
@@ -56,9 +56,6 @@
   #define DECCFULLNAME "Decimal Context Descriptor"   /* Verbose name */
   #define DECCAUTHOR   "Mike Cowlishaw"                      /* Who to blame */
 
-  #include <stdint.h>
-  #include <stdio.h>              /* for printf, etc.                */
-  #include <signal.h>             /* for traps                       */
 
   /* Extended flags setting -- set this to 0 to use only IEEE flags   */
   #define DECEXTFLAG 1            /* 1=enable extended flags         */

diff --git a/include/libdecnumber/decNumberLocal.h b/include/libdecnumber/decNumberLocal.h
index 71ed77bf21c449dea47b9e4a48ed01bb4a833194..94fb512923fcce4f2757c95ac60c70b930edd562 100644 (file)
--- a/include/libdecnumber/decNumberLocal.h
+++ b/include/libdecnumber/decNumberLocal.h
@@ -42,8 +42,6 @@
   #define DECVERSION   "decNumber 3.53" /* Package Version [16 max.] */
   #define DECNLAUTHOR  "Mike Cowlishaw"              /* Who to blame */
 
-  #include <stdlib.h>        /* for abs                              */
-  #include <string.h>        /* for memset, strcpy                   */
   #include "libdecnumber/dconfig.h"
 
   /* Conditional code flag -- set this to match hardware platform     */

diff --git a/include/migration/migration.h b/include/migration/migration.h
index 74684ad929438fc58498a24d9b0561b7fe980db5..65d47a9627a57711fb343c7c5bdacb4b3cbe6da3 100644 (file)
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -18,7 +18,6 @@
 #include "qemu-common.h"
 #include "qemu/thread.h"
 #include "qemu/notify.h"
-#include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "qapi-types.h"
 #include "exec/cpu-common.h"

diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
index b5d08d217dcd85596d4b953ea92096c43f972136..3f6b4ed5816e16d8ccf0513c90a2827d175c4a05 100644 (file)
--- a/include/migration/qemu-file.h
+++ b/include/migration/qemu-file.h
@@ -25,7 +25,6 @@
 #define QEMU_FILE_H 1
 #include "exec/cpu-common.h"
 
-#include <stdint.h>
 
 /* This function writes a chunk of data to a file at the given position.
  * The pos argument can be ignored if the file is only being used for

diff --git a/include/net/checksum.h b/include/net/checksum.h
index 2d7a363d40009cbca532c0f20da09cb975f4eb99..7de1acb79abf893d1a3be36c726e4e21f70f68e0 100644 (file)
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
@@ -18,7 +18,6 @@
 #ifndef QEMU_NET_CHECKSUM_H
 #define QEMU_NET_CHECKSUM_H
 
-#include <stdint.h>
 struct iovec;
 
 uint32_t net_checksum_add_cont(int len, uint8_t *buf, int seq);

diff --git a/include/net/eth.h b/include/net/eth.h
index 84384febf2af6934e3e05db4409039b75369debc..18d0be3b16eba8cede1175ff58bfcdc1f7ffff5e 100644 (file)
--- a/include/net/eth.h
+++ b/include/net/eth.h
@@ -26,8 +26,6 @@
 #ifndef QEMU_ETH_H
 #define QEMU_ETH_H
 
-#include <sys/types.h>
-#include <string.h>
 #include "qemu/bswap.h"
 #include "qemu/iov.h"
 

diff --git a/include/qapi/error.h b/include/qapi/error.h
index e64fe54cf901f474cab7376fef9257db66f31ef5..02e9dd20a7f8574ab59d765ce867593ec82b9a7a 100644 (file)
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -115,9 +115,6 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include <stdarg.h>
-#include <stdbool.h>
-#include "qemu/compiler.h"
 #include "qapi-types.h"
 
 /*

diff --git a/include/qapi/qmp-event.h b/include/qapi/qmp-event.h
index 8a8ffb5718c83b6bdbcb2c84257887e1b19c8b76..40fe3cbc1253560afb70206a62974f482597abac 100644 (file)
--- a/include/qapi/qmp-event.h
+++ b/include/qapi/qmp-event.h
@@ -14,7 +14,6 @@
 #ifndef QMP_EVENT_H
 #define QMP_EVENT_H
 
-#include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 
 typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp);

diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h
index e389697f190286aa3a49499ab8e5bf0692754718..495520994cb80001c775d8867d6c7c5bdb2b079c 100644 (file)
--- a/include/qapi/qmp/dispatch.h
+++ b/include/qapi/qmp/dispatch.h
@@ -16,7 +16,6 @@
 
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qdict.h"
-#include "qapi/error.h"
 
 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
 

diff --git a/include/qapi/qmp/json-lexer.h b/include/qapi/qmp/json-lexer.h
index cb456d53e5594ad1280b1e991539cce0427034e0..afee7828cd9a32b07119e720a70438363513bb69 100644 (file)
--- a/include/qapi/qmp/json-lexer.h
+++ b/include/qapi/qmp/json-lexer.h
@@ -14,7 +14,6 @@
 #ifndef QEMU_JSON_LEXER_H
 #define QEMU_JSON_LEXER_H
 
-#include "glib-compat.h"
 
 typedef enum json_token_type {
     JSON_MIN = 100,

diff --git a/include/qapi/qmp/json-parser.h b/include/qapi/qmp/json-parser.h
index fea89f873a9fb5faa0955e920388fbef8f7617fe..9987f8ca85083a82c4cfd061570074734c395b12 100644 (file)
--- a/include/qapi/qmp/json-parser.h
+++ b/include/qapi/qmp/json-parser.h
@@ -16,7 +16,6 @@
 
 #include "qemu-common.h"
 #include "qapi/qmp/qlist.h"
-#include "qapi/error.h"
 
 QObject *json_parser_parse(GQueue *tokens, va_list *ap);
 QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp);

diff --git a/include/qapi/qmp/json-streamer.h b/include/qapi/qmp/json-streamer.h
index 09b3d3ec15e89d1eafefb00ecea9c61feb91c471..00d8a23af8085c0c70d354148260e48fd4f9d02a 100644 (file)
--- a/include/qapi/qmp/json-streamer.h
+++ b/include/qapi/qmp/json-streamer.h
@@ -14,8 +14,6 @@
 #ifndef QEMU_JSON_STREAMER_H
 #define QEMU_JSON_STREAMER_H
 
-#include <stdint.h>
-#include "glib-compat.h"
 #include "qapi/qmp/json-lexer.h"
 
 typedef struct JSONToken {

diff --git a/include/qapi/qmp/qbool.h b/include/qapi/qmp/qbool.h
index 836d078866bdf00be53694b10be2dc6a81a67199..a41111c3096f1df01eb6f0651c480ded2ab94aa1 100644 (file)
--- a/include/qapi/qmp/qbool.h
+++ b/include/qapi/qmp/qbool.h
@@ -14,7 +14,6 @@
 #ifndef QBOOL_H
 #define QBOOL_H
 
-#include <stdbool.h>
 #include "qapi/qmp/qobject.h"
 
 typedef struct QBool {

diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index 6c2a0e501ef279bab1d9b5024627e931d3575cb3..71b8eb0416c3c38f364ddc752ac2f362c51d7b0b 100644 (file)
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -16,8 +16,6 @@
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qlist.h"
 #include "qemu/queue.h"
-#include <stdbool.h>
-#include <stdint.h>
 
 #define QDICT_BUCKET_MAX 512
 

diff --git a/include/qapi/qmp/qfloat.h b/include/qapi/qmp/qfloat.h
index a8af2a89b257570bafdfb7dd7373eefcec988ad5..b5d15836b5e3fa2ea590e1bb0c8f97224c5318d5 100644 (file)
--- a/include/qapi/qmp/qfloat.h
+++ b/include/qapi/qmp/qfloat.h
@@ -14,7 +14,6 @@
 #ifndef QFLOAT_H
 #define QFLOAT_H
 
-#include <stdint.h>
 #include "qapi/qmp/qobject.h"
 
 typedef struct QFloat {

diff --git a/include/qapi/qmp/qint.h b/include/qapi/qmp/qint.h
index 049e5280792289a64e580f2a1a41976386e22f73..3aaff768ddb30a0896324af9eb855f15dc417579 100644 (file)
--- a/include/qapi/qmp/qint.h
+++ b/include/qapi/qmp/qint.h
@@ -13,7 +13,6 @@
 #ifndef QINT_H
 #define QINT_H
 
-#include <stdint.h>
 #include "qapi/qmp/qobject.h"
 
 typedef struct QInt {

diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h
index ee4d31a46acaca1ed4c701f650030c89aad18b55..02b1f2ce318bfe5064c7ab55c832eb917284505f 100644 (file)
--- a/include/qapi/qmp/qjson.h
+++ b/include/qapi/qmp/qjson.h
@@ -14,8 +14,6 @@
 #ifndef QJSON_H
 #define QJSON_H
 
-#include <stdarg.h>
-#include "qemu/compiler.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 

diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h
index 74459ae14b7c4c170ad131f183c986309126a33a..b8ddbca405cf37e1f54cbbedab4c3f0d3caa7706 100644 (file)
--- a/include/qapi/qmp/qobject.h
+++ b/include/qapi/qmp/qobject.h
@@ -32,8 +32,6 @@
 #ifndef QOBJECT_H
 #define QOBJECT_H
 
-#include <stddef.h>
-#include <assert.h>
 #include "qapi-types.h"
 
 struct QObject {

diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h
index df7df558b22b54e637cfecfa0c06fde8f4d3f756..10076b7c8cd4df87ff58a1963e20ca7484ca3a2f 100644 (file)
--- a/include/qapi/qmp/qstring.h
+++ b/include/qapi/qmp/qstring.h
@@ -13,7 +13,6 @@
 #ifndef QSTRING_H
 #define QSTRING_H
 
-#include <stdint.h>
 #include "qapi/qmp/qobject.h"
 
 typedef struct QString {

diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h
index 6a1ddfbd9a6ea7a9b12cda88ece2269d024fa0a0..2bd8f292b2d53d48c9183e8514e8a50add2f3855 100644 (file)
--- a/include/qapi/visitor-impl.h
+++ b/include/qapi/visitor-impl.h
@@ -12,7 +12,6 @@
 #ifndef QAPI_VISITOR_IMPL_H
 #define QAPI_VISITOR_IMPL_H
 
-#include "qapi/error.h"
 #include "qapi/visitor.h"
 
 struct Visitor

diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h
index 83cad74c88498714384de05c730a332732c22164..1000da2bdabd8db084178839b921d87f013f2126 100644 (file)
--- a/include/qapi/visitor.h
+++ b/include/qapi/visitor.h
@@ -16,8 +16,6 @@
 
 #include "qemu/typedefs.h"
 #include "qapi/qmp/qobject.h"
-#include "qapi/error.h"
-#include <stdlib.h>
 
 /* This struct is layout-compatible with all other *List structs
  * created by the qapi generator.  It is used as a typical

diff --git a/include/qemu-common.h b/include/qemu-common.h
index f557be78e36430995647e166d3b29fbcea1c6f45..a85e9bf98a1656a505b1d995e7c41334d39b7480 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -12,7 +12,6 @@
 #ifndef QEMU_COMMON_H
 #define QEMU_COMMON_H
 
-#include "qemu/osdep.h"
 #include "qemu/typedefs.h"
 #include "qemu/fprintf-fn.h"
 

diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h
index 05b447c7286aecea4c0f7ada733f7e673bc47c44..8f1d8d927dca0229f746a5229bf691c38487ba4c 100644 (file)
--- a/include/qemu/atomic.h
+++ b/include/qemu/atomic.h
@@ -15,7 +15,6 @@
 #ifndef __QEMU_ATOMIC_H
 #define __QEMU_ATOMIC_H 1
 
-#include "qemu/compiler.h"
 
 
 /* Compiler barrier */

diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h
index 86dd9cd5fc43b58a4bb31c160bcd8f7bf40ac6c3..0e33fa5d9d6090e007b18003eb1d35873385c6ab 100644 (file)
--- a/include/qemu/bitmap.h
+++ b/include/qemu/bitmap.h
@@ -13,10 +13,7 @@
 #define BITMAP_H
 
 #include <glib.h>
-#include <string.h>
-#include <stdlib.h>
 
-#include "qemu/osdep.h"
 #include "qemu/bitops.h"
 
 /*

diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h
index 81642251525ed2f06a0b1ac9f5a1712bed862d10..755fdd1293016dad64174c569aae882d277bd3aa 100644 (file)
--- a/include/qemu/bitops.h
+++ b/include/qemu/bitops.h
@@ -12,8 +12,6 @@
 #ifndef BITOPS_H
 #define BITOPS_H
 
-#include <stdint.h>
-#include <assert.h>
 
 #include "host-utils.h"
 #include "atomic.h"

diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 07d88de746f0a899d004f8236cf15e20a770090a..95071ba9e89ebe5afc178f11a0d34b6a73aa6c4f 100644 (file)
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -1,15 +1,10 @@
 #ifndef BSWAP_H
 #define BSWAP_H
 
-#include "config-host.h"
-#include <inttypes.h>
-#include <limits.h>
-#include <string.h>
 #include "fpu/softfloat.h"
 
 #ifdef CONFIG_MACHINE_BSWAP_H
 # include <sys/endian.h>
-# include <sys/types.h>
 # include <machine/bswap.h>
 #elif defined(__FreeBSD__)
 # include <sys/endian.h>

diff --git a/include/qemu/compatfd.h b/include/qemu/compatfd.h
index fc3791520f3209a074d1f0b8b210940692bb836d..aa12ee936442b31acc258a1d85647c09b06d400c 100644 (file)
--- a/include/qemu/compatfd.h
+++ b/include/qemu/compatfd.h
@@ -14,7 +14,6 @@
 #ifndef QEMU_COMPATFD_H
 #define QEMU_COMPATFD_H
 
-#include <signal.h>
 
 struct qemu_signalfd_siginfo {
     uint32_t ssi_signo;   /* Signal number */

diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h
index c5fbe28b02cb2ed751c6124b0651da8f95beab9b..8f1cc7ba674cdbee80f7798ae43415e29b1ee72b 100644 (file)
--- a/include/qemu/compiler.h
+++ b/include/qemu/compiler.h
@@ -3,7 +3,6 @@
 #ifndef COMPILER_H
 #define COMPILER_H
 
-#include "config-host.h"
 
 /*----------------------------------------------------------------------------
 | The macro QEMU_GNUC_PREREQ tests for minimum version of the GNU C compiler.

diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h
index d4ba20e0498df703aa106a8053047eb191c31a4a..3b8ecb095308a14baed58f7a2f411831fa678b5c 100644 (file)
--- a/include/qemu/config-file.h
+++ b/include/qemu/config-file.h
@@ -1,9 +1,7 @@
 #ifndef QEMU_CONFIG_H
 #define QEMU_CONFIG_H
 
-#include <stdio.h>
 #include "qemu/option.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 
 QemuOptsList *qemu_find_opts(const char *group);

diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index 20c027a7fd0f7c60765276a525b417bc133c4ba6..99b939846b671ce25b54ae7d6c514c2e32ca16d7 100644 (file)
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -15,7 +15,6 @@
 #ifndef QEMU_COROUTINE_H
 #define QEMU_COROUTINE_H
 
-#include <stdbool.h>
 #include "qemu/typedefs.h"
 #include "qemu/queue.h"
 #include "qemu/timer.h"

diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h
index 7ab235590e532263d43dd80efda4d35ad667b601..7a2a363fb3657c919e6d9e1a1b059d651c25f009 100644 (file)
--- a/include/qemu/error-report.h
+++ b/include/qemu/error-report.h
@@ -13,9 +13,6 @@
 #ifndef QEMU_ERROR_H
 #define QEMU_ERROR_H
 
-#include <stdarg.h>
-#include <stdbool.h>
-#include "qemu/compiler.h"
 
 typedef struct Location {
     /* all members are private to qemu-error.c */

diff --git a/include/qemu/fprintf-fn.h b/include/qemu/fprintf-fn.h
index 9ddc90f1c59ba3ac2cae030df9bda46ec07487aa..b6bad35b1b3c712939cb3b3bc2dec1e87b950473 100644 (file)
--- a/include/qemu/fprintf-fn.h
+++ b/include/qemu/fprintf-fn.h
@@ -8,8 +8,6 @@
 #ifndef QEMU_FPRINTF_FN_H
 #define QEMU_FPRINTF_FN_H 1
 
-#include "qemu/compiler.h"
-#include <stdio.h>
 
 typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
     GCC_FMT_ATTR(2, 3);

diff --git a/include/qemu/hbitmap.h b/include/qemu/hbitmap.h
index bb94a00c5f4381a1b192a2f242887f289117609a..e29188c0adad24d30d9b8cce083757057d0a0d92 100644 (file)
--- a/include/qemu/hbitmap.h
+++ b/include/qemu/hbitmap.h
@@ -12,9 +12,6 @@
 #ifndef HBITMAP_H
 #define HBITMAP_H 1
 
-#include <limits.h>
-#include <stdint.h>
-#include <stdbool.h>
 #include "bitops.h"
 #include "host-utils.h"
 

diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h
index 3ef97d503dc9e5d105e59c2325241e79cce1de6d..1cdae0d0ed4e3a2d537b922c3fc9691fc37e6a96 100644 (file)
--- a/include/qemu/host-utils.h
+++ b/include/qemu/host-utils.h
@@ -25,10 +25,7 @@
 #ifndef HOST_UTILS_H
 #define HOST_UTILS_H 1
 
-#include "qemu/compiler.h"   /* QEMU_GNUC_PREREQ */
 #include "qemu/bswap.h"
-#include <limits.h>
-#include <stdbool.h>
 
 #ifdef CONFIG_INT128
 static inline void mulu64(uint64_t *plow, uint64_t *phigh,

diff --git a/include/qemu/int128.h b/include/qemu/int128.h
index fb782aaddd4a84c3666ee67fe2f5d16ddd1bc12b..c5988813df4cd766ac99f5f7afac4473e41c48af 100644 (file)
--- a/include/qemu/int128.h
+++ b/include/qemu/int128.h
@@ -1,9 +1,6 @@
 #ifndef INT128_H
 #define INT128_H
 
-#include <assert.h>
-#include <stdint.h>
-#include <stdbool.h>
 
 typedef struct Int128 Int128;
 

diff --git a/include/qemu/log.h b/include/qemu/log.h
index 30817f7b429660e0f9b702855cf08a4cdeeedc04..1afac637608a3992d1ef763cdcaf7a95c52a99ec 100644 (file)
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -1,10 +1,6 @@
 #ifndef QEMU_LOG_H
 #define QEMU_LOG_H
 
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include "qemu/compiler.h"
 
 /* Private global variables, don't use */
 extern FILE *qemu_logfile;

diff --git a/include/qemu/memfd.h b/include/qemu/memfd.h
index 53858ed43cfe39a81d4703b098b0ae1417a4d6eb..745a8c501ee1ec1a66129ebef7e2d97a885000a6 100644 (file)
--- a/include/qemu/memfd.h
+++ b/include/qemu/memfd.h
@@ -1,8 +1,6 @@
 #ifndef QEMU_MEMFD_H
 #define QEMU_MEMFD_H
 
-#include "config-host.h"
-#include <stdbool.h>
 
 #ifndef F_LINUX_SPECIFIC_BASE
 #define F_LINUX_SPECIFIC_BASE 1024

diff --git a/include/qemu/module.h b/include/qemu/module.h
index 72d94984a2a0fc382fc36990b212723a43708bed..85fafa2e790b4de2afe63e9aa02b1149189be05f 100644 (file)
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -14,7 +14,6 @@
 #ifndef QEMU_MODULE_H
 #define QEMU_MODULE_H
 
-#include "qemu/osdep.h"
 
 #define DSO_STAMP_FUN         glue(qemu_stamp, CONFIG_STAMP)
 #define DSO_STAMP_FUN_STR     stringify(DSO_STAMP_FUN)

diff --git a/include/qemu/option.h b/include/qemu/option.h
index 71f5f27ec8499c0dc0e0ae2dbee249e4c30f241e..8809ce1e7535386a5a200fcac8bb6bd9336e4e02 100644 (file)
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -26,9 +26,7 @@
 #ifndef QEMU_OPTIONS_H
 #define QEMU_OPTIONS_H
 
-#include <stdint.h>
 #include "qemu/queue.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/typedefs.h"
 

diff --git a/include/qemu/range.h b/include/qemu/range.h
index cfa021fd48ae4125ed0f3cd6cfbb66d4df0fb8d8..9fc547b9cb0ebe868b9a88da028c02e382ad7e8c 100644 (file)
--- a/include/qemu/range.h
+++ b/include/qemu/range.h
@@ -1,7 +1,6 @@
 #ifndef QEMU_RANGE_H
 #define QEMU_RANGE_H
 
-#include <inttypes.h>
 #include <qemu/typedefs.h>
 #include "qemu/queue.h"
 

diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h
index 7c7cca7f6fe45b3ff588247445bb409828fea37c..56d3a682a934d7a63faf93ea328fa0e9571a04b3 100644 (file)
--- a/include/qemu/rcu.h
+++ b/include/qemu/rcu.h
@@ -23,15 +23,8 @@
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
-#include <stdlib.h>
-#include <assert.h>
-#include <limits.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdbool.h>
 #include <glib.h>
 
-#include "qemu/compiler.h"
 #include "qemu/thread.h"
 #include "qemu/queue.h"
 #include "qemu/atomic.h"

diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index cde2f5e0d64641ac54fae033c6d897f1a3c1e0f6..0be68de87d4b387c181ae076d53059411160617d 100644 (file)
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -13,7 +13,6 @@ int inet_aton(const char *cp, struct in_addr *ia);
 
 #else
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -26,7 +25,6 @@ int inet_aton(const char *cp, struct in_addr *ia);
 
 #endif /* !_WIN32 */
 
-#include "qapi/error.h"
 #include "qapi-types.h"
 
 /* misc helpers */

diff --git a/include/qemu/thread.h b/include/qemu/thread.h
index 5114ec8e791bb3e6ccfecb7e44ac3dfb787708c3..bdae6dfdbe53f7c9c05340d0c957f23d2ceeced6 100644 (file)
--- a/include/qemu/thread.h
+++ b/include/qemu/thread.h
@@ -1,8 +1,6 @@
 #ifndef __QEMU_THREAD_H
 #define __QEMU_THREAD_H 1
 
-#include <inttypes.h>
-#include <stdbool.h>
 
 typedef struct QemuMutex QemuMutex;
 typedef struct QemuCond QemuCond;

diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h
index 63df69070a16b0e12c989f82b783799407bea1bb..9109657609e99ede3d249459dafcb18c9942a83d 100644 (file)
--- a/include/qemu/throttle.h
+++ b/include/qemu/throttle.h
@@ -25,7 +25,6 @@
 #ifndef THROTTLE_H
 #define THROTTLE_H
 
-#include <stdint.h>
 #include "qemu-common.h"
 #include "qemu/timer.h"
 

diff --git a/include/qemu/timed-average.h b/include/qemu/timed-average.h
index 364bf88f704d2be94651fb3494368b4cdc3cb359..08245e7a10990aa93e1526c0b13c04beb5ee51d8 100644 (file)
--- a/include/qemu/timed-average.h
+++ b/include/qemu/timed-average.h
@@ -25,7 +25,6 @@
 #ifndef TIMED_AVERAGE_H
 #define TIMED_AVERAGE_H
 
-#include <stdint.h>
 
 #include "qemu/timer.h"
 

diff --git a/include/qemu/xattr.h b/include/qemu/xattr.h
index f910d96eafb56915283a880210bee4859edfd51c..83cf98cbd849f0e8a45d9cd336f2629df60e4608 100644 (file)
--- a/include/qemu/xattr.h
+++ b/include/qemu/xattr.h
@@ -18,7 +18,6 @@
  * in /usr/include/sys, and don't have ENOATTR.
  */
 
-#include "config-host.h"
 
 #ifdef CONFIG_LIBATTR
 #  include <attr/xattr.h>

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index ff54600e71dc0c3d736fd000cc530e58a3eb60a4..1df7cb4073e49587b502f13bd72bbb769077bc8e 100644 (file)
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -20,7 +20,6 @@
 #ifndef QEMU_CPU_H
 #define QEMU_CPU_H
 
-#include <signal.h>
 #include <setjmp.h>
 #include "hw/qdev-core.h"
 #include "disas/bfd.h"

diff --git a/include/qom/object.h b/include/qom/object.h
index 33abce930bf48909395550f444dcddf33e5a42e0..eda16df005ca97299c59a93b149eaa5ef453811c 100644 (file)
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -15,11 +15,8 @@
 #define QEMU_OBJECT_H
 
 #include <glib.h>
-#include <stdint.h>
-#include <stdbool.h>
 #include "qemu/queue.h"
 #include "qemu/typedefs.h"
-#include "qapi/error.h"
 
 struct TypeImpl;
 typedef struct TypeImpl *Type;

diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index ec303316bb8b216d229f249d0c4ff4d6ffe7930f..66c5cf22e1e749bc7e41dd4121c6895588a28627 100644 (file)
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -14,7 +14,6 @@
 #define BLOCK_BACKEND_H
 
 #include "qemu/typedefs.h"
-#include "qapi/error.h"
 
 /*
  * TODO Have to include block/block.h for a bunch of block layer

diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index b06a0607a957ea602f74e9f40450fc484eba34d7..16432f350805e4f0a924107a1b122f6fcb62c990 100644 (file)
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -11,7 +11,6 @@
 #define BLOCKDEV_H
 
 #include "block/block.h"
-#include "qapi/error.h"
 #include "qemu/queue.h"
 
 void blockdev_mark_auto_del(BlockBackend *blk);

diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index efa8b9993ae1e28ae289807ab5196c5a45867c32..b0fbb9bb352e8a55147f534e767a3fd03a3e31ce 100644 (file)
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -10,7 +10,6 @@
 #ifndef DMA_H
 #define DMA_H
 
-#include <stdio.h>
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #include "hw/hw.h"

diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h
index 1ce439415d6b46109b69d9c70f7f2206a6f85a0d..a19801d20baca194bd29f1579dcf647d42ff4fe5 100644 (file)
--- a/include/sysemu/hostmem.h
+++ b/include/sysemu/hostmem.h
@@ -14,7 +14,6 @@
 
 #include "sysemu/sysemu.h" /* for MAX_NODES */
 #include "qom/object.h"
-#include "qapi/error.h"
 #include "exec/memory.h"
 #include "qemu/option.h"
 #include "qemu/bitmap.h"

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 7741f91f9cd67b84587b3196ec75ccbbd2911fcd..6695fa7cfd67b61d8dc465799ff70e8f4675c63f 100644 (file)
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -14,8 +14,6 @@
 #ifndef QEMU_KVM_H
 #define QEMU_KVM_H
 
-#include <errno.h>
-#include "config-host.h"
 #include "qemu/queue.h"
 #include "qom/cpu.h"
 #include "exec/memattrs.h"

diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
index a6392bc50f9a59a570813cc8d94868b812cf2ed6..bb184c9cfeb3bd590e10b4b15b7aba647010943d 100644 (file)
--- a/include/sysemu/numa.h
+++ b/include/sysemu/numa.h
@@ -1,7 +1,6 @@
 #ifndef SYSEMU_NUMA_H
 #define SYSEMU_NUMA_H
 
-#include <stdint.h>
 #include "qemu/bitmap.h"
 #include "qemu/option.h"
 #include "sysemu/sysemu.h"

diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h
index f1315213f1428e103bb7e9b9ce710f07394cc471..5b9c4d6143e42e59e19f1c414e78e4f0116d90c2 100644 (file)
--- a/include/sysemu/os-posix.h
+++ b/include/sysemu/os-posix.h
@@ -26,7 +26,6 @@
 #ifndef QEMU_OS_POSIX_H
 #define QEMU_OS_POSIX_H
 
-#include <sys/time.h>
 
 void os_set_line_buffering(void);
 void os_set_proc_name(const char *s);

diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h
index 05473b75a54507db16fa070cd39d5907026e38d2..70aa40aa72e946793f7eae9314cdca3c2607a906 100644 (file)
--- a/include/sysemu/qtest.h
+++ b/include/sysemu/qtest.h
@@ -15,7 +15,6 @@
 #define QTEST_H
 
 #include "qemu-common.h"
-#include "qapi/error.h"
 
 extern bool qtest_allowed;
 

diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index abb4688200d9896bf001637cf48c4f6e7d8bff84..e4108e8b1a2e4ff7eb62697856a622c479fb311a 100644 (file)
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -12,10 +12,7 @@
  *
  */
 
-#include <stdbool.h>
-#include <stdint.h>
 #include "qapi-types.h"
-#include "qapi/error.h"
 #include "qemu/typedefs.h"
 
 /* replay clock kinds */

diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h
index 0a27c9b88c2e0edf6cd108e819470821eadf5420..858be8cef48623d5cd6df662a62e428ee15f0db4 100644 (file)
--- a/include/sysemu/rng.h
+++ b/include/sysemu/rng.h
@@ -15,7 +15,6 @@
 
 #include "qom/object.h"
 #include "qemu-common.h"
-#include "qapi/error.h"
 
 #define TYPE_RNG_BACKEND "rng-backend"
 #define RNG_BACKEND(obj) \

diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h
index 1189fa241da89a5281a697a7345520cc74a1836d..cfc06008cbc5415f2cfd2883f240920ad7bffaec 100644 (file)
--- a/include/sysemu/seccomp.h
+++ b/include/sysemu/seccomp.h
@@ -16,7 +16,6 @@
 #define QEMU_SECCOMP_H
 
 #include <seccomp.h>
-#include "qemu/osdep.h"
 
 int seccomp_start(void);
 #endif

diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index 0a366be0f2a2429a55f333f94a89e075e889c93f..e3ec80020f2b64bc5a0a97871be4de0425d6814a 100644 (file)
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -15,7 +15,6 @@
 
 #include "qom/object.h"
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qapi-types.h"
 #include "qemu/option.h"
 #include "sysemu/tpm.h"

diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h
index c59804060b9a2e1fdab9b68ce9174fb343410501..c849489fb26dbad15fe086dc57ead831c21d1b4d 100644 (file)
--- a/include/sysemu/xen-mapcache.h
+++ b/include/sysemu/xen-mapcache.h
@@ -9,7 +9,6 @@
 #ifndef XEN_MAPCACHE_H
 #define XEN_MAPCACHE_H
 
-#include <stdlib.h>
 
 typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr start_addr,
                                                      ram_addr_t size,

diff --git a/include/ui/console.h b/include/ui/console.h
index c8f9f7e65e0674b46c0220bc773f3e507b047d89..6631b9690a90992d9c4ce6984c7acf5bb99b3027 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -7,7 +7,6 @@
 #include "qemu/notify.h"
 #include "qemu/typedefs.h"
 #include "qapi-types.h"
-#include "qapi/error.h"
 
 #ifdef CONFIG_OPENGL
 # include <epoxy/gl.h>

diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index f9ce357ff3a5560b7737747006bab5c0fc04784c..2dabe49f4146eba088cb41647980cfcaebd6622c 100644 (file)
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -18,7 +18,6 @@
 #ifndef QEMU_SPICE_H
 #define QEMU_SPICE_H
 
-#include "config-host.h"
 
 #ifdef CONFIG_SPICE