diff --git a/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj b/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj
index aedcbc35764..a2dcf685ed2 100644
--- a/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj
+++ b/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="ftgl_static_lib"
 	ProjectGUID="{F9850C15-FF0A-429E-9D47-89FB433C9BD8}"
 	SccProjectName=""
@@ -242,7 +242,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
index 60c6b02a924..a7782f71d55 100644
--- a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="Bullet3ContinuousCollision"
 	ProjectGUID="{FFD3C64A-30E2-4BC7-BC8F-51818C320400}"
 	SccProjectName=""
@@ -50,11 +50,13 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..\..
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 XCOPY /Y ..\..\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\Bullet\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 XCOPY /Y ..\..\Bullet\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 XCOPY /Y ..\..\Bullet\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+XCOPY /Y ..\..\Bullet\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 ECHO Done
 "/>
@@ -116,11 +118,13 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..\..
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 XCOPY /Y ..\..\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\Bullet\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 XCOPY /Y ..\..\Bullet\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 XCOPY /Y ..\..\Bullet\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+XCOPY /Y ..\..\Bullet\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 ECHO Done
 "/>
@@ -180,11 +184,13 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..\..
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 XCOPY /Y ..\..\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\Bullet\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 XCOPY /Y ..\..\Bullet\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 XCOPY /Y ..\..\Bullet\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+XCOPY /Y ..\..\Bullet\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 ECHO Done
 "/>
@@ -246,11 +252,13 @@ IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..\..
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 XCOPY /Y ..\..\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\Bullet\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BroadphaseCollision
 XCOPY /Y ..\..\Bullet\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionShapes
 XCOPY /Y ..\..\Bullet\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\NarrowPhaseCollision
+XCOPY /Y ..\..\Bullet\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 
 ECHO Done
 "/>
@@ -272,7 +280,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="NarrowPhaseCollision"
@@ -716,6 +725,9 @@ ECHO Done
 				<File
 					RelativePath="..\..\Bullet\NarrowPhaseCollision\BU_VertexPoly.h">
 				</File>
+				<File
+					RelativePath="..\..\Bullet\NarrowPhaseCollision\CollisionMargin.h">
+				</File>
 				<File
 					RelativePath="..\..\Bullet\NarrowPhaseCollision\ContinuousConvexCollision.h">
 				</File>
@@ -1240,6 +1252,9 @@ ECHO Done
 			<Filter
 				Name="Source Files"
 				Filter="">
+				<File
+					RelativePath="..\..\Bullet\BroadphaseCollision\AxisSweep3.cpp">
+				</File>
 				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\BroadphaseProxy.cpp">
 					<FileConfiguration
@@ -1295,31 +1310,7 @@ ECHO Done
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\Bullet\BroadphaseCollision\CollisionDispatcher.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
+					RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.cpp">
 				</File>
 				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.cpp">
@@ -1352,6 +1343,9 @@ ECHO Done
 			<Filter
 				Name="Header Files"
 				Filter="">
+				<File
+					RelativePath="..\..\Bullet\BroadphaseCollision\AxisSweep3.h">
+				</File>
 				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\BroadphaseInterface.h">
 				</File>
@@ -1362,7 +1356,7 @@ ECHO Done
 					RelativePath="..\..\Bullet\BroadphaseCollision\CollisionAlgorithm.h">
 				</File>
 				<File
-					RelativePath="..\..\Bullet\BroadphaseCollision\CollisionDispatcher.h">
+					RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.h">
 				</File>
 				<File
 					RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.h">
@@ -1416,6 +1410,90 @@ ECHO Done
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="CollisionDispatch"
+			Filter="">
+			<Filter
+				Name="Source Files"
+				Filter="">
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionDispatcher.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionObject.cpp">
+					<FileConfiguration
+						Name="Blender Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Blender Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="3D Plugin Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="3D Plugin Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				Filter="">
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionDispatcher.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionObject.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ConvexConvexAlgorithm.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\EmptyCollisionAlgorithm.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.h">
+				</File>
+				<File
+					RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.h">
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj b/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
index 7f35ad4b2e5..91f6d504e70 100644
--- a/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="Bullet3Dynamics"
 	ProjectGUID="{3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4}"
 	Keyword="Win32Proj">
@@ -46,11 +46,14 @@ IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
+
 
 ECHO Done
 "/>
@@ -102,12 +105,12 @@ IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
-XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
-
+XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 ECHO Done
 "/>
 			<Tool
@@ -161,11 +164,13 @@ IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 ECHO Done
 "/>
@@ -217,11 +222,13 @@ IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include MKDIR ..\..\..
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+IF NOT EXIST ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle MKDIR ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 XCOPY /Y ..\..\..\LinearMath\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\..\BulletDynamics\CollisionDispatch\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\CollisionDispatch
 XCOPY /Y ..\..\..\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\ConstraintSolver
 XCOPY /Y ..\..\..\BulletDynamics\Dynamics\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Dynamics
+XCOPY /Y ..\..\..\BulletDynamics\Vehicle\*.h ..\..\..\..\..\..\build\msvc_7\extern\bullet\include\Vehicle
 
 ECHO Done
 "/>
@@ -241,7 +248,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="ConstraintSolver"
@@ -276,6 +284,9 @@ ECHO Done
 							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp">
+				</File>
 				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.cpp">
 					<FileConfiguration
@@ -411,6 +422,9 @@ ECHO Done
 							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\TypedConstraint.cpp">
+				</File>
 			</Filter>
 			<Filter
 				Name="Header Files"
@@ -442,197 +456,8 @@ ECHO Done
 				<File
 					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SorLcp.h">
 				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="CollisionDispatch"
-			Filter="">
-			<Filter
-				Name="Source Files"
-				Filter="">
 				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ConvexConvexAlgorithm.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\EmptyCollisionAlgorithm.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ManifoldResult.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ToiContactDispatcher.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\UnionFind.cpp">
-					<FileConfiguration
-						Name="Blender Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Blender Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="3D Plugin Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				Filter="">
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ConvexConcaveCollisionAlgorithm.h">
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ConvexConvexAlgorithm.h">
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\EmptyCollisionAlgorithm.h">
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ManifoldResult.h">
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\ToiContactDispatcher.h">
-				</File>
-				<File
-					RelativePath="..\..\..\BulletDynamics\CollisionDispatch\UnionFind.h">
+					RelativePath="..\..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h">
 				</File>
 			</Filter>
 		</Filter>
