diff --git a/bsd-user/main.c b/bsd-user/main.c
index 0af8a7e..5f790b2 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 17e96b5..eae7b25 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 d208c52..1334b8e 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 09928a3..dac3086 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 b9ae30d..c085a5a 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 19d5bf8..4f279e7 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 43c441d..84da8fc 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 1c95452..c860cfe 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 71dd253..1c91c30 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 6af6a4d..67ceb46 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 f508996..afb01d3 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 32c2cf9..7049c80 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 ad6c2ca..f9beab1 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 007b7cb..6793288 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 1208416..f4d12aa 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 f5507ec..badbc5f 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 9838159..3294abe 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 2a4403b..962d214 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 1243745..d481e39 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 e2607d6..dd85859 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 90a6b36..dd9bce4 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 509d68c..e9be104 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 bbeae88..58aa8fa 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 db038a7..315e18b 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 10bd72a..ccef381 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 61eb914..2a227b2 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 4f3e7e0..e79428d 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 5e19725..0be105d 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 568260c..93e7912 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 faa8c42..a936fe7 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 26f0ee4..0e7f1fe 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 b7f85cf..71b4d39 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 a623c7b..299259c 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 b38f7d9..281fc8d 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 b47b92e..31e8306 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 a3a7262..e787e9a 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 0f057c2..ecf6182 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 9ffac71..be72b36 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 4eaa826..2848c6a 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 1e144be..f4453e4 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 cf2a368..395ea0e 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 59aef85..0a03b44 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 d40640b..fb73f31 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 745d8c5..1ce7079 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 eda4624..77fb448 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 a537672..4a6ae58 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 8f36d31..20e9b13 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 93c8636..569bc73 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 6b35105..7eea1ac 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 bae23c5..56ae041 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 0cc47e9..992cd77 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 6b9b499..7912105 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 483aeae..02707d5 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 98eaeb3..a15e42d 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 184c208..debf47f 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 2ca190c..24878aa 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 0760688..a3217f7 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"
