diff --git a/windows/VC7/mesa/gdi/gdi.vcproj b/windows/VC7/mesa/gdi/gdi.vcproj
index 82de75dc5d8..0dc7892a4b1 100644
--- a/windows/VC7/mesa/gdi/gdi.vcproj
+++ b/windows/VC7/mesa/gdi/gdi.vcproj
@@ -1,181 +1,195 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="gdi"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/gdi.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="mesa.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
-				OutputFile="Debug/OPENGL32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../mesa/Debug"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/OPENGL32.pdb"
-				ImportLibrary=".\Debug/OPENGL32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/gdi.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\OPENGL32.LIB ..\..\..\..\lib
-copy Debug\OPENGL32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/gdi.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="mesa.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
-				OutputFile="Release/OPENGL32.DLL"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../mesa/Release"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				ProgramDatabaseFile=".\Release/OPENGL32.pdb"
-				ImportLibrary=".\Release/OPENGL32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/gdi.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\OPENGL32.LIB ..\..\..\..\lib
-copy Release\OPENGL32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gdi"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\Debug/gdi.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="mesa.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
+				OutputFile="Debug/OPENGL32.DLL"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="../mesa/Debug"
+				IgnoreAllDefaultLibraries="TRUE"
+				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/OPENGL32.pdb"
+				ImportLibrary=".\Debug/OPENGL32.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/gdi.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy Debug\OPENGL32.LIB ..\..\..\..\lib
+copy Debug\OPENGL32.DLL ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos
+"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				PrecompiledHeaderFile=".\Release/gdi.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="mesa.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
+				OutputFile="Release/OPENGL32.DLL"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="../mesa/Release"
+				IgnoreAllDefaultLibraries="TRUE"
+				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
+				ProgramDatabaseFile=".\Release/OPENGL32.pdb"
+				ImportLibrary=".\Release/OPENGL32.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/gdi.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy Release\OPENGL32.LIB ..\..\..\..\lib
+copy Release\OPENGL32.DLL ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos
+"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/windows/VC7/mesa/glu/glu.vcproj b/windows/VC7/mesa/glu/glu.vcproj
index e0c481e011f..3f057317c0c 100644
--- a/windows/VC7/mesa/glu/glu.vcproj
+++ b/windows/VC7/mesa/glu/glu.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.00"
+	Version="7.10"
 	Name="glu"
 	SccProjectName=""
 	SccLocalPath="">
@@ -70,8 +70,14 @@ if exist ..\..\..\..\progs\demos copy Release\GLU32.DLL ..\..\..\..\progs\demos
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -134,10 +140,18 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -230,6 +244,9 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h">
 			</File>
@@ -239,9 +256,6 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h">
 			</File>
@@ -297,10 +311,10 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h">
@@ -314,9 +328,6 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\include\gluos.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h">
 			</File>
@@ -326,6 +337,9 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h">
 			</File>
@@ -357,10 +371,10 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h">
@@ -371,18 +385,18 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h">
 			</File>
@@ -459,10 +473,10 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h">
@@ -516,9 +530,6 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 		<Filter
 			Name="C++ files"
 			Filter=".cc">
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libtess\README">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc">
 			</File>
@@ -633,15 +644,15 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc">
 			</File>
@@ -681,6 +692,9 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\glu\sgi\libtess\README">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc">
 			</File>
@@ -700,10 +714,10 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc">
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc">
diff --git a/windows/VC7/mesa/mesa.sln b/windows/VC7/mesa/mesa.sln
index ada5568f489..ae47790753b 100644
--- a/windows/VC7/mesa/mesa.sln
+++ b/windows/VC7/mesa/mesa.sln
@@ -1,20 +1,26 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-		{A1B24907-E196-4826-B6AF-26723629B633}.0 = {2120C974-2717-4709-B44F-D6E6D0A56448}
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.0 = {A1B24907-E196-4826-B6AF-26723629B633}
+		Debug = Debug
+		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{A1B24907-E196-4826-B6AF-26723629B633}.Debug.ActiveCfg = Debug|Win32
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index 668c6fbb814..8a682585cda 100644
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.00"
+	Version="7.10"
 	Name="mesa"
 	SccProjectName=""
 	SccLocalPath="">
