diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index 93f745a1d..50a3b627b 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18  Billy Biggs  <vektor@dumbterm.net>
+
+	* src/fbmmx.c: Only include xmmintrin.h if USE_SSE is defined.
+
 2005-09-15  Billy Biggs  <vektor@dumbterm.net>
 
 	Bug #4414, reviewed by otaylor, cworth.
diff --git a/pixman/src/fbmmx.c b/pixman/src/fbmmx.c
index 0e18f4210..2ba7d8b15 100644
--- a/pixman/src/fbmmx.c
+++ b/pixman/src/fbmmx.c
@@ -44,7 +44,9 @@
 #endif
 
 #include <mmintrin.h>
+#ifdef USE_SSE
 #include <xmmintrin.h> /* for _mm_shuffle_pi16 and _MM_SHUFFLE */
+#endif
 
 #ifdef RENDER