diff --git a/Extras/AlgebraicCCD/BU_AlgebraicPolynomialSolver.cpp b/Extras/AlgebraicCCD/BU_AlgebraicPolynomialSolver.cpp
index 735e36ad0..e547079cb 100644
--- a/Extras/AlgebraicCCD/BU_AlgebraicPolynomialSolver.cpp
+++ b/Extras/AlgebraicCCD/BU_AlgebraicPolynomialSolver.cpp
@@ -16,7 +16,7 @@ subject to the following restrictions:
 
 #include "BU_AlgebraicPolynomialSolver.h"
 #include <math.h>
-#include <btSimdMinMax.h>
+#include <btMinMax.h>
 
 int BU_AlgebraicPolynomialSolver::Solve2Quadratic(btScalar p, btScalar q) 
 { 
diff --git a/Extras/AlgebraicCCD/BU_CollisionPair.cpp b/Extras/AlgebraicCCD/BU_CollisionPair.cpp
index 4b7a7b919..84dc6cd2b 100644
--- a/Extras/AlgebraicCCD/BU_CollisionPair.cpp
+++ b/Extras/AlgebraicCCD/BU_CollisionPair.cpp
@@ -23,7 +23,7 @@ subject to the following restrictions:
 
 #include "BU_MotionStateInterface.h"
 #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
-#include <btSimdMinMax.h>
+#include <btMinMax.h>
 #include "LinearMath/btTransformUtil.h"
 
 
diff --git a/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp b/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
index 60c7142a2..7b649f618 100644
--- a/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
+++ b/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
@@ -477,8 +477,8 @@ static void solveFriction (SpuSolverInternalConstraint& constraint, SpuSolverBod
 			j1 = -rel_vel * constraint.m_jacDiagABInv;
 			btScalar oldTangentImpulse = constraint.m_appliedImpulse;
 			constraint.m_appliedImpulse = oldTangentImpulse + j1;
-			GEN_set_min(constraint.m_appliedImpulse, limit);
-			GEN_set_max(constraint.m_appliedImpulse, -limit);
+			btSetMin(constraint.m_appliedImpulse, limit);
+			btSetMax(constraint.m_appliedImpulse, -limit);
 			j1 = constraint.m_appliedImpulse - oldTangentImpulse;
 
 		}
diff --git a/Extras/EPA/Epa.cpp b/Extras/EPA/Epa.cpp
index 80baaec6f..1d66540d6 100644
--- a/Extras/EPA/Epa.cpp
+++ b/Extras/EPA/Epa.cpp
@@ -19,7 +19,7 @@ subject to the following restrictions:
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btPoint3.h"
 #include "LinearMath/btTransform.h"
-#include "LinearMath/btSimdMinMax.h"
+#include "LinearMath/btMinMax.h"
 
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
 
diff --git a/Extras/EPA/EpaPenetrationDepthSolver.cpp b/Extras/EPA/EpaPenetrationDepthSolver.cpp
index 5d5feeea3..4cfe9ab6e 100644
--- a/Extras/EPA/EpaPenetrationDepthSolver.cpp
+++ b/Extras/EPA/EpaPenetrationDepthSolver.cpp
@@ -18,7 +18,7 @@ subject to the following restrictions:
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btPoint3.h"
 #include "LinearMath/btTransform.h"
-#include "LinearMath/btSimdMinMax.h"
+#include "LinearMath/btMinMax.h"
 
 #include <list>
 
diff --git a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
index 258ec8496..a8a2c4f67 100644
--- a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+++ b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
@@ -19,7 +19,7 @@ Written by: Marcus Hennix
 #include "btConeTwistConstraint.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 #include "LinearMath/btTransformUtil.h"
-#include "LinearMath/btSimdMinMax.h"
+#include "LinearMath/btMinMax.h"
 #include <new>
 
 btConeTwistConstraint::btConeTwistConstraint()
diff --git a/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
index 69ec0adc1..51a4e7da0 100644
--- a/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
+++ b/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
@@ -17,7 +17,7 @@ subject to the following restrictions:
 #include "btHingeConstraint.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 #include "LinearMath/btTransformUtil.h"
-#include "LinearMath/btSimdMinMax.h"
+#include "LinearMath/btMinMax.h"
 #include <new>