diff --git a/api/reduce.C b/api/reduce.C
index 7f7068c3a9..6650929ec2 100644
--- a/api/reduce.C
+++ b/api/reduce.C
@@ -141,10 +141,10 @@ void REDUCED_ARRAY::reduce_source_row(float* in, float* out) {
             out[ri] += in[i];
             break;
             case REDUCE_METHOD_MIN:
-            out[ri] = min(out[ri],in[i]);
+            out[ri] = std::min(out[ri],in[i]);
             break;
             case REDUCE_METHOD_MAX:
-            out[ri] = max(out[ri],in[i]);
+            out[ri] = std::max(out[ri],in[i]);
             break;
         }
     }
@@ -255,7 +255,7 @@ void REDUCED_ARRAY::draw_row_quad(int row) {
         y10 = draw_pos[1] + draw_size[1]*h10;
         y11 = draw_pos[1] + draw_size[1]*h11;
 
-        float h = max(h00, max(h01, max(h10, h11)));
+        float h = std::max(h00, std::max(h01, std::max(h10, h11)));
         double hue = hue0 + (dhue*i)/rdimx;
         if (hue > 1) hue -= 1;
         double sat = 1.;
diff --git a/checkin_notes b/checkin_notes
index 4f8cc24cee..ffefe14d21 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -20802,3 +20802,12 @@ Rom    6 Dec 2004
     win_build/
         boinc.sln
         boinc_gui.vcproj
+
+Rom    6 Dec 2004
+    - Force include StdAfx.h for all files in boinc_gui.vcproj fixes the
+        linker problems.
+
+    win_build/
+        boinc.sln
+        boinc_gui.vcproj
+    
\ No newline at end of file
diff --git a/win_build/boinc.sln b/win_build/boinc.sln
index 55f78460a9..5d6d04e405 100644
--- a/win_build/boinc.sln
+++ b/win_build/boinc.sln
@@ -30,6 +30,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "BOINCGUI.vcproj
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_gui", "boinc_gui.vcproj", "{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}"
+	ProjectSection(ProjectDependencies) = postProject
+		{264D5059-0A60-4B6E-8979-245BC31141FE} = {264D5059-0A60-4B6E-8979-245BC31141FE}
+		{21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
+		{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -64,6 +71,10 @@ Global
 		{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.Build.0 = Debug|Win32
 		{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.ActiveCfg = Release|Win32
 		{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.Build.0 = Release|Win32
+		{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Debug.ActiveCfg = Debug|Win32
+		{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Debug.Build.0 = Debug|Win32
+		{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Release.ActiveCfg = Release|Win32
+		{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/win_build/boinc_gui.vcproj b/win_build/boinc_gui.vcproj
index 264590982d..5587fb64a1 100644
--- a/win_build/boinc_gui.vcproj
+++ b/win_build/boinc_gui.vcproj
@@ -111,7 +111,8 @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
-				CompileAs="2"/>
+				CompileAs="2"
+				ForcedIncludeFiles="StdAfx.h"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -1336,10 +1337,10 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\client\win\boinc.bmp">
+				RelativePath="..\client\win\res\boinc.bmp">
 			</File>
 			<File
-				RelativePath="..\client\win\res\boinc.bmp">
+				RelativePath="..\client\win\boinc.bmp">
 			</File>
 			<File
 				RelativePath="..\client\win\boinc_gui.rc">
@@ -1359,10 +1360,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\client\win\res\boincsm.bmp">
+				RelativePath="..\client\win\boincsm.bmp">
 			</File>
 			<File
-				RelativePath="..\client\win\boincsm.bmp">
+				RelativePath="..\client\win\res\boincsm.bmp">
 			</File>
 			<File
 				RelativePath="..\res\CoreClient.ico">