diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 7f755a7541694f67568df996f0465c7e8ab01149..174f60db669f70dbc33a1a0586e2a92eb55b0024 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -20,6 +20,8 @@
 #ifndef CPU_ARM_H
 #define CPU_ARM_H
 
+#define TARGET_LONG_BITS 32
+
 #include "cpu-defs.h"
 
 #define EXCP_UDEF       1   /* undefined instruction */
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 6be987c51dcaf98426bf073eaaf453d6db95533b..a93486cbe4a06265168d81197fdb6d3f965bb518 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -20,6 +20,8 @@
 #ifndef CPU_I386_H
 #define CPU_I386_H
 
+#define TARGET_LONG_BITS 32
+
 #include "cpu-defs.h"
 
 #define R_EAX 0
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 850a88ba8e7cf96919548c72b678d3498dfe3210..3809f201411a457ca0a2a622faa12f0b0fa428d4 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -23,6 +23,8 @@
 #include <endian.h>
 #include <asm/byteorder.h>
 
+#define TARGET_LONG_BITS 32
+
 #include "cpu-defs.h"
 
 //#define USE_OPEN_FIRMWARE
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 67fece712734227b867206c5148f11b26a89f6ad..af5ecb5082e54a2bd6036cececa1548d23bafacc 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -1,8 +1,8 @@
 #ifndef CPU_SPARC_H
 #define CPU_SPARC_H
 
-#include <setjmp.h>
-#include "config.h"
+#define TARGET_LONG_BITS 32
+
 #include "cpu-defs.h"
 
 /*#define EXCP_INTERRUPT 0x100*/