@@ -741,6 +566,33 @@ ECHO Done
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Vehicle"
+			Filter="">
+			<Filter
+				Name="Source Files"
+				Filter="">
+				<File
+					RelativePath="..\..\..\BulletDynamics\Vehicle\RaycastVehicle.cpp">
+				</File>
+				<File
+					RelativePath="..\..\..\BulletDynamics\Vehicle\WheelInfo.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				Filter="">
+				<File
+					RelativePath="..\..\..\BulletDynamics\Vehicle\RaycastVehicle.h">
+				</File>
+				<File
+					RelativePath="..\..\..\BulletDynamics\Vehicle\VehicleRaycaster.h">
+				</File>
+				<File
+					RelativePath="..\..\..\BulletDynamics\Vehicle\WheelInfo.h">
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/extern/make/msvc_7_0/build_install_all.vcproj b/extern/make/msvc_7_0/build_install_all.vcproj
index 334acec91c2..3396ecbb799 100644
--- a/extern/make/msvc_7_0/build_install_all.vcproj
+++ b/extern/make/msvc_7_0/build_install_all.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="build_install_all"
 	ProjectGUID="{9C71A793-C177-4CAB-8EC5-923D500B39F8}"
 	RootNamespace="build_install_all"
@@ -76,7 +76,8 @@
 				Name="VCPreBuildEventTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 	</Files>
 	<Globals>
diff --git a/extern/make/msvc_7_0/extern.sln b/extern/make/msvc_7_0/extern.sln
index 768be632bc5..f62217f94ee 100644
--- a/extern/make/msvc_7_0/extern.sln
+++ b/extern/make/msvc_7_0/extern.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{9C71A793-C177-4CAB-8EC5-923D500B39F8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8} = {F9850C15-FF0A-429E-9D47-89FB433C9BD8}
diff --git a/extern/qhull/make/msvc_7_0/qhull.vcproj b/extern/qhull/make/msvc_7_0/qhull.vcproj
index b9f8d8946fe..1b754d8e076 100644
--- a/extern/qhull/make/msvc_7_0/qhull.vcproj
+++ b/extern/qhull/make/msvc_7_0/qhull.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="qhull"
 	ProjectGUID="{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}"
 	SccProjectName=""
@@ -234,7 +234,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/extern/solid/make/msvc_7_0/broad/broad.vcproj b/extern/solid/make/msvc_7_0/broad/broad.vcproj
index 24a2cfbabca..adb56424e60 100644
--- a/extern/solid/make/msvc_7_0/broad/broad.vcproj
+++ b/extern/solid/make/msvc_7_0/broad/broad.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="broad"
 	ProjectGUID="{0112CAD5-3584-412A-A2E5-1315A00437B4}"
 	SccProjectName=""
@@ -218,7 +218,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/extern/solid/make/msvc_7_0/complex/complex.vcproj b/extern/solid/make/msvc_7_0/complex/complex.vcproj
index efe2d2d640d..2a895fa28d3 100644
--- a/extern/solid/make/msvc_7_0/complex/complex.vcproj
+++ b/extern/solid/make/msvc_7_0/complex/complex.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="complex"
 	ProjectGUID="{B83C6BED-11EC-46C8-AFFA-121EEDE94373}"
 	SccProjectName=""
@@ -220,7 +220,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/extern/solid/make/msvc_7_0/convex/convex.vcproj b/extern/solid/make/msvc_7_0/convex/convex.vcproj
index 3375de3e8da..da088b5972f 100644
--- a/extern/solid/make/msvc_7_0/convex/convex.vcproj
+++ b/extern/solid/make/msvc_7_0/convex/convex.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="convex"
 	ProjectGUID="{524264F4-DF21-4B79-847F-E7CA643ECD0B}"
 	SccProjectName=""
@@ -218,7 +218,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/extern/solid/make/msvc_7_0/solid.vcproj b/extern/solid/make/msvc_7_0/solid.vcproj
index 74539d9778d..d9e6332987c 100644
--- a/extern/solid/make/msvc_7_0/solid.vcproj
+++ b/extern/solid/make/msvc_7_0/solid.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="solid"
 	ProjectGUID="{D696C86B-0B53-4471-A50D-5B983A6FA4AD}"
 	SccProjectName=""
@@ -242,7 +242,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj
index 0aff5489175..f0952c582b7 100644
--- a/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj
+++ b/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="SoundSystem"
 	ProjectGUID="{98330220-47A6-42E0-9DE4-AD0FF5D204D6}"
 	SccProjectName=""
@@ -244,7 +244,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj
index ea3d95bdf93..103b589e732 100644
--- a/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj
+++ b/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="DummySoundSystem"
 	ProjectGUID="{FAF46346-65CC-4DB2-85C4-B99826F79D0C}"
 	SccProjectName=""
@@ -220,7 +220,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj
index 11fe5315c45..8ce971ac1aa 100644
--- a/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj
+++ b/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="OpenALSoundSystem"
 	ProjectGUID="{213356A9-3A1F-41DA-9819-1297BCD17DEE}"
 	SccProjectName=""
@@ -220,7 +220,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/bmfont/make/msvc_7_0/bmfont.vcproj b/intern/bmfont/make/msvc_7_0/bmfont.vcproj
index f9eace94a0b..089130bc5e0 100644
--- a/intern/bmfont/make/msvc_7_0/bmfont.vcproj
+++ b/intern/bmfont/make/msvc_7_0/bmfont.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="bmfont"
 	SccProjectName=""
 	SccLocalPath="">
@@ -241,7 +241,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/bsp/make/msvc_7_0/bsplib.vcproj b/intern/bsp/make/msvc_7_0/bsplib.vcproj
index cc1413c4f87..c07cfaf1d85 100644
--- a/intern/bsp/make/msvc_7_0/bsplib.vcproj
+++ b/intern/bsp/make/msvc_7_0/bsplib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="bsplib"
 	SccProjectName=""
 	SccLocalPath="">
@@ -241,7 +241,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="intern"
diff --git a/intern/container/make/msvc_7_0/container.vcproj b/intern/container/make/msvc_7_0/container.vcproj
index db346026c91..2aefffb6a60 100644
--- a/intern/container/make/msvc_7_0/container.vcproj
+++ b/intern/container/make/msvc_7_0/container.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="container"
 	SccProjectName=""
 	SccLocalPath="">
