diff --git a/windows/VC6/mesa/mesa/mesa.dsp b/windows/VC6/mesa/mesa/mesa.dsp
index a2f2f2dff4f..7c7f72840dc 100644
--- a/windows/VC6/mesa/mesa/mesa.dsp
+++ b/windows/VC6/mesa/mesa/mesa.dsp
@@ -673,42 +673,18 @@ SOURCE=..\..\..\..\src\mesa\main\stencil.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_import.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\src\mesa\tnl\t_context.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\src\mesa\tnl\t_draw.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\src\mesa\tnl\t_pipeline.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_loopback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_playback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_arbprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_arbshader.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\src\mesa\tnl\t_vb_cull.c
 # End Source File
 # Begin Source File
@@ -761,22 +737,6 @@ SOURCE=..\..\..\..\src\mesa\tnl\t_vp_build.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_eval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_exec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_generic.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\src\mesa\main\texcompress.c
 # End Source File
 # Begin Source File
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index b63312c8862..a9f285568fe 100644
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -498,10 +498,7 @@
 				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">
+				RelativePath="..\..\..\..\src\mesa\tnl\t_draw.c">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_context.c">
@@ -509,21 +506,6 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_save_api.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_save_loopback.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_save_playback.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_arbprogram.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_arbshader.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cull.c">
 			</File>
@@ -563,18 +545,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>