diff --git a/src/cpu/386.c b/src/cpu/386.c
index 1340b1479..6cec5ee43 100644
--- a/src/cpu/386.c
+++ b/src/cpu/386.c
@@ -93,12 +93,13 @@ x386_log(const char *fmt, ...)
 			cycles -= (c);\
 		}\
 	}
+
+#define CLOCK_CYCLES_FPU(c) cycles -= (c)
+#define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
 #else
 #define CLOCK_CYCLES(c) cycles -= (c)
 #endif
 
-#define CLOCK_CYCLES_FPU(c) cycles -= (c)
-#define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
 #define CLOCK_CYCLES_ALWAYS(c) cycles -= (c)
 
 #include "x86_ops.h"
diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c
index bb61cce88..c72da124b 100644
--- a/src/cpu/386_dynarec.c
+++ b/src/cpu/386_dynarec.c
@@ -279,11 +279,11 @@ static void prefetch_flush()
 			cycles -= (c);\
 		}\
 	}
+#define CLOCK_CYCLES_FPU(c) cycles -= (c)
+#define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
 #else
 #define CLOCK_CYCLES(c) cycles -= (c)
 #endif
-#define CLOCK_CYCLES_FPU(c) cycles -= (c)
-#define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
 #define CLOCK_CYCLES_ALWAYS(c) cycles -= (c)
 
 
diff --git a/src/cpu/386_dynarec_ops.c b/src/cpu/386_dynarec_ops.c
index 40aa2db80..c90673066 100644
--- a/src/cpu/386_dynarec_ops.c
+++ b/src/cpu/386_dynarec_ops.c
@@ -65,8 +65,10 @@ static __inline void fetch_ea_16_long(uint32_t rmdat)
 #define OP_TABLE(name) dynarec_ops_ ## name
 
 #define CLOCK_CYCLES(c)
+#if 0
 #define CLOCK_CYCLES_FPU(c)
 #define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
+#endif
 #define CLOCK_CYCLES_ALWAYS(c) cycles -= (c)
 
 #include "386_ops.h"
diff --git a/src/cpu/808x.c b/src/cpu/808x.c
index 827ec5b1c..191ff97cd 100644
--- a/src/cpu/808x.c
+++ b/src/cpu/808x.c
@@ -89,6 +89,7 @@ static int refresh = 0, cycdiff;
 		wait(val, 0);	\
 	}
 
+#if 0
 #define CLOCK_CYCLES_ALWAYS(val)		\
 	{			\
 		wait(val, 0);	\
@@ -113,6 +114,12 @@ static int refresh = 0, cycdiff;
 	}
 
 #define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
+#else
+#define CLOCK_CYCLES(val)		\
+	{			\
+		wait(val, 0);	\
+	}
+#endif
 
 
 typedef	int (*OpFn)(uint32_t fetchdat);