diff --git a/checkin_notes b/checkin_notes
index 987463ef08..478f053bac 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10364,10 +10364,10 @@ Rom    Mar 5 2004
       boinc.scr     (Before Changes)       244KB         88KB
       boinc.dll     (Before Changes)       136KB         44KB
 
-      boinc_gui.exe (After Changes)        1.716MB       428KB
-      boinc_cli.exe (After Changes)        624KB         412KB
-      boinc.scr     (After Changes)        188KB         116KB
-      boinc.dll     (After Changes)        140KB         58KB
+      boinc_gui.exe (After Changes)        1.716MB       332KB
+      boinc_cli.exe (After Changes)        624KB         324KB
+      boinc.scr     (After Changes)        188KB         88KB
+      boinc.dll     (After Changes)        140KB         35KB
 
     I pretty much touched all the source and header files.  This checkin should not have any
     effect on any platform other than Windows.
diff --git a/win_build/boinc_cli.vcproj b/win_build/boinc_cli.vcproj
index 58f61b9d94..e442e43edc 100644
--- a/win_build/boinc_cli.vcproj
+++ b/win_build/boinc_cli.vcproj
@@ -50,6 +50,7 @@
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Build\Debug/boinc_cli.pdb"
 				SubSystem="1"
+				OptimizeReferences="0"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -121,6 +122,7 @@
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Build\Release/boinc_cli.pdb"
 				SubSystem="1"
+				OptimizeReferences="2"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -1176,10 +1178,10 @@
 				RelativePath="..\client\ss_logic.h">
 			</File>
 			<File
-				RelativePath="..\client\win\Stackwalker.h">
+				RelativePath="..\api\win\Stackwalker.h">
 			</File>
 			<File
-				RelativePath="..\api\win\Stackwalker.h">
+				RelativePath="..\client\win\Stackwalker.h">
 			</File>
 			<File
 				RelativePath="..\client\stdafx.h">
diff --git a/win_build/boinc_dll.vcproj b/win_build/boinc_dll.vcproj
index b798168ca1..3074a74b8c 100644
--- a/win_build/boinc_dll.vcproj
+++ b/win_build/boinc_dll.vcproj
@@ -47,6 +47,7 @@
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Build\Debug/boinc_dll.pdb"
 				SubSystem="2"
+				OptimizeReferences="0"
 				ImportLibrary=".\Build\Debug/boinc.lib"
 				TargetMachine="1"/>
 			<Tool
@@ -115,6 +116,7 @@
 				ModuleDefinitionFile="..\client\win\win_idle_tracker.def"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Build\Release/boinc_dll.pdb"
+				OptimizeReferences="2"
 				ImportLibrary=".\Build\Release/boinc.lib"
 				TargetMachine="1"/>
 			<Tool
diff --git a/win_build/boinc_gui.vcproj b/win_build/boinc_gui.vcproj
index a598ec3524..b7f02131ff 100644
--- a/win_build/boinc_gui.vcproj
+++ b/win_build/boinc_gui.vcproj
@@ -51,6 +51,7 @@
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Build\Release/boinc_gui.pdb"
 				SubSystem="2"
+				OptimizeReferences="2"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -124,6 +125,7 @@
 				GenerateMapFile="TRUE"
 				MapFileName=".\Build\Debug\boinc_gui\obj/boinc_gui.map"
 				SubSystem="2"
+				OptimizeReferences="0"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -1389,10 +1391,10 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\client\win\res\boinc.bmp">
+				RelativePath="..\client\win\boinc.bmp">
 			</File>
 			<File
-				RelativePath="..\client\win\boinc.bmp">
+				RelativePath="..\client\win\res\boinc.bmp">
 			</File>
 			<File
 				RelativePath="..\client\win\boinc_gui.rc">
@@ -1412,10 +1414,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\client\win\boincsm.bmp">
+				RelativePath="..\client\win\res\boincsm.bmp">
 			</File>
 			<File
-				RelativePath="..\client\win\res\boincsm.bmp">
+				RelativePath="..\client\win\boincsm.bmp">
 			</File>
 			<File
 				RelativePath="..\res\CoreClient.ico">
diff --git a/win_build/boinc_ss.vcproj b/win_build/boinc_ss.vcproj
index cab0c424e5..4cead90abe 100644
--- a/win_build/boinc_ss.vcproj
+++ b/win_build/boinc_ss.vcproj
@@ -51,6 +51,7 @@
 				SubSystem="2"
 				StackReserveSize="2097152"
 				StackCommitSize="2097152"
+				OptimizeReferences="0"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -121,6 +122,7 @@
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Build\Release/boinc_scr.pdb"
 				SubSystem="2"
+				OptimizeReferences="2"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"