--- hatari/src/uae-cpu/newcpu.h	2019/04/09 08:57:03	1.1.1.17
+++ hatari/src/uae-cpu/newcpu.h	2019/04/09 08:59:34	1.1.1.18
@@ -121,6 +121,7 @@ extern struct regstruct
     uae_u32 instruction_pc;
 
     uae_u32 vbr,sfc,dfc;
+    uae_u32 caar, cacr;
 
     fptype fp[8];
     fptype fp_result;
@@ -164,6 +165,8 @@ STATIC_INLINE uaecptr m68k_getpc_p (uae_
     return regs.pc + ((char *)p - (char *)regs.pc_oldp);
 }
 
+#define M68K_GETPC m68k_getpc()
+
 #define get_ibyte(o) do_get_mem_byte(regs.pc_p + (o) + 1)
 #define get_iword(o) do_get_mem_word(regs.pc_p + (o))
 #define get_ilong(o) do_get_mem_long(regs.pc_p + (o))
@@ -387,7 +390,6 @@ extern const struct cputbl op_smalltbl_5
 
 extern cpuop_func *cpufunctbl[65536];
 
-extern uae_u32 caar, cacr;
 
 /* Family of the latest instruction executed (to check for pairing) */
 extern int OpcodeFamily;			/* see instrmnem in readcpu.h */