diff --git a/source/graphics/Color.cpp b/source/graphics/Color.cpp
index 0bbee11fe1..b36707bfc9 100644
--- a/source/graphics/Color.cpp
+++ b/source/graphics/Color.cpp
@@ -26,7 +26,7 @@
 #include "maths/MathUtil.h"
 #include "graphics/SColor.h"
 
-#if ARCH_X86_X64
+#if HAVE_SSE
 # include <xmmintrin.h>
 # include "lib/sysdep/arch/x86_x64/x86_x64.h"
 #endif
@@ -46,7 +46,7 @@ SColor4ub (*ConvertRGBColorTo4ub)(const RGBColor& src) = fallback_ConvertRGBColo
 
 
 // Assembler-optimized function for color conversion
-#if ARCH_X86_X64
+#if HAVE_SSE
 static SColor4ub sse_ConvertRGBColorTo4ub(const RGBColor& src)
 {
 	const __m128 zero = _mm_setzero_ps();
@@ -82,7 +82,7 @@ void ColorActivateFastImpl()
 	if(0)
 	{
 	}
-#if ARCH_X86_X64
+#if HAVE_SSE
 	else if (x86_x64::Cap(x86_x64::CAP_SSE))
 	{
 		ConvertRGBColorTo4ub = sse_ConvertRGBColorTo4ub;
diff --git a/source/graphics/ModelDef.cpp b/source/graphics/ModelDef.cpp
index e6c092365a..628ec4bc66 100644
--- a/source/graphics/ModelDef.cpp
+++ b/source/graphics/ModelDef.cpp
@@ -26,7 +26,7 @@
 #include "ps/FileIo.h"
 #include "maths/Vector4D.h"
 
-#if ARCH_X86_X64
+#if HAVE_SSE
 # include <xmmintrin.h>
 #endif
 
@@ -121,7 +121,7 @@ void CModelDef::SkinPointsAndNormals(
 	}
 }
 
-#if ARCH_X86_X64
+#if HAVE_SSE
 void CModelDef::SkinPointsAndNormals_SSE(
 		size_t numVertices,
 		const VertexArrayIterator<CVector3D>& Position,
diff --git a/source/graphics/ModelDef.h b/source/graphics/ModelDef.h
index ea5f3442e9..0cd1c05913 100644
--- a/source/graphics/ModelDef.h
+++ b/source/graphics/ModelDef.h
@@ -216,7 +216,7 @@ public:
 		const size_t* blendIndices,
 		const CMatrix3D newPoseMatrices[]);
 
-#if ARCH_X86_X64
+#if HAVE_SSE
 	/**
 	 * SSE-optimised version of SkinPointsAndNormals.
 	 */
diff --git a/source/renderer/ModelRenderer.cpp b/source/renderer/ModelRenderer.cpp
index 1cfaa43774..a666dab0b9 100644
--- a/source/renderer/ModelRenderer.cpp
+++ b/source/renderer/ModelRenderer.cpp
@@ -101,7 +101,7 @@ void ModelRenderer::BuildPositionAndNormals(
 			return;
 		}
 
-#if ARCH_X86_X64
+#if HAVE_SSE
 		if (g_EnableSSE)
 		{
 			CModelDef::SkinPointsAndNormals_SSE(numVertices, Position, Normal, vertices, mdef->GetBlendIndices(), model->GetAnimatedBoneMatrices());