diff --git a/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
index 463792b58..5ded3c2c2 100644
--- a/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
+++ b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
@@ -292,7 +292,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 
 	//traverse the simulation islands, and call the solver, unless all objects are sleeping/deactivated
-	for (int startIslandIndex=0;startIslandIndex<numElem;startIslandIndex = endIslandIndex)
+	for ( startIslandIndex=0;startIslandIndex<numElem;startIslandIndex = endIslandIndex)
 	{
 		int islandId = getUnionFind().getElement(startIslandIndex).m_id;
 
diff --git a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
index 3658530b0..1565fa8fb 100644
--- a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
+++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -723,7 +723,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 		}
 	}
 		
-	for (int i=0;i<tmpSolverBodyPool.size();i++)
+	for ( i=0;i<tmpSolverBodyPool.size();i++)
 	{
 		tmpSolverBodyPool[i].writebackVelocity();
 	}
diff --git a/src/LinearMath/btAlignedAllocator.cpp b/src/LinearMath/btAlignedAllocator.cpp
index ed7e3a282..b78607713 100644
--- a/src/LinearMath/btAlignedAllocator.cpp
+++ b/src/LinearMath/btAlignedAllocator.cpp
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #include "btAlignedAllocator.h"
 
 
-#if defined (WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if defined (BT_HAS_ALIGNED_ALOCATOR)
 
 #include <malloc.h>
 void*	btAlignedAlloc	(int size, int alignment)
diff --git a/src/LinearMath/btAlignedAllocator.h b/src/LinearMath/btAlignedAllocator.h
index d2165b4b4..4fababd96 100644
--- a/src/LinearMath/btAlignedAllocator.h
+++ b/src/LinearMath/btAlignedAllocator.h
@@ -36,11 +36,13 @@ class btAlignedAllocator {
 	typedef btAlignedAllocator< T , Alignment > self_type;
 	
 public:
+
 	//just going down a list:
 	btAlignedAllocator() {}
-	
+	/*
 	btAlignedAllocator( const self_type & ) {}
-	
+	*/
+
 	template < typename Other >
 	btAlignedAllocator( const btAlignedAllocator< Other , Alignment > & ) {}
 
diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
index 8fa49a593..67c82c211 100644
--- a/src/LinearMath/btScalar.h
+++ b/src/LinearMath/btScalar.h
@@ -25,10 +25,11 @@ subject to the following restrictions:
 
 #ifdef WIN32
 
-		#if defined(__MINGW32__) || defined(__CYGWIN__)
+		#if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300)
 			#define SIMD_FORCE_INLINE inline
 			#define ATTRIBUTE_ALIGNED16(a) a
 		#else
+			#define BT_HAS_ALIGNED_ALOCATOR
 			#pragma warning(disable:4530)
 			#pragma warning(disable:4996)
 			#pragma warning(disable:4786)