diff --git a/src/cpu/386_ops.h b/src/cpu/386_ops.h
index 1dccc2a29..acfbb8532 100644
--- a/src/cpu/386_ops.h
+++ b/src/cpu/386_ops.h
@@ -170,7 +170,9 @@ extern void	x386_dynarec_log(const char *fmt, ...);
 #include "x86_ops_bcd.h"
 #include "x86_ops_bit.h"
 #include "x86_ops_bitscan.h"
+#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
 #include "x86_ops_cyrix.h"
+#endif
 #include "x86_ops_flag.h"
 #include "x86_ops_fpu.h"
 #include "x86_ops_inc_dec.h"
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 708387b38..a42d50a02 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -414,11 +414,10 @@ cpu_set(void)
 	/* The Samuel 2 datasheet claims it's Celeron-compatible. */
 	is_p6       |= (cpu_s->cpu_type == CPU_CYRIX3S);
 #if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
-        is_cx6x86    = (cpu_s->cpu_type == CPU_PENTIUMPRO) || (cpu_s->cpu_type == CPU_PENTIUM2) ||
-		       (cpu_s->cpu_type == CPU_PENTIUM2D);
-#else
 	is_cx6x86    = (cpu_s->cpu_type == CPU_Cx6x86) || (cpu_s->cpu_type == CPU_Cx6x86MX) ||
 		       (cpu_s->cpu_type == CPU_Cx6x86L) || (cpu_s->cpu_type == CPU_CxGX1);
+#else
+	is_cx6x86    = 0;
 #endif
         hasfpu       = (fpu_type != FPU_NONE);
 	hascache     = (cpu_s->cpu_type >= CPU_486SLC) || (cpu_s->cpu_type == CPU_IBM386SLC || cpu_s->cpu_type == CPU_IBM486SLC || cpu_s->cpu_type == CPU_IBM486BL);
diff --git a/src/cpu/x86_ops_mmx_mov.h b/src/cpu/x86_ops_mmx_mov.h
index a980c6b9a..07d21d418 100644
--- a/src/cpu/x86_ops_mmx_mov.h
+++ b/src/cpu/x86_ops_mmx_mov.h
@@ -86,6 +86,7 @@ static int opMOVD_mm_l_a32(uint32_t fetchdat)
         return 0;
 }
 
+#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
 /*Cyrix maps both MOVD and SMINT to the same opcode*/
 static int opMOVD_mm_l_a16_cx(uint32_t fetchdat)
 {
@@ -131,6 +132,7 @@ static int opMOVD_mm_l_a32_cx(uint32_t fetchdat)
         }
         return 0;
 }
+#endif
 
 static int opMOVQ_q_mm_a16(uint32_t fetchdat)
 {