@@ -233,7 +233,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="intern"
diff --git a/intern/decimation/make/msvc_7_0/decimation.vcproj b/intern/decimation/make/msvc_7_0/decimation.vcproj
index 80bec8f17d1..41bd355db5d 100644
--- a/intern/decimation/make/msvc_7_0/decimation.vcproj
+++ b/intern/decimation/make/msvc_7_0/decimation.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="decimation"
 	SccProjectName=""
 	SccLocalPath="">
@@ -241,7 +241,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="intern"
diff --git a/intern/elbeem/make/msvc_7_0/elbeem.vcproj b/intern/elbeem/make/msvc_7_0/elbeem.vcproj
index afd4c345ccd..6bb965b7e97 100644
--- a/intern/elbeem/make/msvc_7_0/elbeem.vcproj
+++ b/intern/elbeem/make/msvc_7_0/elbeem.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="elbeem"
 	ProjectGUID="{A90C4918-4B21-4277-93BD-AF65F30951D9}"
 	Keyword="Win32Proj">
@@ -225,7 +225,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -234,18 +235,6 @@ ECHO Done
 			<File
 				RelativePath="..\..\intern\attributes.cpp">
 			</File>
-			<File
-				RelativePath="..\..\intern\blendercall.cpp">
-			</File>
-			<File
-				RelativePath="..\..\intern\blenderdummy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\intern\cfglexer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\intern\cfgparser.cpp">
-			</File>
 			<File
 				RelativePath="..\..\intern\elbeem.cpp">
 			</File>
@@ -265,13 +254,13 @@ ECHO Done
 				RelativePath="..\..\intern\ntl_geometryobject.cpp">
 			</File>
 			<File
-				RelativePath="..\..\intern\ntl_lightobject.cpp">
+				RelativePath="..\..\intern\ntl_lighting.cpp">
 			</File>
 			<File
 				RelativePath="..\..\intern\ntl_ray.cpp">
 			</File>
 			<File
-				RelativePath="..\..\intern\ntl_scene.cpp">
+				RelativePath="..\..\intern\ntl_world.cpp">
 			</File>
 			<File
 				RelativePath="..\..\intern\parametrizer.cpp">
@@ -282,6 +271,18 @@ ECHO Done
 			<File
 				RelativePath="..\..\intern\simulation_object.cpp">
 			</File>
+			<File
+				RelativePath="..\..\intern\solver_init.cpp">
+			</File>
+			<File
+				RelativePath="..\..\intern\solver_interface.cpp">
+			</File>
+			<File
+				RelativePath="..\..\intern\solver_main.cpp">
+			</File>
+			<File
+				RelativePath="..\..\intern\solver_util.cpp">
+			</File>
 			<File
 				RelativePath="..\..\intern\utilities.cpp">
 			</File>
@@ -294,10 +295,7 @@ ECHO Done
 				RelativePath="..\..\intern\attributes.h">
 			</File>
 			<File
-				RelativePath="..\..\intern\cfgparser.h">
-			</File>
-			<File
-				RelativePath="..\..\intern\globals.h">
+				RelativePath="..\..\intern\elbeem.h">
 			</File>
 			<File
 				RelativePath="..\..\intern\isosurface.h">
@@ -324,10 +322,7 @@ ECHO Done
 				RelativePath="..\..\intern\ntl_geometryshader.h">
 			</File>
 			<File
-				RelativePath="..\..\intern\ntl_lightobject.h">
-			</File>
-			<File
-				RelativePath="..\..\intern\ntl_material.h">
+				RelativePath="..\..\intern\ntl_lighting.h">
 			</File>
 			<File
 				RelativePath="..\..\intern\ntl_matrices.h">
@@ -335,21 +330,12 @@ ECHO Done
 			<File
 				RelativePath="..\..\intern\ntl_ray.h">
 			</File>
-			<File
-				RelativePath="..\..\intern\ntl_renderglobals.h">
-			</File>
-			<File
-				RelativePath="..\..\intern\ntl_rndstream.h">
-			</File>
-			<File
-				RelativePath="..\..\intern\ntl_scene.h">
-			</File>
-			<File
-				RelativePath="..\..\intern\ntl_triangle.h">
-			</File>
 			<File
 				RelativePath="..\..\intern\ntl_vector3dim.h">
 			</File>
+			<File
+				RelativePath="..\..\intern\ntl_world.h">
+			</File>
 			<File
 				RelativePath="..\..\intern\parametrizer.h">
 			</File>
@@ -359,6 +345,15 @@ ECHO Done
 			<File
 				RelativePath="..\..\intern\simulation_object.h">
 			</File>
+			<File
+				RelativePath="..\..\intern\solver_class.h">
+			</File>
+			<File
+				RelativePath="..\..\intern\solver_interface.h">
+			</File>
+			<File
+				RelativePath="..\..\intern\solver_relax.h">
+			</File>
 			<File
 				RelativePath="..\..\intern\utilities.h">
 			</File>
diff --git a/intern/ghost/make/msvc_7_0/ghost.vcproj b/intern/ghost/make/msvc_7_0/ghost.vcproj
index 7ffca906fec..b39a51b0e92 100644
--- a/intern/ghost/make/msvc_7_0/ghost.vcproj
+++ b/intern/ghost/make/msvc_7_0/ghost.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="ghost"
 	SccProjectName=""
 	SccLocalPath="">
@@ -241,7 +241,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Header Files"
diff --git a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
index 40270c21897..cb3490716fa 100644
--- a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
+++ b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="guardedalloc"
 	ProjectGUID="{1CC733F1-6AB5-4904-8F63-C08C46B79DD9}"
 	SccProjectName=""
@@ -242,7 +242,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/iksolver/make/msvc_7_0/iksolver.vcproj b/intern/iksolver/make/msvc_7_0/iksolver.vcproj
index 3a65ca06f18..008a29774dc 100644
--- a/intern/iksolver/make/msvc_7_0/iksolver.vcproj
+++ b/intern/iksolver/make/msvc_7_0/iksolver.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="iksolver"
 	SccProjectName=""
 	SccLocalPath="">
