diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c
index 5a453488..ec9704a7 100644
--- a/src/libFLAC/cpu.c
+++ b/src/libFLAC/cpu.c
@@ -430,8 +430,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
 #endif
 }
 
-#if defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64
-#ifdef FLAC__HAS_X86INTRIN
+#if defined FLAC__CPU_X86_64 && defined  FLAC__HAS_X86INTRIN
 
 #if defined _MSC_VER && (_MSC_VER >= 1400)
 #include <intrin.h> /* for __cpuid() */
@@ -457,5 +456,4 @@ void FLAC__cpu_info_x86(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx)
 		*flags_ecx = *flags_edx = 0;
 #endif
 }
-#endif /* FLAC__HAS_X86INTRIN */
-#endif /* FLAC__CPU_IA32 || FLAC__CPU_X86_64 */
+#endif /* FLAC__HAS_X86INTRIN && FLAC__CPU_X86_64 */
diff --git a/src/libFLAC/include/private/cpu.h b/src/libFLAC/include/private/cpu.h
index 90bf9469..9501694c 100644
--- a/src/libFLAC/include/private/cpu.h
+++ b/src/libFLAC/include/private/cpu.h
@@ -85,19 +85,15 @@ void FLAC__cpu_info(FLAC__CPUInfo *info);
 
 #ifndef FLAC__NO_ASM
 
-#ifdef FLAC__CPU_IA32
-#ifdef FLAC__HAS_NASM
+#if defined FLAC__CPU_IA32 && defined FLAC__HAS_NASM
 FLAC__uint32 FLAC__cpu_have_cpuid_asm_ia32(void);
 void         FLAC__cpu_info_asm_ia32(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx);
 FLAC__uint32 FLAC__cpu_info_extended_amd_asm_ia32(void);
 #endif
-#endif
 
-#if defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64
-#ifdef FLAC__HAS_X86INTRIN
+#if defined FLAC__CPU_X86_64 && defined  FLAC__HAS_X86INTRIN
 void FLAC__cpu_info_x86(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx);
 #endif
-#endif
 
 #endif
 
diff --git a/src/libFLAC/lpc_x86intrin.c b/src/libFLAC/lpc_x86intrin.c
index 1bd3cd65..b16f3a5f 100644
--- a/src/libFLAC/lpc_x86intrin.c
+++ b/src/libFLAC/lpc_x86intrin.c
@@ -36,8 +36,7 @@
 
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
 #ifndef FLAC__NO_ASM
-#if defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64
-#ifdef FLAC__HAS_X86INTRIN
+#if defined FLAC__CPU_X86_64 && defined FLAC__HAS_X86INTRIN
 
 #include "FLAC/assert.h"
 #include "FLAC/format.h"
@@ -562,7 +561,6 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2(const FLAC_
 	}
 }
 
-#endif /* FLAC__HAS_X86INTRIN */
-#endif /* FLAC__CPU_IA32 || FLAC__CPU_X86_64 */
+#endif /* FLAC__CPU_X86_64 && FLAC__HAS_X86INTRIN */
 #endif /* FLAC__NO_ASM */
 #endif /* FLAC__INTEGER_ONLY_LIBRARY */