@@ -55,6 +55,12 @@
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -101,18 +107,20 @@
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\..\src\mesa\array_cache\ac_context.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\array_cache\ac_import.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\accum.c">
 			</File>
@@ -128,15 +136,15 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\api_validate.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\arrayobj.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.c">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\arrayobj.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.c">
 			</File>
@@ -236,6 +244,15 @@
 						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.c">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c">
 			</File>
@@ -299,15 +316,9 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertexec.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\occlude.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\pixel.c">
 			</File>
@@ -317,9 +328,33 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\polygon.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_debug.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_execute.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_print.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\program.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\programopt.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\queryobj.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\rastpos.c">
 			</File>
@@ -341,9 +376,6 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_arbshader.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.c">
 			</File>
@@ -377,6 +409,9 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c">
 			</File>
@@ -389,9 +424,6 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_nvfragprog.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_points.c">
 			</File>
@@ -420,28 +452,16 @@
 				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shaderobjects.c">
+				RelativePath="..\..\..\..\src\mesa\shader\shader_api.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.c">
+				RelativePath="..\..\..\..\src\mesa\main\shaders.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_analyse.c">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.c">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.c">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c">
@@ -459,32 +479,47 @@
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute.c">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute_x86.c">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_export.c">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_texsample.c">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.c">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.c">
 			</File>
@@ -497,15 +532,12 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\stencil.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_array_api.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_array_import.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_context.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\tnl\t_draw.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c">
 			</File>
@@ -548,18 +580,6 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_api.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_eval.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_exec.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_generic.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\texcompress.c">
 			</File>
@@ -593,6 +613,48 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\varray.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_rebase.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_api.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c">
 				<FileConfiguration
@@ -750,6 +812,9 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h">
 			</File>
@@ -834,9 +899,6 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvfragprog.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.h">
 			</File>
@@ -846,12 +908,6 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\nvvertprog.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\occlude.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\pixel.h">
 			</File>
@@ -861,14 +917,35 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\polygon.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_debug.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_execute.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_print.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\program.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\main\rastpos.h">
+				RelativePath="..\..\..\..\src\mesa\shader\programopt.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\main\rbadaptors.h">
+				RelativePath="..\..\..\..\src\mesa\main\queryobj.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\rastpos.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h">
@@ -912,6 +989,9 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.h">
 			</File>
@@ -961,47 +1041,77 @@
 				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shaderobjects.h">
+				RelativePath="..\..\..\..\src\mesa\shader\shader_api.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.h">
+				RelativePath="..\..\..\..\src\mesa\main\shaders.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\simple_list.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble.h">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.h">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute.h">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mesa.h">
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h">
 			</File>
@@ -1026,24 +1136,12 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_array_api.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_array_import.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_context.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_save_api.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_arbprogram.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h">
 			</File>
@@ -1059,9 +1157,6 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_api.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\texcompress.h">
 			</File>
@@ -1093,10 +1188,28 @@
 				RelativePath="..\..\..\..\src\mesa\tnl\tnl.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\traverse_wrap.h">
+				RelativePath="..\..\..\..\src\mesa\main\varray.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\main\varray.h">
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\version.h">
diff --git a/windows/VC7/mesa/osmesa/osmesa.vcproj b/windows/VC7/mesa/osmesa/osmesa.vcproj
index 266aff509f5..553dad7e6a1 100644
--- a/windows/VC7/mesa/osmesa/osmesa.vcproj
+++ b/windows/VC7/mesa/osmesa/osmesa.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.00"
+	Version="7.10"
 	Name="osmesa"
 	SccProjectName=""
 	SccLocalPath="">
@@ -71,8 +71,14 @@ if exist ..\..\..\..\progs\demos copy Release\OSMESA32.DLL ..\..\..\..\progs\dem
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -136,10 +142,18 @@ if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"