@@ -241,7 +241,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="intern"
diff --git a/intern/keymaker/make/msvc_7_0/blenkey.vcproj b/intern/keymaker/make/msvc_7_0/blenkey.vcproj
index 91579ecf3f1..df24f3da382 100644
--- a/intern/keymaker/make/msvc_7_0/blenkey.vcproj
+++ b/intern/keymaker/make/msvc_7_0/blenkey.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="blenkey"
 	SccProjectName=""
 	SccLocalPath="">
@@ -239,7 +239,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/make/msvc_7_0/build_install_all.vcproj b/intern/make/msvc_7_0/build_install_all.vcproj
index 2b3caecb3ae..3d80bd48b8b 100644
--- a/intern/make/msvc_7_0/build_install_all.vcproj
+++ b/intern/make/msvc_7_0/build_install_all.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="build_install_all"
 	ProjectGUID="{02110D03-59DB-4571-8787-72B3C03B2F2D}"
 	SccProjectName=""
@@ -75,7 +75,8 @@
 				Name="VCPreBuildEventTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 	</Files>
 	<Globals>
diff --git a/intern/make/msvc_7_0/intern.sln b/intern/make/msvc_7_0/intern.sln
index 9bb531b3748..1ec072d6f0e 100644
--- a/intern/make/msvc_7_0/intern.sln
+++ b/intern/make/msvc_7_0/intern.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{02110D03-59DB-4571-8787-72B3C03B2F2D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A90C4918-4B21-4277-93BD-AF65F30951D9} = {A90C4918-4B21-4277-93BD-AF65F30951D9}
diff --git a/intern/memutil/make/msvc_7_0/memutil.vcproj b/intern/memutil/make/msvc_7_0/memutil.vcproj
index d5ba8bff173..2d570ea3d49 100644
--- a/intern/memutil/make/msvc_7_0/memutil.vcproj
+++ b/intern/memutil/make/msvc_7_0/memutil.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="memutil"
 	SccProjectName=""
 	SccLocalPath="">
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
+				AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil"
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -79,7 +79,7 @@ ECHO Done
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\.."
+				AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -136,7 +136,7 @@ ECHO Done
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\.."
+				AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -193,7 +193,7 @@ ECHO Done
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
+				AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil"
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -241,11 +241,15 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\intern\MEM_CacheLimiterC-Api.cpp">
+			</File>
 			<File
 				RelativePath="..\..\intern\MEM_RefCountedC-Api.cpp">
 			</File>
@@ -253,6 +257,15 @@ ECHO Done
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\MEM_Allocator.h">
+			</File>
+			<File
+				RelativePath="..\..\MEM_CacheLimiter.h">
+			</File>
+			<File
+				RelativePath="..\..\MEM_CacheLimiterC-Api.h">
+			</File>
 			<Filter
 				Name="extern"
 				Filter="">
diff --git a/intern/moto/make/msvc_7_0/moto.vcproj b/intern/moto/make/msvc_7_0/moto.vcproj
index 989f002ab2d..6ecff4b78d0 100644
--- a/intern/moto/make/msvc_7_0/moto.vcproj
+++ b/intern/moto/make/msvc_7_0/moto.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="MoTo"
 	SccProjectName=""
 	SccLocalPath="">
@@ -241,7 +241,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/opennl/make/msvc_7_0/opennl.vcproj b/intern/opennl/make/msvc_7_0/opennl.vcproj
index 881fdf5c566..ec999b0c252 100644
--- a/intern/opennl/make/msvc_7_0/opennl.vcproj
+++ b/intern/opennl/make/msvc_7_0/opennl.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="opennl"
 	ProjectGUID="{8B8D4FC3-3234-4E54-8376-5AB83D00D164}"
 	Keyword="Win32Proj">
@@ -231,7 +231,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/intern/string/make/msvc_7_0/string.vcproj b/intern/string/make/msvc_7_0/string.vcproj
index d523500c77d..deb342c26e8 100644
--- a/intern/string/make/msvc_7_0/string.vcproj
+++ b/intern/string/make/msvc_7_0/string.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="string"
 	SccProjectName=""
 	SccLocalPath="">
@@ -239,7 +239,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/BLO_readblenfile/BLO_readblenfile.vcproj b/projectfiles_vc7/blender/BLO_readblenfile/BLO_readblenfile.vcproj
index 140f4a079b0..3618ac56296 100644
--- a/projectfiles_vc7/blender/BLO_readblenfile/BLO_readblenfile.vcproj
+++ b/projectfiles_vc7/blender/BLO_readblenfile/BLO_readblenfile.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BLO_readblenfile"
 	SccProjectName=""
 	SccLocalPath="">
@@ -320,7 +320,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj b/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
index 4f7a5ec6271..426a81f8183 100644
--- a/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
+++ b/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BPY_python"
 	SccProjectName=""
 	SccLocalPath="">
@@ -119,7 +119,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -148,6 +149,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\python\api2_2x\Effect.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\python\api2_2x\Group.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\python\api2_2x\Image.c">
 			</File>
@@ -190,6 +194,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\python\api2_2x\Object.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\python\api2_2x\Pose.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\python\api2_2x\Registry.c">
 			</File>
@@ -321,6 +328,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\python\api2_2x\Effect.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\python\api2_2x\Group.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\python\api2_2x\Image.h">
 			</File>
@@ -357,6 +367,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\python\api2_2x\Object.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\python\api2_2x\Pose.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\python\api2_2x\Registry.h">
 			</File>
diff --git a/projectfiles_vc7/blender/avi/BL_avi.vcproj b/projectfiles_vc7/blender/avi/BL_avi.vcproj
index 023a05a9b04..302586b1dc3 100644
--- a/projectfiles_vc7/blender/avi/BL_avi.vcproj
+++ b/projectfiles_vc7/blender/avi/BL_avi.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BL_avi"
 	SccProjectName=""
 	SccLocalPath="">
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -177,7 +177,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -229,7 +229,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -281,7 +281,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/blender.sln b/projectfiles_vc7/blender/blender.sln
index f7a327a9fc3..3ba6db789fa 100644
--- a/projectfiles_vc7/blender/blender.sln
+++ b/projectfiles_vc7/blender/blender.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blender", "blender.vcproj", "{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F} = {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}
@@ -8,7 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blender", "blender.vcproj",
 		{9625642D-6F20-4FB6-A089-BE7441B223E3} = {9625642D-6F20-4FB6-A089-BE7441B223E3}
 		{E645CC32-4823-463E-82F0-46ADDE664018} = {E645CC32-4823-463E-82F0-46ADDE664018}
 		{51FB3D48-2467-4BFA-A321-D848252B437E} = {51FB3D48-2467-4BFA-A321-D848252B437E}
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF} = {5B1C904C-BBBD-44A0-843A-447CBD6176AF}
 		{31628053-825D-4C06-8A21-D13883489718} = {31628053-825D-4C06-8A21-D13883489718}
 		{EADC3C5A-6C51-4F03-8038-1553E7D7F740} = {EADC3C5A-6C51-4F03-8038-1553E7D7F740}
 		{DB6BE55D-B6D9-494D-856A-8764FF7BA91D} = {DB6BE55D-B6D9-494D-856A-8764FF7BA91D}
