summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2011-06-19 20:38:22 +0000
committerBlue Swirl <blauwirbel@gmail.com>2011-06-26 18:25:35 +0000
commit2b41f10e186ccb4f0058815161586f8d6d006ea3 (patch)
treeec040cdcd7a1d62a8733df155902a8405dcbbf94
parentf081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8 (diff)
Remove exec-all.h include directives
Most exec-all.h include directives are now useless, remove them. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--bsd-user/main.c2
-rw-r--r--cpus.c1
-rw-r--r--disas.c1
-rw-r--r--exec.c1
-rw-r--r--gdbstub.c2
-rw-r--r--hw/sh7750.c1
-rw-r--r--hw/spapr_hcall.c1
-rw-r--r--kvm-stub.c2
-rw-r--r--linux-user/main.c3
-rw-r--r--monitor.c2
-rw-r--r--target-alpha/exec.h1
-rw-r--r--target-alpha/helper.c1
-rw-r--r--target-alpha/translate.c1
-rw-r--r--target-arm/exec.h1
-rw-r--r--target-arm/helper.c1
-rw-r--r--target-arm/translate.c1
-rw-r--r--target-cris/exec.h1
-rw-r--r--target-cris/helper.c1
-rw-r--r--target-cris/mmu.c1
-rw-r--r--target-cris/translate.c1
-rw-r--r--target-i386/exec.h1
-rw-r--r--target-i386/helper.c1
-rw-r--r--target-i386/machine.c2
-rw-r--r--target-i386/op_helper.c1
-rw-r--r--target-i386/translate.c1
-rw-r--r--target-lm32/exec.h1
-rw-r--r--target-lm32/helper.c1
-rw-r--r--target-lm32/translate.c1
-rw-r--r--target-m68k/exec.h1
-rw-r--r--target-m68k/helper.c1
-rw-r--r--target-m68k/translate.c1
-rw-r--r--target-microblaze/exec.h1
-rw-r--r--target-microblaze/helper.c1
-rw-r--r--target-microblaze/mmu.c1
-rw-r--r--target-microblaze/translate.c1
-rw-r--r--target-mips/exec.h1
-rw-r--r--target-mips/helper.c1
-rw-r--r--target-mips/machine.c2
-rw-r--r--target-mips/translate.c1
-rw-r--r--target-ppc/exec.h1
-rw-r--r--target-ppc/helper.c1
-rw-r--r--target-ppc/translate.c1
-rw-r--r--target-s390x/exec.h1
-rw-r--r--target-s390x/helper.c1
-rw-r--r--target-s390x/translate.c1
-rw-r--r--target-sh4/exec.h1
-rw-r--r--target-sh4/helper.c1
-rw-r--r--target-sh4/translate.c1
-rw-r--r--target-sparc/helper.c1
-rw-r--r--target-sparc/machine.c2
-rw-r--r--target-sparc/translate.c1
-rw-r--r--target-unicore32/exec.h1
-rw-r--r--target-unicore32/helper.c1
-rw-r--r--target-unicore32/translate.c1
-rw-r--r--tcg/tcg.c1
-rw-r--r--translate-all.c1
-rw-r--r--xen-mapcache-stub.c1
57 files changed, 8 insertions, 58 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 0af8a7e7f1..5f790b255a 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -29,7 +29,7 @@
#include "qemu.h"
#include "qemu-common.h"
/* For tb_lock */
-#include "exec-all.h"
+#include "cpu.h"
#include "tcg.h"
#include "qemu-timer.h"
#include "envlist.h"
diff --git a/cpus.c b/cpus.c
index 0699f378b1..e2997941fa 100644
--- a/cpus.c
+++ b/cpus.c
@@ -30,7 +30,6 @@
#include "gdbstub.h"
#include "dma.h"
#include "kvm.h"
-#include "exec-all.h"
#include "qemu-thread.h"
#include "cpus.h"
diff --git a/disas.c b/disas.c
index d208c52402..1334b8e0f3 100644
--- a/disas.c
+++ b/disas.c
@@ -5,7 +5,6 @@
#include <errno.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
/* Filled in by elfload.c. Simplistic, but will do for now. */
diff --git a/exec.c b/exec.c
index b03b5bed81..21507fb4a9 100644
--- a/exec.c
+++ b/exec.c
@@ -26,7 +26,6 @@
#include "qemu-common.h"
#include "cpu.h"
-#include "exec-all.h"
#include "tcg.h"
#include "hw/hw.h"
#include "hw/qdev.h"
diff --git a/gdbstub.c b/gdbstub.c
index b9ae30dd7d..c085a5afb3 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -37,7 +37,7 @@
#define MAX_PACKET_LENGTH 4096
-#include "exec-all.h"
+#include "cpu.h"
#include "qemu_socket.h"
#include "kvm.h"
diff --git a/hw/sh7750.c b/hw/sh7750.c
index 19d5bf8537..4f279e7e51 100644
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -29,7 +29,6 @@
#include "sh7750_regs.h"
#include "sh7750_regnames.h"
#include "sh_intc.h"
-#include "exec-all.h"
#include "cpu.h"
#define NB_DEVICES 4
diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c
index 43c441dc7d..84da8fc69c 100644
--- a/hw/spapr_hcall.c
+++ b/hw/spapr_hcall.c
@@ -3,7 +3,6 @@
#include "qemu-char.h"
#include "sysemu.h"
#include "qemu-char.h"
-#include "exec-all.h"
#include "exec.h"
#include "helper_regs.h"
#include "hw/spapr.h"
diff --git a/kvm-stub.c b/kvm-stub.c
index 1e835c6715..06064b9a86 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "hw/hw.h"
-#include "exec-all.h"
+#include "cpu.h"
#include "gdbstub.h"
#include "kvm.h"
diff --git a/linux-user/main.c b/linux-user/main.c
index 71dd253786..1c91c30dcb 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -29,8 +29,7 @@
#include "qemu.h"
#include "qemu-common.h"
#include "cache-utils.h"
-/* For tb_lock */
-#include "exec-all.h"
+#include "cpu.h"
#include "tcg.h"
#include "qemu-timer.h"
#include "envlist.h"
diff --git a/monitor.c b/monitor.c
index 6af6a4d999..67ceb46a62 100644
--- a/monitor.c
+++ b/monitor.c
@@ -56,7 +56,7 @@
#include "json-streamer.h"
#include "json-parser.h"
#include "osdep.h"
-#include "exec-all.h"
+#include "cpu.h"
#ifdef CONFIG_SIMPLE_TRACE
#include "trace.h"
#endif
diff --git a/target-alpha/exec.h b/target-alpha/exec.h
index f5089963b8..afb01d3727 100644
--- a/target-alpha/exec.h
+++ b/target-alpha/exec.h
@@ -31,7 +31,6 @@ register struct CPUAlphaState *env asm(AREG0);
#define FP_STATUS (env->fp_status)
#include "cpu.h"
-#include "exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "softmmu_exec.h"
diff --git a/target-alpha/helper.c b/target-alpha/helper.c
index 32c2cf9db3..7049c80d5c 100644
--- a/target-alpha/helper.c
+++ b/target-alpha/helper.c
@@ -22,7 +22,6 @@
#include <stdio.h>
#include "cpu.h"
-#include "exec-all.h"
#include "softfloat.h"
uint64_t cpu_alpha_load_fpcr (CPUState *env)
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 936760c5ad..c61906a8b3 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -22,7 +22,6 @@
#include <stdio.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "host-utils.h"
#include "tcg-op.h"
diff --git a/target-arm/exec.h b/target-arm/exec.h
index 007b7cb6df..6793288d43 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -22,7 +22,6 @@
register struct CPUARMState *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "softmmu_exec.h"
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 12084167d6..f4d12aab55 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -3,7 +3,6 @@
#include <string.h>
#include "cpu.h"
-#include "exec-all.h"
#include "gdbstub.h"
#include "helper.h"
#include "qemu-common.h"
diff --git a/target-arm/translate.c b/target-arm/translate.c
index f5507ec3b6..badbc5ff31 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -25,7 +25,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
diff --git a/target-cris/exec.h b/target-cris/exec.h
index 9838159172..3294abe393 100644
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -22,7 +22,6 @@
register struct CPUCRISState *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "softmmu_exec.h"
diff --git a/target-cris/helper.c b/target-cris/helper.c
index 2a4403b847..962d214177 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -24,7 +24,6 @@
#include "config.h"
#include "cpu.h"
#include "mmu.h"
-#include "exec-all.h"
#include "host-utils.h"
diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index 1243745598..d481e39352 100644
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -27,7 +27,6 @@
#include "config.h"
#include "cpu.h"
#include "mmu.h"
-#include "exec-all.h"
#ifdef DEBUG
#define D(x) x
diff --git a/target-cris/translate.c b/target-cris/translate.c
index e2607d64c0..dd85859c0b 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -30,7 +30,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "helper.h"
diff --git a/target-i386/exec.h b/target-i386/exec.h
index 90a6b36882..dd9bce4eed 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -34,7 +34,6 @@ register struct CPUX86State *env asm(AREG0);
#include "qemu-log.h"
#include "cpu.h"
-#include "exec-all.h"
/* op_helper.c */
void QEMU_NORETURN raise_exception_err(int exception_index, int error_code);
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 509d68ca0f..e9be104293 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -23,7 +23,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "qemu-common.h"
#include "kvm.h"
#ifndef CONFIG_USER_ONLY
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 7662aa20b7..9aca8e0523 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -3,7 +3,7 @@
#include "hw/pc.h"
#include "hw/isa.h"
-#include "exec-all.h"
+#include "cpu.h"
#include "kvm.h"
static const VMStateDescription vmstate_segment = {
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index db038a7fcd..315e18b9a4 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -19,7 +19,6 @@
#include <math.h>
#include "exec.h"
-#include "exec-all.h"
#include "host-utils.h"
#include "ioport.h"
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 10bd72a0e2..ccef381be8 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -24,7 +24,6 @@
#include <signal.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
diff --git a/target-lm32/exec.h b/target-lm32/exec.h
index 61eb914cfa..2a227b2953 100644
--- a/target-lm32/exec.h
+++ b/target-lm32/exec.h
@@ -22,7 +22,6 @@
register struct CPULM32State *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
static inline int cpu_halted(CPUState *env)
{
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index 4f3e7e0fcb..e79428d8e0 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -23,7 +23,6 @@
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
#include "host-utils.h"
int cpu_lm32_handle_mmu_fault(CPUState *env, target_ulong address, int rw,
diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 5e197258eb..0be105d018 100644
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -25,7 +25,6 @@
#include <assert.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "helper.h"
#include "tcg-op.h"
diff --git a/target-m68k/exec.h b/target-m68k/exec.h
index 568260c3dd..93e7912148 100644
--- a/target-m68k/exec.h
+++ b/target-m68k/exec.h
@@ -22,7 +22,6 @@
register struct CPUM68KState *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "softmmu_exec.h"
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index faa8c42ae8..a936fe7b76 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -23,7 +23,6 @@
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
#include "qemu-common.h"
#include "gdbstub.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 26f0ee42e9..0e7f1fe2c7 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -25,7 +25,6 @@
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
diff --git a/target-microblaze/exec.h b/target-microblaze/exec.h
index b7f85cf3af..71b4d397ed 100644
--- a/target-microblaze/exec.h
+++ b/target-microblaze/exec.h
@@ -21,7 +21,6 @@
register struct CPUMBState *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "softmmu_exec.h"
diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c
index a623c7b04a..299259c3f0 100644
--- a/target-microblaze/helper.c
+++ b/target-microblaze/helper.c
@@ -23,7 +23,6 @@
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
#include "host-utils.h"
#define D(x)
diff --git a/target-microblaze/mmu.c b/target-microblaze/mmu.c
index b38f7d98b7..281fc8d8c4 100644
--- a/target-microblaze/mmu.c
+++ b/target-microblaze/mmu.c
@@ -22,7 +22,6 @@
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
#define D(x)
diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index b47b92e909..31e8306ef3 100644
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -25,7 +25,6 @@
#include <assert.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "helper.h"
diff --git a/target-mips/exec.h b/target-mips/exec.h
index a3a7262a84..e787e9a8ba 100644
--- a/target-mips/exec.h
+++ b/target-mips/exec.h
@@ -11,7 +11,6 @@
register struct CPUMIPSState *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "softmmu_exec.h"
diff --git a/target-mips/helper.c b/target-mips/helper.c
index 0f057c2171..ecf6182f56 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -24,7 +24,6 @@
#include <signal.h>
#include "cpu.h"
-#include "exec-all.h"
enum {
TLBRET_DIRTY = -4,
diff --git a/target-mips/machine.c b/target-mips/machine.c
index 9ffac711ce..be72b36de6 100644
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -1,7 +1,7 @@
#include "hw/hw.h"
#include "hw/boards.h"
-#include "exec-all.h"
+#include "cpu.h"
static void save_tc(QEMUFile *f, TCState *tc)
{
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 4eaa8261c3..2848c6a692 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -27,7 +27,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
diff --git a/target-ppc/exec.h b/target-ppc/exec.h
index 1e144bee3b..f4453e4965 100644
--- a/target-ppc/exec.h
+++ b/target-ppc/exec.h
@@ -24,7 +24,6 @@
#include "dyngen-exec.h"
#include "cpu.h"
-#include "exec-all.h"
register struct CPUPPCState *env asm(AREG0);
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index cf2a368b57..395ea0e549 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -23,7 +23,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "helper_regs.h"
#include "qemu-common.h"
#include "kvm.h"
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 59aef855d4..0a03b4465a 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -24,7 +24,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
diff --git a/target-s390x/exec.h b/target-s390x/exec.h
index d40640b675..fb73f31804 100644
--- a/target-s390x/exec.h
+++ b/target-s390x/exec.h
@@ -23,7 +23,6 @@ register struct CPUS390XState *env asm(AREG0);
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "softmmu_exec.h"
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 745d8c52bb..1ce7079af7 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -23,7 +23,6 @@
#include <string.h>
#include "cpu.h"
-#include "exec-all.h"
#include "gdbstub.h"
#include "qemu-common.h"
#include "qemu-timer.h"
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index eda4624d11..77fb4482aa 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -35,7 +35,6 @@
#endif
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
diff --git a/target-sh4/exec.h b/target-sh4/exec.h
index a537672981..4a6ae58898 100644
--- a/target-sh4/exec.h
+++ b/target-sh4/exec.h
@@ -25,7 +25,6 @@
register struct CPUSH4State *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
#ifndef CONFIG_USER_ONLY
#include "softmmu_exec.h"
diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index 8f36d313cd..20e9b134d6 100644
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -24,7 +24,6 @@
#include <signal.h>
#include "cpu.h"
-#include "exec-all.h"
#include "hw/sh_intc.h"
#if defined(CONFIG_USER_ONLY)
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 93c863650d..569bc738cb 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -27,7 +27,6 @@
//#define SH4_SINGLE_STEP
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 6b3510585d..7eea1acbd5 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -23,7 +23,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "qemu-common.h"
//#define DEBUG_MMU
diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index bae23c54ee..56ae0412cd 100644
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -2,7 +2,7 @@
#include "hw/boards.h"
#include "qemu-timer.h"
-#include "exec-all.h"
+#include "cpu.h"
void cpu_save(QEMUFile *f, void *opaque)
{
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 0cc47e9ff3..992cd77e72 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -25,7 +25,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "helper.h"
#include "tcg-op.h"
diff --git a/target-unicore32/exec.h b/target-unicore32/exec.h
index 6b9b499645..7912105e32 100644
--- a/target-unicore32/exec.h
+++ b/target-unicore32/exec.h
@@ -16,7 +16,6 @@
register struct CPUState_UniCore32 *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
static inline void env_to_regs(void)
{
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index 483aeaeb14..02707d5857 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -10,7 +10,6 @@
#include <string.h>
#include "cpu.h"
-#include "exec-all.h"
#include "gdbstub.h"
#include "helper.h"
#include "qemu-common.h"
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index 98eaeb3d43..a15e42d663 100644
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -14,7 +14,6 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 184c208980..debf47fee0 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -54,7 +54,6 @@
instructions */
#define NO_CPU_IO_DEFS
#include "cpu.h"
-#include "exec-all.h"
#include "tcg-op.h"
#include "elf.h"
diff --git a/translate-all.c b/translate-all.c
index 2ca190ca8f..24878aac5c 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -26,7 +26,6 @@
#define NO_CPU_IO_DEFS
#include "cpu.h"
-#include "exec-all.h"
#include "disas.h"
#include "tcg.h"
#include "qemu-timer.h"
diff --git a/xen-mapcache-stub.c b/xen-mapcache-stub.c
index 5eb3dac366..90a994dc2c 100644
--- a/xen-mapcache-stub.c
+++ b/xen-mapcache-stub.c
@@ -9,7 +9,6 @@
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
#include "qemu-common.h"
#include "cpu-common.h"
#include "xen-mapcache.h"