diff --git a/windows/VC8/mesa/gdi/gdi.vcproj b/windows/VC8/mesa/gdi/gdi.vcproj
index 7b3efc4d886..58d8ab1df16 100644
--- a/windows/VC8/mesa/gdi/gdi.vcproj
+++ b/windows/VC8/mesa/gdi/gdi.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="gdi"
 	ProjectGUID="{A1B24907-E196-4826-B6AF-26723629B633}"
+	RootNamespace="gdi"
 	>
 	<Platforms>
 		<Platform
@@ -49,7 +50,7 @@
 				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"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/gdi.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@@ -74,12 +75,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="mesa.lib msvcrtd.lib gdi32.lib user32.lib winmm.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"
@@ -147,7 +146,7 @@
 				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"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/gdi.pch"
 				AssemblerListingLocation=".\Release/"
@@ -171,12 +170,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="mesa.lib winmm.lib gdi32.lib user32.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"
diff --git a/windows/VC8/mesa/glu/glu.vcproj b/windows/VC8/mesa/glu/glu.vcproj
index 016b0b9716b..37d829e178e 100644
--- a/windows/VC8/mesa/glu/glu.vcproj
+++ b/windows/VC8/mesa/glu/glu.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="glu"
 	ProjectGUID="{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
+	RootNamespace="glu"
 	>
 	<Platforms>
 		<Platform
@@ -47,9 +48,9 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/glu.pch"
 				AssemblerListingLocation=".\Release/"
@@ -72,12 +73,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="msvcrt.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
 				OutputFile="Release/GLU32.DLL"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../gdi/Release"
-				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
 				ProgramDatabaseFile=".\Release/GLU32.pdb"
 				ImportLibrary=".\Release/GLU32.lib"
@@ -142,9 +141,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/glu.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@@ -167,12 +166,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="msvcrtd.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
 				OutputFile="Debug/GLU32.DLL"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../gdi/Debug"
-				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/GLU32.pdb"
@@ -418,11 +415,11 @@
 				>
 			</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\nurbtess\glimports.h"
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"
 				>
 			</File>
 			<File
@@ -517,22 +514,22 @@
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h"
 				>
diff --git a/windows/VC8/mesa/osmesa/osmesa.vcproj b/windows/VC8/mesa/osmesa/osmesa.vcproj
index 2ba0077fca2..07e2f439a6b 100644
--- a/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ b/windows/VC8/mesa/osmesa/osmesa.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="osmesa"
 	ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
+	RootNamespace="osmesa"
 	>
 	<Platforms>
 		<Platform
@@ -47,9 +48,9 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/osmesa.pch"
 				AssemblerListingLocation=".\Release/"
@@ -73,12 +74,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
 				OutputFile="Release/OSMESA32.DLL"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../gdi/Release"
-				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
 				ProgramDatabaseFile=".\Release/OSMESA32.pdb"
 				ImportLibrary=".\Release/OSMESA32.lib"
@@ -143,9 +142,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/osmesa.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@@ -169,12 +168,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
 				OutputFile="Debug/OSMESA32.DLL"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../gdi/Debug"
-				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/OSMESA32.pdb"
@@ -214,10 +211,6 @@
 			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\osmesa\osmesa.c"
 				>
@@ -231,6 +224,10 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath="..\..\..\..\include\gl\osmesa.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/windows/VC8/progs/demos/gears.vcproj b/windows/VC8/progs/demos/gears.vcproj
index 891acd641ab..4fac301d889 100644
--- a/windows/VC8/progs/demos/gears.vcproj
+++ b/windows/VC8/progs/demos/gears.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="gears"
 	ProjectGUID="{3A7B0671-10F8-45D1-B012-F6D650F817CE}"
+	RootNamespace="gears"
 	>
 	<Platforms>
 		<Platform
@@ -45,7 +46,7 @@
 				AdditionalIncludeDirectories="../../../../include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/gears.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@@ -69,7 +70,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Debug/gears.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -136,7 +136,7 @@
 				AdditionalIncludeDirectories="../../../../include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/gears.pch"
 				AssemblerListingLocation=".\Release/"
@@ -160,7 +160,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Release/gears.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
diff --git a/windows/VC8/progs/glut/glut.vcproj b/windows/VC8/progs/glut/glut.vcproj
index 8d03c378412..792490b9e36 100644
--- a/windows/VC8/progs/glut/glut.vcproj
+++ b/windows/VC8/progs/glut/glut.vcproj
@@ -50,7 +50,7 @@
 				AdditionalIncludeDirectories="../../../../include"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/glut.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@@ -74,12 +74,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib msvcrtd.lib gdi32.lib user32.lib oldnames.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="winmm.lib opengl32.lib glu32.lib"
 				OutputFile="Debug/GLUT32.DLL"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../mesa/Debug"
-				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile="..\..\..\..\src\glut\glx\glut.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/GLUT32.pdb"
@@ -147,7 +146,7 @@
 				AdditionalIncludeDirectories="../../../../include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/glut.pch"
 				AssemblerListingLocation=".\Release/"
@@ -171,12 +170,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="opengl32.lib glu32.lib user32.lib winmm.lib gdi32.lib msvcrt.lib oldnames.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="winmm.lib opengl32.lib glu32.lib"
 				OutputFile="Release/GLUT32.DLL"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../mesa/Release"
-				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile="..\..\..\..\src\glut\glx\glut.def"
 				ProgramDatabaseFile=".\Release/GLUT32.pdb"
 				ImportLibrary=".\Release/GLUT32.lib"