@@ -85,10 +84,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BRE_render", "render\BRE_re
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BRE_renderconverter", "renderconverter\BRE_renderconverter.vcproj", "{5B1C904C-BBBD-44A0-843A-447CBD6176AF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNA_makesdna", "makesdna\DNA_makesdna.vcproj", "{E013786A-9575-4F34-81B2-33290357EE87}"
 	ProjectSection(ProjectDependencies) = postProject
 		{31628053-825D-4C06-8A21-D13883489718} = {31628053-825D-4C06-8A21-D13883489718}
@@ -383,14 +378,6 @@ Global
 		{106AE171-0083-41D6-A949-20DB0E8DC251}.Blender Release.Build.0 = Blender Release|Win32
 		{106AE171-0083-41D6-A949-20DB0E8DC251}.BlenderPlayer Debug.ActiveCfg = Blender Debug|Win32
 		{106AE171-0083-41D6-A949-20DB0E8DC251}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF}.3D Plugin Debug.ActiveCfg = Blender Debug|Win32
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF}.3D Plugin Release.ActiveCfg = Blender Release|Win32
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF}.Blender Debug.ActiveCfg = Blender Debug|Win32
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF}.Blender Debug.Build.0 = Blender Debug|Win32
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF}.Blender Release.ActiveCfg = Blender Release|Win32
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF}.Blender Release.Build.0 = Blender Release|Win32
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF}.BlenderPlayer Debug.ActiveCfg = Blender Debug|Win32
-		{5B1C904C-BBBD-44A0-843A-447CBD6176AF}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
 		{E013786A-9575-4F34-81B2-33290357EE87}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{E013786A-9575-4F34-81B2-33290357EE87}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{E013786A-9575-4F34-81B2-33290357EE87}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
diff --git a/projectfiles_vc7/blender/blender.vcproj b/projectfiles_vc7/blender/blender.vcproj
index 7da591109f5..cb2c940a823 100644
--- a/projectfiles_vc7/blender/blender.vcproj
+++ b/projectfiles_vc7/blender/blender.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="blender"
 	RootNamespace="blender"
 	SccProjectName=""
@@ -41,12 +41,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24.lib libelbeem.lib libboolop.lib"
+				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib"
 				ShowProgress="0"
 				OutputFile="..\..\bin\blender.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern;..\..\..\build\msvc_7\libs\extern"
+				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern;..\..\..\build\msvc_7\libs\extern"
 				IgnoreAllDefaultLibraries="FALSE"
 				IgnoreDefaultLibraryNames="libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib"
 				ProgramDatabaseFile="..\..\..\build\msvc_7\libs\blender.pdb"
@@ -63,6 +63,8 @@ ECHO Copying required 3rd party dlls...
 XCOPY /Y ..\..\..\lib\windows\python\lib\python24.dll ..\..\bin
 XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin
 XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin
+XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin
+XCOPY /Y ..\..\..\lib\windows\pthreads\lib\*.dll ..\..\bin
 ECHO Copying language folder
 ECHO Done
 "/>
@@ -98,7 +100,7 @@ ECHO Done
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\source\blender;..\..\source\blender\imbuf;..\..\source\blender\misc;..\..\source\blender\blenlib;..\..\source\blender\python;..\..\source\blender\include;..\..\source\blender\renderui;..\..\source\blender\makesdna;..\..\source\blender\blenkernel;..\..\source\blender\blenloader;..\..\source\blender\renderconverter;..\..\source\blender\render\extern\include;..\..\source\blender\radiosity\extern\include;..\..\source\kernel\gen_system;..\..\source\kernel\gen_messaging"
-				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE,WITH_QUICKTIME"
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;WITH_QUICKTIME"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
@@ -116,12 +118,12 @@ ECHO Done
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386
 "
-				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24_d.lib libelbeem.lib libboolop.lib"
+				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24_d.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib"
 				ShowProgress="0"
 				OutputFile="..\..\bin\debug\blender.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern\debug;..\..\..\build\msvc_7\libs\extern\debug"
+				AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern\debug;..\..\..\build\msvc_7\libs\extern\debug"
 				IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcd.lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="..\..\..\build\msvc_7\libs\debug\blender.pdb"
@@ -140,6 +142,8 @@ XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\debug
 XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin\debug
 XCOPY /Y ..\..\..\lib\windows\python\lib\python24_d.dll ..\..\bin\debug
 XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\bin\debug
+XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin\debug
+XCOPY /Y ..\..\..\lib\windows\pthreads\lib\*.dll ..\..\bin\debug
 ECHO Copying language folder
 IF NOT EXIST ..\..\bin\debug\.blender MKDIR ..\..\bin\debug\.blender
 XCOPY /Y ..\..\bin\.blender ..\..\bin\debug\.blender /E
@@ -165,11 +169,15 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\source\creator\buildinfo.c">
+			</File>
 			<File
 				RelativePath="..\..\source\creator\creator.c">
 			</File>
diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index 64883858730..eafdf011175 100644
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BKE_blenkernel"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -346,6 +347,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\CCGSubSurf.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\colortools.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\constraint.c">
 			</File>
@@ -376,6 +380,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\group.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\icons.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\image.c">
 			</File>
@@ -406,6 +413,15 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\nla.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\node.c">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\node_composite.c">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\node_shaders.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\object.c">
 			</File>
@@ -448,6 +464,12 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\writeavi.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\writeffmpeg.c">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\writeframeserver.c">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -479,6 +501,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_booleanops_mesh.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_colortools.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_constraint.h">
 			</File>
