diff --git a/Demos/ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp b/Demos/ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
index d0bc6a70a..d776ce11b 100644
--- a/Demos/ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
+++ b/Demos/ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
@@ -216,7 +216,8 @@ public:
 		glDisable (GL_LIGHTING);
 		glColor3f (0.0, 1.0, 0.0);
 		glBegin (GL_LINES);
-		for (int i = 0; i < NUMRAYS_IN_BAR; i++)
+		int i;
+		for (i = 0; i < NUMRAYS_IN_BAR; i++)
 		{
 			glVertex3f (source[i][0], source[i][1], source[i][2]);
 			glVertex3f (hit_com[i][0], hit_com[i][1], hit_com[i][2]);
@@ -224,7 +225,7 @@ public:
 		glColor3f (1.0, 1.0, 1.0);
 		glBegin (GL_LINES);
 		btScalar normal_scale = 10.0; // easier to see if this is big
-		for (int i = 0; i < NUMRAYS_IN_BAR; i++)
+		for (i = 0; i < NUMRAYS_IN_BAR; i++)
 		{
 			glVertex3f (hit_surface[i][0], hit_surface[i][1], hit_surface[i][2]);
 			glVertex3f (hit_surface[i][0] + normal_scale * normal[i][0], hit_surface[i][1] + normal_scale * normal[i][1], hit_surface[i][2] + normal_scale * normal[i][2]);
@@ -235,7 +236,7 @@ public:
 		btQuaternion qTo;
 		qFrom.setRotation (btVector3(1.0, 0.0, 0.0), 0.0);
 		qTo.setRotation (btVector3(1.0, 0.0, 0.0), 0.7);
-		for (int i = 0; i < NUMRAYS_IN_BAR; i++)
+		for ( i = 0; i < NUMRAYS_IN_BAR; i++)
 		{
 			btTransform from(qFrom, source[i]);
 			btTransform to(qTo, dest[i]);
diff --git a/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp b/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
index 83ef2c218..b3d7c7106 100644
--- a/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
+++ b/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
@@ -215,7 +215,9 @@ public:
 		glDisable (GL_LIGHTING);
 		glColor3f (0.0, 1.0, 0.0);
 		glBegin (GL_LINES);
-		for (int i = 0; i < NUMRAYS_IN_BAR; i++)
+		int i;
+
+		for (i = 0; i < NUMRAYS_IN_BAR; i++)
 		{
 			glVertex3f (source[i][0], source[i][1], source[i][2]);
 			glVertex3f (hit[i][0], hit[i][1], hit[i][2]);
@@ -223,7 +225,7 @@ public:
 		glEnd ();
 		glColor3f (1.0, 1.0, 1.0);
 		glBegin (GL_LINES);
-		for (int i = 0; i < NUMRAYS_IN_BAR; i++)
+		for (i = 0; i < NUMRAYS_IN_BAR; i++)
 		{
 			glVertex3f (hit[i][0], hit[i][1], hit[i][2]);
 			glVertex3f (hit[i][0] + normal[i][0], hit[i][1] + normal[i][1], hit[i][2] + normal[i][2]);
@@ -231,7 +233,7 @@ public:
 		glEnd ();
 		glColor3f (0.0, 1.0, 1.0);
 		glBegin (GL_POINTS);
-		for (int i = 0; i < NUMRAYS_IN_BAR; i++)
+		for ( i = 0; i < NUMRAYS_IN_BAR; i++)
 		{
 			glVertex3f (hit[i][0], hit[i][1], hit[i][2]);
 		}
diff --git a/Demos/DynamicControlDemo/MotorDemo.cpp b/Demos/DynamicControlDemo/MotorDemo.cpp
index 3c22750f8..bf73f14f5 100644
--- a/Demos/DynamicControlDemo/MotorDemo.cpp
+++ b/Demos/DynamicControlDemo/MotorDemo.cpp
@@ -118,7 +118,8 @@ public:
 		float fLegLength = 0.45f;
 		float fForeLegLength = 0.75f;
 		m_shapes[0] = new btCapsuleShape(btScalar(fBodySize), btScalar(0.10));
-		for (int i=0; i<NUM_LEGS; i++)
+		int i;
+		for ( i=0; i<NUM_LEGS; i++)
 		{
 			m_shapes[1 + 2*i] = new btCapsuleShape(btScalar(0.10), btScalar(fLegLength));
 			m_shapes[2 + 2*i] = new btCapsuleShape(btScalar(0.08), btScalar(fForeLegLength));
@@ -144,7 +145,7 @@ public:
 			m_bodies[0] = localCreateRigidBody(btScalar(1.), offset*transform, m_shapes[0]);
 		}
 		// legs
-		for (int i=0; i<NUM_LEGS; i++)
+		for ( i=0; i<NUM_LEGS; i++)
 		{
 			float fAngle = 2 * M_PI * i / NUM_LEGS;
 			float fSin = sin(fAngle);
@@ -167,7 +168,7 @@ public:
 		}
 
 		// Setup some damping on the m_bodies
-		for (int i = 0; i < BODYPART_COUNT; ++i)
+		for (i = 0; i < BODYPART_COUNT; ++i)
 		{
 			m_bodies[i]->setDamping(0.05, 0.85);
 			m_bodies[i]->setDeactivationTime(0.8);
@@ -184,7 +185,7 @@ public:
 
 		btTransform localA, localB, localC;
 
-		for (int i=0; i<NUM_LEGS; i++)
+		for ( i=0; i<NUM_LEGS; i++)
 		{
 			float fAngle = 2 * M_PI * i / NUM_LEGS;
 			float fSin = sin(fAngle);
diff --git a/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp b/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
index f618c9f06..4dc61e903 100644
--- a/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
+++ b/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
@@ -377,7 +377,7 @@ m_threadSupportCollision = new Win32ThreadSupport(Win32ThreadSupport::Win32Threa
 	float wallDistance = 3;
 
 
-	for (int i=0;i<numWalls;i++)
+	for ( i=0;i<numWalls;i++)
 	{
 		float zPos = (i-numWalls/2) * wallDistance;
 		createStack(m_collisionShapes[shapeIndex[1]],halfExtents,wallHeight,zPos);
diff --git a/src/BulletCollision/CollisionShapes/btShapeHull.cpp b/src/BulletCollision/CollisionShapes/btShapeHull.cpp
index 837eb8949..2fc8e3282 100644
--- a/src/BulletCollision/CollisionShapes/btShapeHull.cpp
+++ b/src/BulletCollision/CollisionShapes/btShapeHull.cpp
@@ -126,13 +126,15 @@ btShapeHull::buildHull (btScalar margin)
 	}
 
 	m_vertices.resize (hr.mNumOutputVertices);
-	for (unsigned int i = 0; i < hr.mNumOutputVertices; i++)
+
+
+	for (i = 0; i < hr.mNumOutputVertices; i++)
 	{
 		m_vertices[i] = hr.mOutputVertices[i];
 	}
 	m_numIndices = hr.mNumIndices;
 	m_indices = new unsigned int [m_numIndices];
-	for (unsigned int i = 0; i < m_numIndices; i++)
+	for (i = 0; i < m_numIndices; i++)
 	{
 		m_indices[i] = hr.mIndices[i];
 	}