diff --git a/include/uc_priv.h b/include/uc_priv.h
index 9264dfc5..c3a3e1c2 100644
--- a/include/uc_priv.h
+++ b/include/uc_priv.h
@@ -195,6 +195,9 @@ struct uc_struct {
     BounceBuffer bounce;
     CPUState *tcg_current_rr_cpu;
 
+    // qemu/user-exec.c
+    QEMU_THREAD_LOCAL_VAR helper_retaddr;
+
     // qemu/memory.c
     bool global_dirty_log;
 
diff --git a/qemu/cputlb.c b/qemu/cputlb.c
index 60f52900..cb2d926f 100644
--- a/qemu/cputlb.c
+++ b/qemu/cputlb.c
@@ -666,6 +666,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr,
 #define ATOMIC_NAME(X) \
     HELPER(glue(glue(glue(atomic_ ## X, SUFFIX), END), _mmu))
 #define ATOMIC_MMU_LOOKUP  atomic_mmu_lookup(env, addr, oi, retaddr)
+#define ATOMIC_MMU_CLEANUP do { } while (0)
 
 #define DATA_SIZE 1
 #include "atomic_template.h"