4 files changed, 8 insertions, 8 deletions
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
index a2ca8bd1b..0a5698b9d 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -166,7 +166,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
-    <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
index 8681fca80..f36471bbd 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -243,9 +243,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -291,6 +288,9 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 563ed3044..397074388 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -189,7 +189,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
-    <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index e7c2dc479..5acc18644 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -692,9 +692,6 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -755,6 +752,9 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\objectlabel.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">