diff --git a/src/cpu/x87_ops.h b/src/cpu/x87_ops.h
index 1e4504949..e581652d4 100644
--- a/src/cpu/x87_ops.h
+++ b/src/cpu/x87_ops.h
@@ -22,16 +22,12 @@
  */
 #include <math.h>
 #include <fenv.h>
-#if defined(_MSC_VER) && !defined(__clang__)
-#    if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
+
+#if defined _M_X64 || defined __amd64__
 #        define X87_INLINE_ASM
-#    endif
-#else
-#    if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64 || defined __amd64__
-#        define X87_INLINE_ASM
-#    endif
 #endif
 
+
 #ifdef X87_INLINE_ASM
 #include <immintrin.h>
 #endif
diff --git a/src/floppy/lzf/lzf_d.c b/src/floppy/lzf/lzf_d.c
index f838ba674..cda3e8c8f 100644
--- a/src/floppy/lzf/lzf_d.c
+++ b/src/floppy/lzf/lzf_d.c
@@ -44,7 +44,7 @@
 #endif
 
 #if USE_REP_MOVSB /* small win on amd, big loss on intel */
-#if (__i386 || __amd64) && __GNUC__ >= 3
+#if (__amd64) && __GNUC__ >= 3
 # define lzf_movsb(dst, src, len)                \
    asm ("rep movsb"                              \
         : "=D" (dst), "=S" (src), "=c" (len)     \
diff --git a/src/include/86box/bswap.h b/src/include/86box/bswap.h
index 61a6a46a2..0c32a7887 100644
--- a/src/include/86box/bswap.h
+++ b/src/include/86box/bswap.h
@@ -163,7 +163,7 @@ CPU_CONVERT(le, 64, uint64_t)
 
 /* unaligned versions (optimized for frequent unaligned accesses)*/
 
-#if defined(__i386__) || defined(__powerpc__)
+#if defined(__powerpc__)
 #    define cpu_to_le16wu(p, v) cpu_to_le16w(p, v)
 #    define cpu_to_le32wu(p, v) cpu_to_le32w(p, v)
 #    define le16_to_cpupu(p)    le16_to_cpup(p)
diff --git a/src/utils/random.c b/src/utils/random.c
index 392cad52f..58abb15eb 100644
--- a/src/utils/random.c
+++ b/src/utils/random.c
@@ -50,7 +50,7 @@ rotr32c(uint32_t x, uint32_t n)
 static __inline unsigned long long
 rdtsc(void)
 {
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
     unsigned int hi;
     unsigned int lo;
 #    ifdef _MSC_VER