diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 5979fc1f8e..5968551a05 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -19,6 +19,9 @@ typedef uint64_t vaddr;
 #define VADDR_PRIX PRIX64
 #define VADDR_MAX UINT64_MAX
 
+void cpu_exec_init_all(void);
+void cpu_exec_step_atomic(CPUState *cpu);
+
 /* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
  * when intptr_t is 32-bit and we are aligning a long long.
  */
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 08f40a9d1e..ced260d08b 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,9 +24,6 @@
 int qemu_main(int argc, char **argv, char **envp);
 #endif
 
-void cpu_exec_init_all(void);
-void cpu_exec_step_atomic(CPUState *cpu);
-
 /**
  * set_preferred_target_page_bits:
  * @bits: number of bits needed to represent an address within the page