diff --git a/cpu-all.h b/cpu-all.h
index f1454d5979..5ba79e21ca 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -38,6 +38,7 @@
  */
 
 #include "bswap.h"
+#include "softfloat.h"
 
 #if defined(WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
 #define BSWAP_NEEDED
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index b62c537710..49de8302bd 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -25,8 +25,6 @@
 
 #include "cpu-defs.h"
 
-#include "softfloat.h"
-
 #define TARGET_HAS_ICE 1
 
 #define ELF_MACHINE	EM_CRIS