diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
index 13d19001f3540aeea37e8578a33e5e7b866f879d..c87e55f61d7404cde2ae8950a7df193b8475c07a 100644
--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@@ -25,8 +25,7 @@
 #include <stdio.h>
 #include "hw.h"
 #include "net.h"
-
-#include "etraxfs_dma.h"
+#include "etraxfs.h"
 
 #define D(x)
 
diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c
index e32e2eb7015df3a8bd1a1cbb794661613a1fd95d..8367386ed1001d8b0965410bab7fad9e1fbede1b 100644
--- a/hw/etraxfs_ser.c
+++ b/hw/etraxfs_ser.c
@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include "hw.h"
 #include "qemu-char.h"
+#include "etraxfs.h"
 
 #define D(x)
 
diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c
index ebb06e1058e452c3a5e25fd8143f302b719bffee..1144369b1c244ae2d357e4bd228ed5292d4563cc 100644
--- a/hw/etraxfs_timer.c
+++ b/hw/etraxfs_timer.c
@@ -26,6 +26,7 @@
 #include "hw.h"
 #include "sysemu.h"
 #include "qemu-timer.h"
+#include "etraxfs.h"
 
 #define D(x)
 
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index dea4cc46c129459e32afed481cf05db34393e199..754953cda053c3fa990d4478bb641843eacc8f30 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -216,6 +216,9 @@ static inline int cpu_mmu_index (CPUState *env)
 	return !!(env->pregs[PR_CCS] & U_FLAG);
 }
 
+int cpu_cris_handle_mmu_fault(CPUState *env, target_ulong address, int rw,
+                              int mmu_idx, int is_softmmu);
+
 #if defined(CONFIG_USER_ONLY)
 static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
 {
diff --git a/target-cris/exec.h b/target-cris/exec.h
index cce87f6a08ea4856b095d2e598f98fa88a8715ca..77e4240e89e60033cc84784a67a845b26e1f71a5 100644
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -33,9 +33,6 @@ static inline void regs_to_env(void)
 {
 }
 
-int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
-                              int mmu_idx, int is_softmmu);
-
 #if !defined(CONFIG_USER_ONLY)
 #include "softmmu_exec.h"
 #endif
diff --git a/target-cris/translate.c b/target-cris/translate.c
index f575e63c66ffcfd995858ea6619e2e1b377c9a1a..d5fcb9e6365a424deb21ca3afe707a1b0757a942 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -2633,7 +2633,8 @@ static unsigned int dec_movem_mr(DisasContext *dc)
 		tmp32 = tcg_temp_new_i32();
 		tcg_gen_addi_tl(addr, cpu_R[dc->op1], i * 8);
 		gen_load(dc, tmp32, addr, 4, 0);
-	}
+	} else
+		TCGV_UNUSED(tmp32);
 	tcg_temp_free(addr);
 
 	for (i = 0; i < (nr >> 1); i++) {