diff --git a/src/codegen/codegen_x86-64.c b/src/codegen/codegen_x86-64.c
index 4385dd7d9..b295c251e 100644
--- a/src/codegen/codegen_x86-64.c
+++ b/src/codegen/codegen_x86-64.c
@@ -1,4 +1,4 @@
-#ifdef __amd64__
+#if defined __amd64__ || defined _M_X64
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/codegen/codegen_x86.c b/src/codegen/codegen_x86.c
index 31b3202e6..beb245963 100644
--- a/src/codegen/codegen_x86.c
+++ b/src/codegen/codegen_x86.c
@@ -36,7 +36,7 @@
  *   Boston, MA 02111-1307
  *   USA.
  */
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/codegen_new/codegen_allocator.c b/src/codegen_new/codegen_allocator.c
index 9f46a8354..26eb24852 100644
--- a/src/codegen_new/codegen_allocator.c
+++ b/src/codegen_new/codegen_allocator.c
@@ -112,7 +112,7 @@ uint8_t *codeblock_allocator_get_ptr(mem_block_t *block)
 
 void codegen_allocator_clean_blocks(struct mem_block_t *block)
 {
-#if defined __ARM_EABI__ || defined _ARM_ || defined __aarch64__
+#if defined __ARM_EABI__ || defined _ARM_ || defined __aarch64__ || defined _M_ARM || defined _M_ARM64
         while (1)
         {
 		__clear_cache(&mem_block_alloc[block->offset], &mem_block_alloc[block->offset + MEM_BLOCK_SIZE]);
diff --git a/src/codegen_new/codegen_allocator.h b/src/codegen_new/codegen_allocator.h
index 3b57de166..6cd42258b 100644
--- a/src/codegen_new/codegen_allocator.h
+++ b/src/codegen_new/codegen_allocator.h
@@ -13,7 +13,7 @@
   Due to the chaining, the total memory size is limited by the range of a jump
   instruction. ARMv7 is restricted to +/- 32 MB, ARMv8 to +/- 128 MB, x86 to
   +/- 2GB. As a result, total memory size is limited to 32 MB on ARMv7*/
-#if defined __ARM_EABI__ || _ARM_
+#if defined __ARM_EABI__ || defined _ARM_ || defined _M_ARM
 #define MEM_BLOCK_NR 32768
 #else
 #define MEM_BLOCK_NR 131072
diff --git a/src/codegen_new/codegen_backend_arm.c b/src/codegen_new/codegen_backend_arm.c
index 06a06b78e..f423f72d8 100644
--- a/src/codegen_new/codegen_backend_arm.c
+++ b/src/codegen_new/codegen_backend_arm.c
@@ -1,4 +1,4 @@
-#if defined __ARM_EABI__ || defined _ARM_
+#if defined __ARM_EABI__ || defined _ARM_ || defined _M_ARM
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/codegen_new/codegen_backend_arm64.c b/src/codegen_new/codegen_backend_arm64.c
index 5f2550e23..6571a0ad3 100644
--- a/src/codegen_new/codegen_backend_arm64.c
+++ b/src/codegen_new/codegen_backend_arm64.c
@@ -1,4 +1,4 @@
-#ifdef __aarch64__
+#if defined __aarch64__ || defined _M_ARM64
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/codegen_new/codegen_backend_arm64_ops.c b/src/codegen_new/codegen_backend_arm64_ops.c
index 3f64b8d4e..a33062299 100644
--- a/src/codegen_new/codegen_backend_arm64_ops.c
+++ b/src/codegen_new/codegen_backend_arm64_ops.c
@@ -1,4 +1,4 @@
-#ifdef __aarch64__
+#if defined __aarch64__ || defined _M_ARM64
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/codegen_new/codegen_backend_arm64_uops.c b/src/codegen_new/codegen_backend_arm64_uops.c
index 5710b8902..7e26cdcf1 100644
--- a/src/codegen_new/codegen_backend_arm64_uops.c
+++ b/src/codegen_new/codegen_backend_arm64_uops.c
@@ -1,4 +1,4 @@
-#ifdef __aarch64__
+#if defined __aarch64__ || defined _M_ARM64
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/codegen_new/codegen_backend_arm_ops.c b/src/codegen_new/codegen_backend_arm_ops.c
index 65e48cd46..43d1ea090 100644
--- a/src/codegen_new/codegen_backend_arm_ops.c
+++ b/src/codegen_new/codegen_backend_arm_ops.c
@@ -1,4 +1,4 @@
-#if defined __ARM_EABI__ || defined _ARM_
+#if defined __ARM_EABI__ || defined _ARM_ || defined _M_ARM
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/codegen_new/codegen_backend_arm_uops.c b/src/codegen_new/codegen_backend_arm_uops.c
index fd17e78d8..eff83a6f8 100644
--- a/src/codegen_new/codegen_backend_arm_uops.c
+++ b/src/codegen_new/codegen_backend_arm_uops.c
@@ -1,4 +1,4 @@
-#if defined __ARM_EABI__ || defined _ARM_
+#if defined __ARM_EABI__ || defined _ARM_ || defined _M_ARM
 
 #include <math.h>
 #include <stdint.h>
diff --git a/src/codegen_new/codegen_backend_x86-64.c b/src/codegen_new/codegen_backend_x86-64.c
index aedf29496..7cdfcd1d3 100644
--- a/src/codegen_new/codegen_backend_x86-64.c
+++ b/src/codegen_new/codegen_backend_x86-64.c
@@ -1,4 +1,4 @@
-#ifdef __amd64__
+#if defined __amd64__ || defined _M_X64
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/codegen_new/codegen_backend_x86-64_ops.c b/src/codegen_new/codegen_backend_x86-64_ops.c
index 89d065498..784bfa03d 100644
--- a/src/codegen_new/codegen_backend_x86-64_ops.c
+++ b/src/codegen_new/codegen_backend_x86-64_ops.c
@@ -1,4 +1,4 @@
-#ifdef __amd64__
+#if defined __amd64__ || defined _M_X64
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/codegen_new/codegen_backend_x86-64_ops_sse.c b/src/codegen_new/codegen_backend_x86-64_ops_sse.c
index 00ffb2db3..e2a4e7044 100644
--- a/src/codegen_new/codegen_backend_x86-64_ops_sse.c
+++ b/src/codegen_new/codegen_backend_x86-64_ops_sse.c
@@ -1,4 +1,4 @@
-#ifdef __amd64__
+#if defined __amd64__ || defined _M_X64
 
 #include <stdint.h>
 #include <86box/86box.h>
diff --git a/src/codegen_new/codegen_backend_x86-64_uops.c b/src/codegen_new/codegen_backend_x86-64_uops.c
index cca21a4dd..8ac9251e5 100644
--- a/src/codegen_new/codegen_backend_x86-64_uops.c
+++ b/src/codegen_new/codegen_backend_x86-64_uops.c
@@ -1,4 +1,4 @@
-#ifdef __amd64__
+#if defined __amd64__ || defined _M_X64
 
 #include <stdint.h>
 #include <86box/86box.h>