@@ -515,6 +540,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_group.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_icons.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_image.h">
 			</File>
@@ -548,6 +576,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_nla.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_node.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_object.h">
 			</File>
@@ -599,6 +630,12 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_writeavi.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_writeffmpeg.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_writeframeserver.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\CCGSubSurf.h">
 			</File>
diff --git a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
index 8cc842596e7..f12cef1ffac 100644
--- a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
+++ b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BLI_blenlib"
 	SccProjectName=""
 	SccLocalPath="">
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_FREETYPE2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -180,7 +180,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_FREETYPE2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -285,7 +285,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -328,7 +328,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -342,6 +343,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_ghash.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_heap.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_linklist.c">
 			</File>
@@ -363,6 +367,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\gsqueue.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\intern\jitter.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\matrixops.c">
 			</File>
@@ -384,6 +391,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\storage.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\intern\threads.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\time.c">
 			</File>
@@ -421,6 +431,12 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\BLI_ghash.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\BLI_heap.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\BLI_jitter.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\BLI_linklist.h">
 			</File>
@@ -436,6 +452,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\BLI_storage_types.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\BLI_threads.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_util.h">
 			</File>
diff --git a/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj b/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
index 3954552ebc1..dce7f9d7cc4 100644
--- a/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
+++ b/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="blenpluginapi"
 	SccProjectName=""
 	SccLocalPath="">
@@ -320,7 +320,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj b/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
index 2d77bcb3dd1..ad0f5d83ced 100644
--- a/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
+++ b/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="FTF_ftfont"
 	SccProjectName=""
 	SccLocalPath="">
@@ -115,7 +115,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj b/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
index c608b3044ea..77c670d7633 100644
--- a/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
+++ b/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BL_imbuf"
 	SccProjectName=""
 	SccLocalPath="">
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -124,7 +124,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -176,7 +176,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -228,7 +228,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -280,7 +280,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -322,7 +322,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -363,6 +364,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\divers.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\imbuf\intern\dynlibtiff.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\filter.c">
 			</File>
@@ -384,6 +388,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\jpeg.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\imbuf\intern\openexr\openexr_api.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\png.c">
 			</File>
@@ -411,16 +418,76 @@
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\targa.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\imbuf\intern\tiff.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\util.c">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\writeimage.c">
 			</File>
+			<Filter
+				Name="cineon"
+				Filter="">
+				<Filter
+					Name="Source Files"
+					Filter="">
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\cineon_dpx.c">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\cineonlib.c">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\dpxlib.c">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\logImageCore.c">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\logImageLib.c">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\logmemfile.c">
+					</File>
+				</Filter>
+				<Filter
+					Name="Header Files"
+					Filter="">
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\cin_debug_stuff.h">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\cineonfile.h">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\cineonlib.h">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\dpxfile.h">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\dpxlib.h">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\logImageCore.h">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\logImageLib.h">
+					</File>
+					<File
+						RelativePath="..\..\..\source\blender\imbuf\intern\cineon\logmemfile.h">
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\source\blender\imbuf\intern\dynlibtiff.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\IMB_allocimbuf.h">
 			</File>
@@ -445,6 +512,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\IMB_divers.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\imbuf\intern\IMB_dpxcineon.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\IMB_filter.h">
 			</File>
@@ -478,6 +548,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\IMB_targa.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\imbuf\intern\IMB_tiff.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\imbuf.h">
 			</File>
@@ -487,6 +560,12 @@
 			<File
 				RelativePath="..\..\..\source\blender\imbuf\intern\matrix.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\imbuf\intern\openexr\openexr_api.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\imbuf\intern\openexr\openexr_multi.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\quicktime\quicktime_export.h">
 			</File>
diff --git a/projectfiles_vc7/blender/img/BL_img.vcproj b/projectfiles_vc7/blender/img/BL_img.vcproj
index 7dce5a5b383..cf94dbeed4f 100644
--- a/projectfiles_vc7/blender/img/BL_img.vcproj
+++ b/projectfiles_vc7/blender/img/BL_img.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BL_img"
 	SccProjectName=""
 	SccLocalPath="">
@@ -211,7 +211,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/loader/BLO_loader.vcproj b/projectfiles_vc7/blender/loader/BLO_loader.vcproj
index 0ce78ad223b..09d77b7307c 100644
--- a/projectfiles_vc7/blender/loader/BLO_loader.vcproj
+++ b/projectfiles_vc7/blender/loader/BLO_loader.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BLO_loader"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj b/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
index ed4caf5c095..37e0e2563f7 100644
--- a/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
+++ b/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="DNA_makesdna"
 	SccProjectName=""
 	SccLocalPath="">
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -88,7 +88,7 @@ DNA_makesdna.exe dna.c
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -154,7 +154,7 @@ DNA_makesdna.exe dna.c
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -220,7 +220,7 @@ DNA_makesdna.exe dna.c
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -290,7 +290,7 @@ DNA_makesdna.exe dna.c
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -360,7 +360,7 @@ DNA_makesdna.exe dna.c
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -416,7 +416,8 @@ DNA_makesdna.exe dna.c
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -440,6 +441,9 @@ DNA_makesdna.exe dna.c
 			<File
 				RelativePath="..\..\..\source\blender\makesdna\DNA_camera_types.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\makesdna\DNA_color_types.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\makesdna\DNA_constraint_types.h">
 			</File>
@@ -497,6 +501,9 @@ DNA_makesdna.exe dna.c
 			<File
 				RelativePath="..\..\..\source\blender\makesdna\DNA_nla_types.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\makesdna\DNA_node_types.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\makesdna\DNA_object_fluidsim.h">
 			</File>
diff --git a/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj b/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj
index 0548f01e734..8ef408c5a5d 100644
--- a/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj
+++ b/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BRA_radiosity"
 	SccProjectName=""
 	SccLocalPath="">
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\radiosity\extern\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\radiosity\extern\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -115,7 +115,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/render/BRE_render.vcproj b/projectfiles_vc7/blender/render/BRE_render.vcproj
index 5a8f6de4e6b..45975685d93 100644
--- a/projectfiles_vc7/blender/render/BRE_render.vcproj
+++ b/projectfiles_vc7/blender/render/BRE_render.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BRE_render"
 	SccProjectName=""
 	SccLocalPath="">
