diff --git a/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/src/BulletDynamics/ConstraintSolver/btSolverBody.h
index cab8a56a5..436879fea 100644
--- a/src/BulletDynamics/ConstraintSolver/btSolverBody.h
+++ b/src/BulletDynamics/ConstraintSolver/btSolverBody.h
@@ -24,13 +24,12 @@ class	btRigidBody;
 #include "LinearMath/btTransformUtil.h"
 
 ///Until we get other contributions, only use SIMD on Windows, when using Visual Studio 2008 or later, and not double precision
-#if (defined (WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION))
+#ifdef BT_USE_SSE
 #define USE_SIMD 1
 #endif //
 
 
 #ifdef USE_SIMD
-#include <emmintrin.h>
 
 struct	btSimdScalar
 {
diff --git a/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h b/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
index 459e406db..2ef57523d 100644
--- a/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
+++ b/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
@@ -21,7 +21,6 @@ class	btRigidBody;
 #include "LinearMath/btMatrix3x3.h"
 #include "btJacobianEntry.h"
 
-#include <emmintrin.h>
 //#define NO_FRICTION_TANGENTIALS 1
 #include "btSolverBody.h"
 
diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
index 8b7a6d13f..bd2f373ee 100644
--- a/src/LinearMath/btScalar.h
+++ b/src/LinearMath/btScalar.h
@@ -62,6 +62,8 @@ inline int	btGetVersion()
  			#define btFsel(a,b,c) __fsel((a),(b),(c))
 		#else
 			#define BT_USE_SSE
+		#include <emmintrin.h>
+
 		#endif
 		#endif //__MINGW32__
 
diff --git a/src/LinearMath/btVector3.h b/src/LinearMath/btVector3.h
index 10a5af108..c03cd2038 100644
--- a/src/LinearMath/btVector3.h
+++ b/src/LinearMath/btVector3.h
@@ -21,7 +21,6 @@ subject to the following restrictions:
 #include "btScalar.h"
 #include "btScalar.h"
 #include "btMinMax.h"
-#include <emmintrin.h>
 /**@brief btVector3 can be used to represent 3D points and vectors.
  * It has an un-used w component to suit 16-byte alignment when btVector3 is stored in containers. This extra component can be used by derived classes (Quaternion?) or by user
  * Ideally, this class should be replaced by a platform optimized SIMD version that keeps the data in registers
@@ -43,7 +42,7 @@ public:
 	}
 public:
 #else //__CELLOS_LV2__ __SPU__
-#ifdef WIN32
+#ifdef BT_USE_SSE // WIN32
 	union {
 		__m128 mVec128;
 		btScalar	m_floats[4];