diff --git a/target-mips/exec.h b/target-mips/exec.h
index cfe69a3ffa58a6ff5d6acd4d8fbe335d42b6352a..b00263f1b1478b08047b72d5140b2c294084f432 100644
--- a/target-mips/exec.h
+++ b/target-mips/exec.h
@@ -6,25 +6,18 @@
 #include "config.h"
 #include "mips-defs.h"
 #include "dyngen-exec.h"
+#include "cpu-defs.h"
 
 register struct CPUMIPSState *env asm(AREG0);
 
-#if defined (USE_64BITS_REGS)
-typedef int64_t host_int_t;
-typedef uint64_t host_uint_t;
-#else
-typedef int32_t host_int_t;
-typedef uint32_t host_uint_t;
-#endif
-
 #if TARGET_LONG_BITS > HOST_LONG_BITS
 #define T0 (env->t0)
 #define T1 (env->t1)
 #define T2 (env->t2)
 #else
-register host_uint_t T0 asm(AREG1);
-register host_uint_t T1 asm(AREG2);
-register host_uint_t T2 asm(AREG3);
+register target_ulong T0 asm(AREG1);
+register target_ulong T1 asm(AREG2);
+register target_ulong T2 asm(AREG3);
 #endif
 
 #if defined (USE_HOST_FLOAT_REGS)
diff --git a/target-mips/mips-defs.h b/target-mips/mips-defs.h
index 95b5ef8f0e7ecaf05b3f0d976a986d4f154ae8c4..414f476db22cd4a751f23e3c81f177645eff3a12 100644
--- a/target-mips/mips-defs.h
+++ b/target-mips/mips-defs.h
@@ -1,8 +1,6 @@
 #if !defined (__QEMU_MIPS_DEFS_H__)
 #define __QEMU_MIPS_DEFS_H__
 
-/* If we want to use 64 bits host regs... */
-//#define USE_64BITS_REGS
 /* If we want to use host float regs... */
 //#define USE_HOST_FLOAT_REGS