diff --git a/src/cpu_common/x87_ops.h b/src/cpu_common/x87_ops.h
index 1cb50a9fc..061a23019 100644
--- a/src/cpu_common/x87_ops.h
+++ b/src/cpu_common/x87_ops.h
@@ -411,7 +411,7 @@ static __inline uint16_t x87_compare(double a, double b)
 
 static __inline uint16_t x87_ucompare(double a, double b)
 {
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32 || defined __amd64__
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_AMD64 || defined __amd64__
         uint32_t result;
         
 #ifndef _MSC_VER
diff --git a/src/cpu_new/codegen_backend.h b/src/cpu_new/codegen_backend.h
index 89beeee1c..acbdab838 100644
--- a/src/cpu_new/codegen_backend.h
+++ b/src/cpu_new/codegen_backend.h
@@ -3,7 +3,7 @@
 
 #if defined __amd64__
 #include "codegen_backend_x86-64.h"
-#elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 #include "codegen_backend_x86.h"
 #elif defined __ARM_EABI__
 #include "codegen_backend_arm.h"
diff --git a/src/cpu_new/codegen_backend_x86.c b/src/cpu_new/codegen_backend_x86.c
index 5ac56923b..1e22caa2e 100644
--- a/src/cpu_new/codegen_backend_x86.c
+++ b/src/cpu_new/codegen_backend_x86.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/cpu_new/codegen_backend_x86_ops.c b/src/cpu_new/codegen_backend_x86_ops.c
index 0c2b3870f..3d71cc081 100644
--- a/src/cpu_new/codegen_backend_x86_ops.c
+++ b/src/cpu_new/codegen_backend_x86_ops.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/cpu_new/codegen_backend_x86_ops_fpu.c b/src/cpu_new/codegen_backend_x86_ops_fpu.c
index 07bcb3e74..cb8f36ac6 100644
--- a/src/cpu_new/codegen_backend_x86_ops_fpu.c
+++ b/src/cpu_new/codegen_backend_x86_ops_fpu.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/cpu_new/codegen_backend_x86_ops_sse.c b/src/cpu_new/codegen_backend_x86_ops_sse.c
index ab292283e..0ab461e74 100644
--- a/src/cpu_new/codegen_backend_x86_ops_sse.c
+++ b/src/cpu_new/codegen_backend_x86_ops_sse.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/cpu_new/codegen_backend_x86_uops.c b/src/cpu_new/codegen_backend_x86_uops.c
index 04fdb7cdf..43737560c 100644
--- a/src/cpu_new/codegen_backend_x86_uops.c
+++ b/src/cpu_new/codegen_backend_x86_uops.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 
 #include <stdint.h>
 #include <86box/86box.h>