diff --git a/target-sparc/exec.h b/target-sparc/exec.h
index 8badf1a70cd28353590046c1a99f100bb1fad61e..e56b2c64ad4ca6d7448f667fc45cc31644211f76 100644
--- a/target-sparc/exec.h
+++ b/target-sparc/exec.h
@@ -56,11 +56,6 @@ void memcpy32(target_ulong *dst, const target_ulong *src);
 target_ulong mmu_probe(CPUState *env, target_ulong address, int mmulev);
 void dump_mmu(CPUState *env);
 
-/* XXX: move that to a generic header */
-#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
-#endif /* !defined(CONFIG_USER_ONLY) */
-
 static inline void env_to_regs(void)
 {
 #if defined(reg_REGWPTR)
diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c
index 70e72bb50c448856e8390023c189505ba12a45ef..13f6ac4c464caaf30d09677796329d4f2e668ce8 100644
--- a/target-sparc/op_helper.c
+++ b/target-sparc/op_helper.c
@@ -1,6 +1,9 @@
 #include "exec.h"
 #include "host-utils.h"
 #include "helper.h"
+#if !defined(CONFIG_USER_ONLY)
+#include "softmmu_exec.h"
+#endif /* !defined(CONFIG_USER_ONLY) */
 
 //#define DEBUG_PCALL
 //#define DEBUG_MMU