@@ -115,20 +115,21 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\source\convertblender.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\edgeRender.c">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\envmap.c">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\source\errorHandler.c">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\gammaCorrectionTables.c">
 			</File>
@@ -139,7 +140,7 @@
 				RelativePath="..\..\..\source\blender\render\intern\source\initrender.c">
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\render\intern\source\jitter.c">
+				RelativePath="..\..\..\source\blender\render\intern\source\pipeline.c">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\pixelblending.c">
@@ -150,39 +151,21 @@
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\ray.c">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\source\RE_callbacks.c">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\rendercore.c">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\renderdatabase.c">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\source\renderHelp.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\source\renderPreAndPost.c">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\shadbuf.c">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\texture.c">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\source\vanillaRenderPipe.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\source\zblur.c">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\zbuf.c">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\source\zbufferdatastruct.c">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -193,24 +176,15 @@
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\envmap.h">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\errorHandler.h">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\gammaCorrectionTables.h">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\initrender.h">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\jitter.h">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\old_zbuffer_types.h">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\outerRenderLoop.h">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\pixelblending.h">
 			</File>
@@ -221,7 +195,13 @@
 				RelativePath="..\..\..\source\blender\render\intern\include\pixelshading.h">
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\RE_callbacks.h">
+				RelativePath="..\..\..\source\blender\render\extern\include\RE_pipeline.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\extern\include\RE_render_ext.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\extern\include\RE_shader_ext.h">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\rendercore.h">
@@ -230,10 +210,10 @@
 				RelativePath="..\..\..\source\blender\render\intern\include\rendercore_int.h">
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\renderHelp.h">
+				RelativePath="..\..\..\source\blender\render\intern\include\renderdatabase.h">
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\renderPreAndPost.h">
+				RelativePath="..\..\..\source\blender\render\intern\include\renderpipeline.h">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\shadbuf.h">
@@ -241,33 +221,15 @@
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\texture.h">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\vanillaRenderPipe.h">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\vanillaRenderPipe_int.h">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\vanillaRenderPipe_types.h">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\zblur.h">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\zbuf.h">
 			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\zbuf_int.h">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\zbuf_types.h">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\zbufferdatastruct.h">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\render\intern\include\zbufferdatastruct_types.h">
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/projectfiles_vc7/blender/renderconverter/BRE_renderconverter.vcproj b/projectfiles_vc7/blender/renderconverter/BRE_renderconverter.vcproj
index 3e21c0e5463..ef830fe5905 100644
--- a/projectfiles_vc7/blender/renderconverter/BRE_renderconverter.vcproj
+++ b/projectfiles_vc7/blender/renderconverter/BRE_renderconverter.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BRE_renderconverter"
 	SccProjectName=""
 	SccLocalPath="">
@@ -115,21 +115,16 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\source\blender\renderconverter\intern\convertBlenderScene.c">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\source\blender\renderconverter\RE_renderconverter.h">
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/projectfiles_vc7/blender/src/BL_src.vcproj b/projectfiles_vc7/blender/src/BL_src.vcproj
index 76e6eb4026b..1f75acb014f 100644
--- a/projectfiles_vc7/blender/src/BL_src.vcproj
+++ b/projectfiles_vc7/blender/src/BL_src.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BL_src"
 	SccProjectName=""
 	SccLocalPath="">
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.3;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.3;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.3;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.3;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_CONSOLE,GAMEBLENDER,WITH_QUICKTIME,INTERNATIONAL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -115,7 +115,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -195,6 +196,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\drawnla.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\drawnode.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\drawobject.c">
 			</File>
@@ -294,6 +298,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\editnla.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\editnode.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\editobject.c">
 			</File>
@@ -333,6 +340,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\glutil.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\hddaudio.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\header_action.c">
 			</File>
@@ -357,6 +367,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\header_nla.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\header_node.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\header_oops.c">
 			</File>
@@ -393,6 +406,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\interface_draw.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\interface_icons.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\interface_panel.c">
 			</File>
@@ -420,6 +436,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\outliner.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\parametrizer.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\playanim.c">
 			</File>
@@ -429,6 +448,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\poseobject.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\preview.blend.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\previewrender.c">
 			</File>
@@ -447,6 +469,12 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\seqaudio.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\seqeffects.c">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\seqscopes.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\sequence.c">
 			</File>
@@ -634,6 +662,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\include\BIF_interface.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\include\BIF_interface_icons.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\include\BIF_keyval.h">
 			</File>
@@ -709,9 +740,6 @@
 			<File
 				RelativePath="..\..\..\source\blender\include\BPI_script.h">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\include\BSE_buttons.h">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\include\BSE_drawimasel.h">
 			</File>
@@ -745,9 +773,18 @@
 			<File
 				RelativePath="..\..\..\source\blender\include\BSE_headerbuttons.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\include\BSE_node.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\include\BSE_seqaudio.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\include\BSE_seqeffects.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\include\BSE_seqscopes.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\include\BSE_sequence.h">
 			</File>
@@ -778,6 +815,12 @@
 			<File
 				RelativePath="..\..\..\source\blender\include\nla.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\parametrizer.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\parametrizer_intern.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\include\playanim_ext.h">
 			</File>
diff --git a/projectfiles_vc7/blender/src/BL_src_cre.vcproj b/projectfiles_vc7/blender/src/BL_src_cre.vcproj
index bd40b56ade1..b381dcecc25 100644
--- a/projectfiles_vc7/blender/src/BL_src_cre.vcproj
+++ b/projectfiles_vc7/blender/src/BL_src_cre.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BL_src_cre"
 	SccProjectName=""
 	SccLocalPath="">
@@ -116,7 +116,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/blender/yafray/BRE_yafray.vcproj b/projectfiles_vc7/blender/yafray/BRE_yafray.vcproj
index b0e82c9c970..b51aaaab947 100644
--- a/projectfiles_vc7/blender/yafray/BRE_yafray.vcproj
+++ b/projectfiles_vc7/blender/yafray/BRE_yafray.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="BRE_yafray"
 	ProjectGUID="{9991A3C3-83FE-4AFE-9E18-9D01CB57E879}"
 	RootNamespace="BRE_yafray"
@@ -117,7 +117,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj b/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
index 4fbbedadd54..42bd9e383e9 100644
--- a/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
+++ b/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="KX_blenderhook"
 	SccProjectName=""
 	SccLocalPath="">
