4 files changed, 8 insertions, 4 deletions
diff --git a/libxcb/src/xcb_auth.c b/libxcb/src/xcb_auth.c
index dbfd24657..f2a3ab610 100644
--- a/libxcb/src/xcb_auth.c
+++ b/libxcb/src/xcb_auth.c
@@ -30,7 +30,9 @@
 #include <sys/param.h>
 #include <unistd.h>
 #include <stdlib.h>
+#ifndef _MSC_VER
 #include <arpa/inet.h>
+#endif
 
 #ifdef __INTERIX
 /* _don't_ ask. interix has INADDR_LOOPBACK in here. */
diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c
index 499c54904..647096ce6 100644
--- a/libxcb/src/xcb_util.c
+++ b/libxcb/src/xcb_util.c
@@ -34,7 +34,9 @@
 #include <stddef.h>
 #include <unistd.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <arpa/inet.h>
+#endif
 
 #ifdef _WIN32
 #include "xcb_windefs.h"
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 4fd4cdcb0..44a8b8722 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -178,7 +178,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />
-    <ClCompile Include="..\..\..\..\src\glsl\standalone_scaffolding.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ralloc.c" />
     <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />
     <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
@@ -247,6 +246,7 @@
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c" />
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c" />
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_opt_constant_fold.c" />
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c" />
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c" />
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 7fc8b900e..5cf0045a5 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -395,6 +395,9 @@
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_opt_constant_fold.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -638,9 +641,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\standalone_scaffolding.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>