[MSVC7] Update of projectfiles for the removal of the glue.

11 files changed, 52 insertions, 1345 deletions

diff --git a/projectfiles_vc7/blender/BLO_deflate/BLO_deflate.vcproj b/projectfiles_vc7/blender/BLO_deflate/BLO_deflate.vcproj
deleted file mode 100644
index e50ab22ebfd..00000000000
--- a/projectfiles_vc7/blender/BLO_deflate/BLO_deflate.vcproj
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="BLO_deflate"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="MT DLL Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\deflate\mtdll"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\deflate\mtdll"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\deflate\,..\..\..\source\blender\inflate\,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\deflate\mtdll/BLO_deflate.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\deflate\mtdll/"
-				ObjectFile=".\..\..\..\obj\windows\blender\deflate\mtdll/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\deflate\mtdll/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\deflate\mtdll\BLO_deflate.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\deflate\debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\deflate\debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\deflate\,..\..\..\source\blender\inflate\,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\deflate\debug/BLO_deflate.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\deflate\debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\deflate\debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\deflate\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\deflate\debug\BLO_deflate.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MT DLL Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\deflate\mtdll_debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\deflate\mtdll_debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\deflate\,..\..\..\source\blender\inflate\,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\deflate\mtdll_debug/BLO_deflate.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\deflate\mtdll_debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\deflate\mtdll_debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\deflate\mtdll_debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\deflate\mtdll_debug\BLO_deflate.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\deflate"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\deflate"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\deflate\,..\..\..\source\blender\inflate\,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				DefaultCharIsUnsigned="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\deflate/BLO_deflate.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\deflate/"
-				ObjectFile=".\..\..\..\obj\windows\blender\deflate/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\deflate/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\deflate\BLO_deflate.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\source\blender\deflate\intern\BLO_deflate.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\source\blender\deflate\BLO_deflate.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/projectfiles_vc7/blender/BLO_inflate/BLO_inflate.vcproj b/projectfiles_vc7/blender/BLO_inflate/BLO_inflate.vcproj
deleted file mode 100644
index 5c5548c90eb..00000000000
--- a/projectfiles_vc7/blender/BLO_inflate/BLO_inflate.vcproj
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="BLO_inflate"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\inflate\debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\inflate\debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\inflate,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\writestreamglue"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\inflate\debug/BLO_inflate.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\inflate\debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\inflate\debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\inflate\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\inflate\debug\BLO_inflate.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MT DLL Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\inflate\mtdll_debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\inflate\mtdll_debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\inflate,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\writestreamglue"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\inflate\mtdll_debug/BLO_inflate.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\inflate\mtdll_debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\inflate\mtdll_debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\inflate\mtdll_debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\inflate\mtdll_debug\BLO_inflate.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\inflate"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\inflate"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\inflate,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\writestreamglue"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				DefaultCharIsUnsigned="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\inflate/BLO_inflate.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\inflate/"
-				ObjectFile=".\..\..\..\obj\windows\blender\inflate/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\inflate/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\inflate\BLO_inflate.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MT DLL Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\inflate\mtdll"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\inflate\mtdll"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\inflate,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\writestreamglue"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\inflate\mtdll/BLO_inflate.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\inflate\mtdll/"
-				ObjectFile=".\..\..\..\obj\windows\blender\inflate\mtdll/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\inflate\mtdll/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\inflate\mtdll\BLO_inflate.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\source\blender\inflate\intern\BLO_inflate.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\source\blender\inflate\BLO_inflate.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/projectfiles_vc7/blender/BLO_readstreamglue/BLO_readstreamglue.vcproj b/projectfiles_vc7/blender/BLO_readstreamglue/BLO_readstreamglue.vcproj
deleted file mode 100644
index 66cc2a5bc67..00000000000
--- a/projectfiles_vc7/blender/BLO_readstreamglue/BLO_readstreamglue.vcproj
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="BLO_readstreamglue"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\readstreamglue"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\readstreamglue"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\readstreamglue\stubs,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\blenloader,..\..\..\source\blender\inflate,..\..\..\source\blender\decrypt,..\..\..\source\blender\verify,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				DefaultCharIsUnsigned="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\readstreamglue/BLO_readstreamglue.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\readstreamglue/"
-				ObjectFile=".\..\..\..\obj\windows\blender\readstreamglue/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\readstreamglue/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\readstreamglue\BLO_readstreamglue.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MT DLL Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\lib\windows\zlib\include,..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\readstreamglue\stubs,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\blenloader,..\..\..\source\blender\inflate,..\..\..\source\blender\decrypt,..\..\..\source\blender\verify,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug/BLO_readstreamglue.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug\BLO_readstreamglue.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MT DLL Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\readstreamglue\mtdll"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\readstreamglue\mtdll"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\readstreamglue\stubs,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\blenloader,..\..\..\source\blender\inflate,..\..\..\source\blender\decrypt,..\..\..\source\blender\verify,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\readstreamglue\mtdll/BLO_readstreamglue.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\readstreamglue\mtdll/"
-				ObjectFile=".\..\..\..\obj\windows\blender\readstreamglue\mtdll/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\readstreamglue\mtdll/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\readstreamglue\mtdll\BLO_readstreamglue.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\readstreamglue\debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\readstreamglue\debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\lib\windows\zlib\include,..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\readstreamglue\stubs,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\blenloader,..\..\..\source\blender\inflate,..\..\..\source\blender\decrypt,..\..\..\source\blender\verify,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\readstreamglue\debug/BLO_readstreamglue.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\readstreamglue\debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\readstreamglue\debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\readstreamglue\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\readstreamglue\debug\BLO_readstreamglue.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\source\blender\readstreamglue\intern\BLO_readStreamGlue.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\readstreamglue\intern\BLO_readStreamGlueLoopBack.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/projectfiles_vc7/blender/BLO_writeblenfile/BLO_writeblenfile.vcproj b/projectfiles_vc7/blender/BLO_writeblenfile/BLO_writeblenfile.vcproj
deleted file mode 100644
index 0b03092a328..00000000000
--- a/projectfiles_vc7/blender/BLO_writeblenfile/BLO_writeblenfile.vcproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="BLO_writeblenfile"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writeblenfile"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writeblenfile"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\blender\writestreamglue\,..\..\..\source\blender\blenloader\,..\..\..\source\blender\readblenfile,..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\writeblenfile\,..\..\..\source\blender\deflate\,..\..\..\source\blender\inflate\,..\..\..\..\lib\windows\zlib\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				DefaultCharIsUnsigned="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writeblenfile/BLO_writeblenfile.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writeblenfile/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writeblenfile/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writeblenfile/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writeblenfile\BLO_writeblenfile.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writeblenfile\debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writeblenfile\debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\blender\blenloader\,..\..\..\source\blender\readblenfile,..\..\..\source\kernel\gen_messaging,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\writeblenfile\,..\..\..\source\blender\deflate\,..\..\..\source\blender\inflate\,..\..\..\..\lib\windows\zlib\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writeblenfile\debug/BLO_writeblenfile.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writeblenfile\debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writeblenfile\debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writeblenfile\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writeblenfile\debug\BLO_writeblenfile.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\source\blender\writeblenfile\intern\BLO_writeblenfile.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\source\blender\writeblenfile\BLO_writeblenfile.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/projectfiles_vc7/blender/BLO_writestreamglue/BLO_writestreamglue.vcproj b/projectfiles_vc7/blender/BLO_writestreamglue/BLO_writestreamglue.vcproj
deleted file mode 100644
index feea675e435..00000000000
--- a/projectfiles_vc7/blender/BLO_writestreamglue/BLO_writestreamglue.vcproj
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="BLO_writestreamglue"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="MT DLL Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\deflate,..\..\..\source\blender\encrypt,..\..\..\source\blender\sign,..\..\..\source\blender\writeblenfile,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug/BLO_writestreamglue.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug\BLO_writestreamglue.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writestreamglue"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writestreamglue"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\deflate,..\..\..\source\blender\encrypt,..\..\..\source\blender\sign,..\..\..\source\blender\writeblenfile,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				DefaultCharIsUnsigned="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writestreamglue/BLO_writestreamglue.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writestreamglue/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writestreamglue/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writestreamglue/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writestreamglue\BLO_writestreamglue.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writestreamglue\debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writestreamglue\debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\deflate,..\..\..\source\blender\encrypt,..\..\..\source\blender\sign,..\..\..\source\blender\writeblenfile,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writestreamglue\debug/BLO_writestreamglue.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writestreamglue\debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writestreamglue\debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writestreamglue\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writestreamglue\debug\BLO_writestreamglue.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MT DLL Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writestreamglue\mtdll"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writestreamglue\mtdll"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\deflate,..\..\..\source\blender\encrypt,..\..\..\source\blender\sign,..\..\..\source\blender\writeblenfile,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writestreamglue\mtdll/BLO_writestreamglue.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writestreamglue\mtdll/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writestreamglue\mtdll/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writestreamglue\mtdll/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writestreamglue\mtdll\BLO_writestreamglue.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\intern\BLO_dumpFromMemory.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\intern\BLO_getPubKey.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\intern\BLO_streamGlueControl.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\intern\BLO_writeStreamGlue.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\BLO_getPubKey.h">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\BLO_writeStreamErrors.h">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\BLO_writeStreamGlue.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/projectfiles_vc7/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.vcproj b/projectfiles_vc7/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.vcproj
deleted file mode 100644
index 54f514939cf..00000000000
--- a/projectfiles_vc7/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.vcproj
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="BLO_writestreamglue_stub"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="MT DLL Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\deflate,..\..\..\source\blender\encrypt,..\..\..\source\blender\sign,..\..\..\source\blender\writeblenfile,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll/BLO_writestreamglue_stub.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll\BLO_writestreamglue_stub.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writestreamglue_stub\debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writestreamglue_stub\debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\deflate,..\..\..\source\blender\encrypt,..\..\..\source\blender\sign,..\..\..\source\blender\writeblenfile,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\debug/BLO_writestreamglue_stub.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writestreamglue_stub\debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writestreamglue_stub\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\..\obj\windows\blender\debug\BLO_writestreamglue_stub.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MT DLL Debug|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\deflate,..\..\..\source\blender\encrypt,..\..\..\source\blender\sign,..\..\..\source\blender\writeblenfile,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug/BLO_writestreamglue_stub.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug\BLO_writestreamglue_stub.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\obj\windows\blender\writestreamglue_stub"
-			IntermediateDirectory=".\..\..\..\obj\windows\blender\writestreamglue_stub"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\source\kernel\gen_messaging,..\..\..\..\lib\windows\zlib\include,..\..\..\source\blender\writestreamglue,..\..\..\source\blender\readstreamglue,..\..\..\source\blender\deflate,..\..\..\source\blender\encrypt,..\..\..\source\blender\sign,..\..\..\source\blender\writeblenfile,..\..\..\..\lib\windows\blenkey\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				DefaultCharIsUnsigned="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\writestreamglue_stub/BLO_writestreamglue_stub.pch"
-				AssemblerListingLocation=".\..\..\..\obj\windows\blender\writestreamglue_stub/"
-				ObjectFile=".\..\..\..\obj\windows\blender\writestreamglue_stub/"
-				ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\writestreamglue_stub/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\..\..\obj\windows\blender\writestreamglue_stub\BLO_writestreamglue_stub.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\stub\BLO_getPubKeySTUB.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\stub\BLO_keyStoreSTUB.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\stub\BLO_streamGlueControlSTUB.c">
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\writestreamglue\stub\BLO_writeStreamGlueSTUB.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/projectfiles_vc7/blender/blender.sln b/projectfiles_vc7/blender/blender.sln
index 471d45dd7f2..32c79cbbbc8 100644
--- a/projectfiles_vc7/blender/blender.sln
+++ b/projectfiles_vc7/blender/blender.sln
@@ -3,22 +3,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BKE_blenkernel", "blenkerne
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLI_blenlib", "blenlib\BLI_blenlib.vcproj", "{31628053-825D-4C06-8A21-D13883489718}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLO_deflate", "BLO_deflate\BLO_deflate.vcproj", "{8F315DC5-38F7-4AFD-A871-89590A5012FF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLO_inflate", "BLO_inflate\BLO_inflate.vcproj", "{E37B5120-344F-480D-A801-45144D34173F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLO_loader", "loader\BLO_loader.vcproj", "{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLO_readblenfile", "BLO_readblenfile\BLO_readblenfile.vcproj", "{DB6BE55D-B6D9-494D-856A-8764FF7BA91D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLO_readstreamglue", "BLO_readstreamglue\BLO_readstreamglue.vcproj", "{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLO_writeblenfile", "BLO_writeblenfile\BLO_writeblenfile.vcproj", "{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLO_writestreamglue", "BLO_writestreamglue\BLO_writestreamglue.vcproj", "{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLO_writestreamglue_stub", "BLO_writestreamglue_stub\BLO_writestreamglue_stub.vcproj", "{7A54A261-2A17-48B1-9BD6-F7990F1E4084}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_avi", "avi\BL_avi.vcproj", "{9A307EE5-CD77-47BC-BD87-62508C7E19D8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_imbuf", "imbuf\BL_imbuf.vcproj", "{415BFD6E-64CF-422B-AF88-C07F040A7292}"
@@ -89,11 +77,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BRE_yafray", "yafray\BRE_ya
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Release
+		ConfigName.0 = Debug
 		ConfigName.1 = MT DLL Debug
 		ConfigName.2 = MT DLL Release
 		ConfigName.3 = Profile
-		ConfigName.4 = Debug
+		ConfigName.4 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
 		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.0 = {F90BD995-FFA4-4B18-81E8-FA4322C939E8}
@@ -110,18 +98,15 @@ Global
 		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.11 = {0A73055E-4DED-40CD-9F72-9093ED3EEC7E}
 		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.12 = {E013786A-9575-4F34-81B2-33290357EE87}
 		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.13 = {727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.14 = {7A54A261-2A17-48B1-9BD6-F7990F1E4084}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.15 = {E37B5120-344F-480D-A801-45144D34173F}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.16 = {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.17 = {DB6BE55D-B6D9-494D-856A-8764FF7BA91D}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.18 = {D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.19 = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.20 = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.21 = {415BFD6E-64CF-422B-AF88-C07F040A7292}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.22 = {31628053-825D-4C06-8A21-D13883489718}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.23 = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.24 = {EC405272-28E3-4840-AAC2-53D6DE4E163D}
-		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.25 = {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.14 = {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.15 = {DB6BE55D-B6D9-494D-856A-8764FF7BA91D}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.16 = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.17 = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.18 = {415BFD6E-64CF-422B-AF88-C07F040A7292}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.19 = {31628053-825D-4C06-8A21-D13883489718}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.20 = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.21 = {EC405272-28E3-4840-AAC2-53D6DE4E163D}
+		{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.22 = {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}
 		{3D310C60-6771-48E4-BCCA-D2718CDED898}.0 = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
 		{3D310C60-6771-48E4-BCCA-D2718CDED898}.1 = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
 		{3D310C60-6771-48E4-BCCA-D2718CDED898}.2 = {415BFD6E-64CF-422B-AF88-C07F040A7292}
@@ -141,51 +126,42 @@ Global
 		{3D310C60-6771-48E4-BCCA-D2718CDED898}.16 = {BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE}
 		{3D310C60-6771-48E4-BCCA-D2718CDED898}.17 = {727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}
 		{3D310C60-6771-48E4-BCCA-D2718CDED898}.18 = {DB6BE55D-B6D9-494D-856A-8764FF7BA91D}
-		{3D310C60-6771-48E4-BCCA-D2718CDED898}.19 = {D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}
-		{3D310C60-6771-48E4-BCCA-D2718CDED898}.20 = {E37B5120-344F-480D-A801-45144D34173F}
-		{3D310C60-6771-48E4-BCCA-D2718CDED898}.21 = {7A54A261-2A17-48B1-9BD6-F7990F1E4084}
-		{3D310C60-6771-48E4-BCCA-D2718CDED898}.22 = {D8ABD6A5-1B36-4D62-934E-B5C6801130B0}
-		{3D310C60-6771-48E4-BCCA-D2718CDED898}.23 = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
-		{3D310C60-6771-48E4-BCCA-D2718CDED898}.24 = {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}
-		{3D310C60-6771-48E4-BCCA-D2718CDED898}.25 = {EC405272-28E3-4840-AAC2-53D6DE4E163D}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.0 = {E37B5120-344F-480D-A801-45144D34173F}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.1 = {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.2 = {8F315DC5-38F7-4AFD-A871-89590A5012FF}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3 = {9625642D-6F20-4FB6-A089-BE7441B223E3}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.4 = {9D4FC346-270C-4AD7-9D8E-2CF577B2947E}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.5 = {FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.6 = {2AE0D2D9-6A7A-44DE-9EFF-99C9E3257B49}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.7 = {106AE171-0083-41D6-A949-20DB0E8DC251}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.8 = {E013786A-9575-4F34-81B2-33290357EE87}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.9 = {727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.10 = {6B801390-5F95-4F07-81A7-97FBA046AACC}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.11 = {0A73055E-4DED-40CD-9F72-9093ED3EEC7E}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.12 = {AB590CED-F71F-4A17-A89B-18583ECD633D}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.13 = {51FB3D48-2467-4BFA-A321-D848252B437E}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.14 = {32CC75E2-EE85-45E6-8E3D-513F58464F43}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.15 = {09222F5E-1625-4FF3-A89A-384D16875EE5}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.16 = {BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.17 = {5B1C904C-BBBD-44A0-843A-447CBD6176AF}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.18 = {BB6AA598-B336-4F8B-9DF9-8CAE7BE71C23}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.19 = {FB88301F-F725-401B-ACD7-D2ABBF333B71}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.20 = {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.21 = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.22 = {EC405272-28E3-4840-AAC2-53D6DE4E163D}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.23 = {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.24 = {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.25 = {31628053-825D-4C06-8A21-D13883489718}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.26 = {0BB7E1A8-689A-4F02-A073-A3E06F989B25}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.27 = {415BFD6E-64CF-422B-AF88-C07F040A7292}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.28 = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.29 = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.30 = {EADC3C5A-6C51-4F03-8038-1553E7D7F740}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.31 = {8154A59A-CAED-403D-AB94-BC4E7C032666}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.32 = {F90BD995-FFA4-4B18-81E8-FA4322C939E8}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.33 = {E645CC32-4823-463E-82F0-46ADDE664018}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.34 = {6E24BF09-9653-4166-A871-F65CC9E98A9B}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.35 = {D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.36 = {DB6BE55D-B6D9-494D-856A-8764FF7BA91D}
-		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.37 = {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}
+		{3D310C60-6771-48E4-BCCA-D2718CDED898}.19 = {D8ABD6A5-1B36-4D62-934E-B5C6801130B0}
+		{3D310C60-6771-48E4-BCCA-D2718CDED898}.20 = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
+		{3D310C60-6771-48E4-BCCA-D2718CDED898}.21 = {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}
+		{3D310C60-6771-48E4-BCCA-D2718CDED898}.22 = {EC405272-28E3-4840-AAC2-53D6DE4E163D}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.0 = {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.1 = {9625642D-6F20-4FB6-A089-BE7441B223E3}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.2 = {2AE0D2D9-6A7A-44DE-9EFF-99C9E3257B49}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3 = {106AE171-0083-41D6-A949-20DB0E8DC251}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.4 = {E013786A-9575-4F34-81B2-33290357EE87}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.5 = {727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.6 = {6B801390-5F95-4F07-81A7-97FBA046AACC}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.7 = {0A73055E-4DED-40CD-9F72-9093ED3EEC7E}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.8 = {AB590CED-F71F-4A17-A89B-18583ECD633D}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.9 = {51FB3D48-2467-4BFA-A321-D848252B437E}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.10 = {32CC75E2-EE85-45E6-8E3D-513F58464F43}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.11 = {09222F5E-1625-4FF3-A89A-384D16875EE5}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.12 = {BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.13 = {5B1C904C-BBBD-44A0-843A-447CBD6176AF}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.14 = {BB6AA598-B336-4F8B-9DF9-8CAE7BE71C23}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.15 = {FB88301F-F725-401B-ACD7-D2ABBF333B71}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.16 = {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.17 = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.18 = {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.19 = {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.20 = {31628053-825D-4C06-8A21-D13883489718}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.21 = {0BB7E1A8-689A-4F02-A073-A3E06F989B25}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.22 = {415BFD6E-64CF-422B-AF88-C07F040A7292}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.23 = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.24 = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.25 = {EADC3C5A-6C51-4F03-8038-1553E7D7F740}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.26 = {8154A59A-CAED-403D-AB94-BC4E7C032666}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.27 = {F90BD995-FFA4-4B18-81E8-FA4322C939E8}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.28 = {E645CC32-4823-463E-82F0-46ADDE664018}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.29 = {6E24BF09-9653-4166-A871-F65CC9E98A9B}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.30 = {DB6BE55D-B6D9-494D-856A-8764FF7BA91D}
+		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.31 = {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}.Debug.ActiveCfg = Debug|Win32
@@ -208,26 +184,6 @@ Global
 		{31628053-825D-4C06-8A21-D13883489718}.Profile.Build.0 = MT DLL Debug|Win32
 		{31628053-825D-4C06-8A21-D13883489718}.Release.ActiveCfg = Release|Win32
 		{31628053-825D-4C06-8A21-D13883489718}.Release.Build.0 = Release|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.Debug.ActiveCfg = Debug|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.Debug.Build.0 = Debug|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.MT DLL Debug.ActiveCfg = MT DLL Debug|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.MT DLL Debug.Build.0 = MT DLL Debug|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.MT DLL Release.ActiveCfg = MT DLL Release|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.MT DLL Release.Build.0 = MT DLL Release|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.Profile.ActiveCfg = Release|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.Profile.Build.0 = Release|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.Release.ActiveCfg = Release|Win32
-		{8F315DC5-38F7-4AFD-A871-89590A5012FF}.Release.Build.0 = Release|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.Debug.ActiveCfg = Debug|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.Debug.Build.0 = Debug|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.MT DLL Debug.ActiveCfg = MT DLL Debug|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.MT DLL Debug.Build.0 = MT DLL Debug|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.MT DLL Release.ActiveCfg = MT DLL Release|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.MT DLL Release.Build.0 = MT DLL Release|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.Profile.ActiveCfg = MT DLL Release|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.Profile.Build.0 = MT DLL Release|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.Release.ActiveCfg = Release|Win32
-		{E37B5120-344F-480D-A801-45144D34173F}.Release.Build.0 = Release|Win32
 		{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}.Debug.ActiveCfg = Debug|Win32
 		{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}.Debug.Build.0 = Debug|Win32
 		{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}.MT DLL Debug.ActiveCfg = MT DLL Debug|Win32
@@ -248,46 +204,6 @@ Global
 		{DB6BE55D-B6D9-494D-856A-8764FF7BA91D}.Profile.Build.0 = Release|Win32
 		{DB6BE55D-B6D9-494D-856A-8764FF7BA91D}.Release.ActiveCfg = Release|Win32
 		{DB6BE55D-B6D9-494D-856A-8764FF7BA91D}.Release.Build.0 = Release|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.Debug.ActiveCfg = Debug|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.Debug.Build.0 = Debug|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.MT DLL Debug.ActiveCfg = MT DLL Debug|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.MT DLL Debug.Build.0 = MT DLL Debug|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.MT DLL Release.ActiveCfg = MT DLL Release|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.MT DLL Release.Build.0 = MT DLL Release|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.Profile.ActiveCfg = Debug|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.Profile.Build.0 = Debug|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.Release.ActiveCfg = Release|Win32
-		{D3AFF1CF-DCC7-494B-A7BC-F2A7F57B3DF3}.Release.Build.0 = Release|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.Debug.ActiveCfg = Debug|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.Debug.Build.0 = Debug|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.MT DLL Debug.ActiveCfg = Debug|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.MT DLL Debug.Build.0 = Debug|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.MT DLL Release.ActiveCfg = Release|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.MT DLL Release.Build.0 = Release|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.Profile.ActiveCfg = Debug|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.Profile.Build.0 = Debug|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.Release.ActiveCfg = Release|Win32
-		{9D4FC346-270C-4AD7-9D8E-2CF577B2947E}.Release.Build.0 = Release|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.Debug.ActiveCfg = Debug|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.Debug.Build.0 = Debug|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.MT DLL Debug.ActiveCfg = MT DLL Debug|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.MT DLL Debug.Build.0 = MT DLL Debug|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.MT DLL Release.ActiveCfg = MT DLL Release|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.MT DLL Release.Build.0 = MT DLL Release|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.Profile.ActiveCfg = MT DLL Release|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.Profile.Build.0 = MT DLL Release|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.Release.ActiveCfg = Release|Win32
-		{FB51F57A-0C77-414C-92AC-DE6E1FC2DB7F}.Release.Build.0 = Release|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.Debug.ActiveCfg = Debug|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.Debug.Build.0 = Debug|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.MT DLL Debug.ActiveCfg = MT DLL Debug|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.MT DLL Debug.Build.0 = MT DLL Debug|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.MT DLL Release.ActiveCfg = MT DLL Release|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.MT DLL Release.Build.0 = MT DLL Release|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.Profile.ActiveCfg = Release|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.Profile.Build.0 = Release|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.Release.ActiveCfg = Release|Win32
-		{7A54A261-2A17-48B1-9BD6-F7990F1E4084}.Release.Build.0 = Release|Win32
 		{9A307EE5-CD77-47BC-BD87-62508C7E19D8}.Debug.ActiveCfg = Debug|Win32
 		{9A307EE5-CD77-47BC-BD87-62508C7E19D8}.Debug.Build.0 = Debug|Win32
 		{9A307EE5-CD77-47BC-BD87-62508C7E19D8}.MT DLL Debug.ActiveCfg = MT DLL Debug|Win32
diff --git a/projectfiles_vc7/blender/blender.vcproj b/projectfiles_vc7/blender/blender.vcproj
index 721717b88e6..43aad7edff8 100644
--- a/projectfiles_vc7/blender/blender.vcproj
+++ b/projectfiles_vc7/blender/blender.vcproj
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\source\blender\misc,..\..\..\lib\windows\guardedalloc\include,..\..\source\blender\blenlib,..\..\source\kernel\gen_messaging,..\..\source\blender\include,..\..\source\blender,..\..\source\blender\makesdna,..\..\source\blender\blenkernel,..\..\source\blender\blenloader,..\..\source\blender\python,..\..\source\blender\imbuf,..\..\source\blender\render\extern\include,..\..\source\blender\radiosity\extern\include,..\..\source\kernel\gen_system,..\..\source\blender\renderconverter\,..\..\source\blender\renderui\"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;WITH_QUICKTIME;GAMEBLENDER=1;FTGL_STATIC_LIBRARY"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;WITH_QUICKTIME;GAMEBLENDER=1;FTGL_STATIC_LIBRARY;USE_SUMO_SOLID"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static_ST.lib gnu_gettext.lib qtmlClient.lib odelib.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 libz_st.lib libmoto.lib PHY_Sumo.lib solid.lib qhull.lib"
+				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static_ST.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 libz_st.lib libmoto.lib PHY_Sumo.lib solid.lib qhull.lib"
 				ShowProgress="0"
 				OutputFile="..\..\bin\blender.exe"
 				LinkIncremental="1"
diff --git a/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj b/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
index 39c2f644a03..5f14c081bd8 100644
--- a/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
+++ b/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
@@ -155,7 +155,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\..\lib\windows\QTDevWin\CIncludes"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\..\lib\windows\QTDevWin\CIncludes"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Physics.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
index fb03a71330a..496305ec056 100644
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="common,dummy"
+				AdditionalIncludeDirectories="common;dummy;..\..\..\..\intern\moto\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_SUMO_SOLID"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
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 39e972c45cd..f3253c78cb8 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
@@ -57,7 +57,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Sumo\include;..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\..\..\lib\windows\moto\include;..\..\..\..\..\extern\solid"
+				AdditionalIncludeDirectories="..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Sumo\include;..\..\..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\..\..\extern\solid;..\..\..\..\..\intern\moto\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_SUMO_SOLID"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"