@@ -118,7 +118,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/converter/KX_converter.vcproj b/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
index 0d2387ccafe..31477aaf931 100644
--- a/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
+++ b/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="KX_converter"
 	SccProjectName=""
 	SccLocalPath="">
@@ -326,7 +326,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj b/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj
index efce506eded..251153df7ef 100644
--- a/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj
+++ b/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="EXP_expressions"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
index d79dd0a119e..48b7d841ee9 100644
--- a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
+++ b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="SCA_GameLogic"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj b/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj
index 181abdcf8cc..a3c69c41727 100644
--- a/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj
+++ b/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="GP_axctl"
 	RootNamespace="GP_axctl"
 	SccProjectName=""
@@ -169,7 +169,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj b/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
index 1596927ff5d..fb8f3ca6067 100644
--- a/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
+++ b/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="GP_common"
 	SccProjectName=""
 	SccLocalPath="">
@@ -217,7 +217,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
index 97931d68ef0..174b4523b4b 100644
--- a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
+++ b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="GP_ghost"
 	SccProjectName=""
 	SccLocalPath="">
@@ -159,7 +159,8 @@ ECHO Done
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
index 2cbf21a5efe..45ff275b344 100644
--- a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
+++ b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="KX_ketsji"
 	SccProjectName=""
 	SccLocalPath="">
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
 				PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -284,7 +284,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.4;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -327,11 +327,24 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\BL_Material.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\BL_Shader.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\BL_Texture.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_BlenderMaterial.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_BulletPhysicsController.cpp">
 			</File>
@@ -359,6 +372,9 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_Light.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_MaterialIpoController.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_MeshProxy.cpp">
 			</File>
@@ -407,6 +423,9 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_TouchEventManager.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_VehicleWrapper.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_VertexProxy.cpp">
 			</File>
@@ -517,6 +536,18 @@
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\BL_Material.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\BL_Shader.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\BL_Texture.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_BlenderMaterial.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_BulletPhysicsController.h">
 			</File>
@@ -553,6 +584,9 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_Light.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_MaterialIpoController.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_MeshProxy.h">
 			</File>
@@ -604,6 +638,9 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_TouchEventManager.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_VehicleWrapper.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_VertexProxy.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj b/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj
index a757a2cb0e0..8aba059d029 100644
--- a/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj
+++ b/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="KX_network"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj b/projectfiles_vc7/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj
index f038b5f9927..400154a8533 100644
--- a/projectfiles_vc7/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj
+++ b/projectfiles_vc7/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="NG_loopbacknetwork"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/network/network/NG_network.vcproj b/projectfiles_vc7/gameengine/network/network/NG_network.vcproj
index 44c0e9dbf4d..60dc5655fb6 100644
--- a/projectfiles_vc7/gameengine/network/network/NG_network.vcproj
+++ b/projectfiles_vc7/gameengine/network/network/NG_network.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="NG_network"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
index 082f502f5c0..9a807f2d39a 100644
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="PHY_Bullet"
 	ProjectGUID="{E90C7BC2-CF30-4A60-A8F2-0050D592E358}"
 	Keyword="Win32Proj">
@@ -278,7 +278,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj
index c31553d07c9..b1200e635d2 100644
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="PHY_Dummy"
 	SccProjectName=""
 	SccLocalPath="">
@@ -320,7 +320,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj
index 37b6b97b46f..a940d3a7f9b 100644
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="PHY_Ode"
 	SccProjectName=""
 	SccLocalPath="">
@@ -217,7 +217,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Physics.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
index 2e0b991cf30..c46ba8f36de 100644
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="PHY_Physics"
 	SccProjectName=""
 	SccLocalPath="">
@@ -320,7 +320,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -334,6 +335,9 @@
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\..\source\gameengine\Physics\common\PHY_IVehicle.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -350,6 +354,9 @@
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Physics\common\PHY_IPhysicsEnvironment.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\source\gameengine\Physics\common\PHY_IVehicle.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Physics\common\PHY_Pro.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
index 0a46cde5bc1..a8d6e77cd58 100644
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="PHY_Sumo"
 	ProjectGUID="{9625642D-6F20-4FB6-A089-BE7441B223E3}"
 	Keyword="Win32Proj">
@@ -300,7 +300,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj b/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
index e62b8cb9b4e..129084f7b1b 100644
--- a/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
+++ b/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="RAS_rasterizer"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj b/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
index 0e33fc7ccf4..40bd1369aae 100644
--- a/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
+++ b/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="RAS_openglrasterizer"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -331,6 +332,9 @@
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_GLExtensionManager.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_ListRasterizer.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_OpenGLRasterizer.cpp">
 			</File>
@@ -341,12 +345,21 @@
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\ARB_multitexture.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\EXT_separate_specular_color.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\glext.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_GLExtensionManager.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_ListRasterizer.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_OpenGLRasterizer.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/scenegraph/SG_SceneGraph.vcproj b/projectfiles_vc7/gameengine/scenegraph/SG_SceneGraph.vcproj
index 753c0718f73..02bb647eb92 100644
--- a/projectfiles_vc7/gameengine/scenegraph/SG_SceneGraph.vcproj
+++ b/projectfiles_vc7/gameengine/scenegraph/SG_SceneGraph.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="SG_SceneGraph"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/kernel/gen_messaging/gen_messaging.vcproj b/projectfiles_vc7/kernel/gen_messaging/gen_messaging.vcproj
index 133d56e483e..e947f52bd6b 100644
--- a/projectfiles_vc7/kernel/gen_messaging/gen_messaging.vcproj
+++ b/projectfiles_vc7/kernel/gen_messaging/gen_messaging.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="gen_messaging"
 	SccProjectName=""
 	SccLocalPath="">
@@ -320,7 +320,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
diff --git a/projectfiles_vc7/kernel/system/SYS_system.vcproj b/projectfiles_vc7/kernel/system/SYS_system.vcproj
index 4f6054e1d93..50ffc1fbb99 100644
--- a/projectfiles_vc7/kernel/system/SYS_system.vcproj
+++ b/projectfiles_vc7/kernel/system/SYS_system.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.10"
 	Name="SYS_system"
 	SccProjectName=""
 	SccLocalPath="">
@@ -323,7 +323,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"