diff --git a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
index 78209a11b..84fcce018 100644
--- a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
+++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -32,7 +32,7 @@ subject to the following restrictions:
 #include "btSolverBody.h"
 #include "btSolverConstraint.h"
 #include "LinearMath/btAlignedObjectArray.h"
-
+#include <string.h> //for memset
 
 btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver()
 :m_btSeed2(0)
diff --git a/src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp b/src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
index 23104fbea..67cb7d813 100644
--- a/src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
+++ b/src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
@@ -1,3 +1,5 @@
+#ifdef CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008
+
 /*
 Bullet Continuous Collision Detection and Physics Library - Parallel solver
 Copyright (c) 2007 Starbreeze Studios
@@ -1963,3 +1965,5 @@ void processSolverTask(void* userPtr, void* lsMemory)
 //		btAssert(0);
 	}
 }
+
+#endif //CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008
\ No newline at end of file
diff --git a/src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h b/src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h
index 4e4728ca6..e402b2c30 100644
--- a/src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h
+++ b/src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h
@@ -1,3 +1,4 @@
+#ifdef CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008
 /*
 Bullet Continuous Collision Detection and Physics Library - Parallel solver
 Copyright (c) 2007 Starbreeze Studios
@@ -248,3 +249,5 @@ inline bool constraintTypeSupported(btTypedConstraintType type)
 }
 
 #endif
+
+#endif //CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008
\ No newline at end of file