diff --git a/cpu-all.h b/cpu-all.h
index 3eacfa89aa3a5efd78cb57bb1df51183a2bc36ef..13af7c2086c02eeb20f65f0d587a02b2661890d0 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -305,5 +305,6 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size);
 #endif /* SINGLE_CPU_DEFINES */
 
 void cpu_abort(CPUState *env, const char *fmt, ...);
+extern CPUState *cpu_single_env;
 
 #endif /* CPU_ALL_H */
diff --git a/cpu-arm.h b/cpu-arm.h
index c3850eb4075afc16f344b4fb5a268a927da76179..e3720886aa9da539598a2bc6e7a02492258ce96c 100644
--- a/cpu-arm.h
+++ b/cpu-arm.h
@@ -40,6 +40,8 @@ typedef struct CPUARMState {
     jmp_buf jmp_env;
     int exception_index;
     int interrupt_request;
+    struct TranslationBlock *current_tb;
+    int user_mode_only;
 
     /* user data */
     void *opaque;