From c20b00868c1c97e62caa78d3e2e95d2937a94ca4 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Mon, 18 Jul 2005 06:37:51 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=6667
---
 checkin_notes                                 |   9 +
 win_build/boinc.sln                           |  73 +++--
 win_build/boinc_cli.vcproj                    | 232 +-------------
 win_build/boinc_ss.vcproj                     |  78 +----
 ...inc_guirpc_test.vcproj => boinccmd.vcproj} | 113 +------
 .../{BOINCGUI.vcproj => boincmgr.vcproj}      | 106 +------
 win_build/libboinc.vcproj                     | 300 ++++++++++++++++++
 win_build/libboincapi.vcproj                  | 135 ++++++++
 .../{RSAEuro.vcproj => librsaeuro.vcproj}     |   7 +-
 win_build/upper_case.vcproj                   | 263 +--------------
 10 files changed, 524 insertions(+), 792 deletions(-)
 rename win_build/{boinc_guirpc_test.vcproj => boinccmd.vcproj} (69%)
 rename win_build/{BOINCGUI.vcproj => boincmgr.vcproj} (81%)
 create mode 100644 win_build/libboinc.vcproj
 create mode 100644 win_build/libboincapi.vcproj
 rename win_build/{RSAEuro.vcproj => librsaeuro.vcproj} (98%)

diff --git a/checkin_notes b/checkin_notes
index 83d1a1c4fd..f54c945c55 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9229,3 +9229,12 @@ David  17 July 2005
 
     client/
         cs_scheduler.C
+
+Rom    17 July 2005
+    - Windows project file cleanup
+        Add a library for libboinc and libboinc_api and remove duplicate
+        compilation from remain projects.
+
+    win_build/
+        *.vcproj
+        *.sln
diff --git a/win_build/boinc.sln b/win_build/boinc.sln
index 4900e3484b..433113c86e 100644
--- a/win_build/boinc.sln
+++ b/win_build/boinc.sln
@@ -1,12 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSAEuro", "RSAEuro.vcproj", "{264D5059-0A60-4B6E-8979-245BC31141FE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc", "boinc_cli.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
 	ProjectSection(ProjectDependencies) = postProject
-		{264D5059-0A60-4B6E-8979-245BC31141FE} = {264D5059-0A60-4B6E-8979-245BC31141FE}
-		{21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
+		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}
 		{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
 	EndProjectSection
 EndProject
@@ -16,43 +11,47 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_dll", "boinc_dll.vcpr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_ss", "boinc_ss.vcproj", "{21E7357D-41D8-444C-A120-18064B497174}"
 	ProjectSection(ProjectDependencies) = postProject
+		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upper_case", "upper_case.vcproj", "{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}"
 	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_cmd", "boinc_guirpc_test.vcproj", "{DA997BD1-B575-465C-9851-EEBB727F506A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{06113715-AC51-4E91-8B9D-C987CABE0920} = {06113715-AC51-4E91-8B9D-C987CABE0920}
-		{21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
-		{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "BOINCGUI.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
-	ProjectSection(ProjectDependencies) = postProject
-		{06113715-AC51-4E91-8B9D-C987CABE0920} = {06113715-AC51-4E91-8B9D-C987CABE0920}
-		{21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
-		{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
+		{0BC1DB36-030A-4321-B387-1CEE2611E329} = {0BC1DB36-030A-4321-B387-1CEE2611E329}
+		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}
 	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
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboinc_api", "libboincapi.vcproj", "{0BC1DB36-030A-4321-B387-1CEE2611E329}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboinc", "libboinc.vcproj", "{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_cmd", "boinccmd.vcproj", "{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "boincmgr.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librsaeuro", "librsaeuro.vcproj", "{48A8C65D-334A-4F36-AB78-35F759205889}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{264D5059-0A60-4B6E-8979-245BC31141FE}.Debug.ActiveCfg = Debug|Win32
-		{264D5059-0A60-4B6E-8979-245BC31141FE}.Debug.Build.0 = Debug|Win32
-		{264D5059-0A60-4B6E-8979-245BC31141FE}.Release.ActiveCfg = Release|Win32
-		{264D5059-0A60-4B6E-8979-245BC31141FE}.Release.Build.0 = Release|Win32
 		{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.ActiveCfg = Debug|Win32
 		{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.Build.0 = Debug|Win32
 		{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.ActiveCfg = Release|Win32
@@ -67,16 +66,28 @@ Global
 		{21E7357D-41D8-444C-A120-18064B497174}.Release.Build.0 = Release|Win32
 		{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Debug.ActiveCfg = Debug|Win32
 		{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Release.ActiveCfg = Release|Win32
-		{DA997BD1-B575-465C-9851-EEBB727F506A}.Debug.ActiveCfg = Debug|Win32
-		{DA997BD1-B575-465C-9851-EEBB727F506A}.Debug.Build.0 = Debug|Win32
-		{DA997BD1-B575-465C-9851-EEBB727F506A}.Release.ActiveCfg = Release|Win32
-		{DA997BD1-B575-465C-9851-EEBB727F506A}.Release.Build.0 = Release|Win32
+		{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Debug.ActiveCfg = Debug|Win32
+		{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}.Release.ActiveCfg = Release|Win32
+		{0BC1DB36-030A-4321-B387-1CEE2611E329}.Debug.ActiveCfg = Debug|Win32
+		{0BC1DB36-030A-4321-B387-1CEE2611E329}.Debug.Build.0 = Debug|Win32
+		{0BC1DB36-030A-4321-B387-1CEE2611E329}.Release.ActiveCfg = Release|Win32
+		{0BC1DB36-030A-4321-B387-1CEE2611E329}.Release.Build.0 = Release|Win32
+		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug.ActiveCfg = Debug|Win32
+		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug.Build.0 = Debug|Win32
+		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release.ActiveCfg = Release|Win32
+		{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release.Build.0 = Release|Win32
+		{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug.ActiveCfg = Debug|Win32
+		{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug.Build.0 = Debug|Win32
+		{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release.ActiveCfg = Release|Win32
+		{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release.Build.0 = Release|Win32
 		{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.ActiveCfg = Debug|Win32
 		{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}.Release.ActiveCfg = Release|Win32
+		{48A8C65D-334A-4F36-AB78-35F759205889}.Debug.ActiveCfg = Debug|Win32
+		{48A8C65D-334A-4F36-AB78-35F759205889}.Debug.Build.0 = Debug|Win32
+		{48A8C65D-334A-4F36-AB78-35F759205889}.Release.ActiveCfg = Release|Win32
+		{48A8C65D-334A-4F36-AB78-35F759205889}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/win_build/boinc_cli.vcproj b/win_build/boinc_cli.vcproj
index beb2fbebed..84b367d98c 100644
--- a/win_build/boinc_cli.vcproj
+++ b/win_build/boinc_cli.vcproj
@@ -98,7 +98,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../lib/,../api/,../RSAEuro/source/,../client/win/,../client,.."
-				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_MT;_WINDOWS;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
 				StringPooling="FALSE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -197,29 +197,6 @@
 			<File
 				RelativePath="..\client\app_graphics.C">
 			</File>
-			<File
-				RelativePath="..\lib\app_ipc.C">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\client\app_start.C">
 			</File>
@@ -517,9 +494,6 @@
 			<File
 				RelativePath="..\client\dhrystone2.C">
 			</File>
-			<File
-				RelativePath="..\lib\diagnostics.C">
-			</File>
 			<File
 				RelativePath="..\Client\file_names.C">
 				<FileConfiguration
@@ -566,35 +540,9 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\lib\filesys.C">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\client\gui_rpc_server.C">
 			</File>
-			<File
-				RelativePath="..\lib\hostinfo.C">
-			</File>
 			<File
 				RelativePath="..\client\hostinfo_network.C">
 			</File>
@@ -713,58 +661,6 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\Lib\Md5.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\Lib\Md5_file.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\lib\mfile.C">
-			</File>
-			<File
-				RelativePath="..\lib\miofile.C">
-			</File>
 			<File
 				RelativePath="..\lib\msg_log.C">
 			</File>
@@ -814,32 +710,6 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\lib\network.C">
-			</File>
-			<File
-				RelativePath="..\Lib\parse.C">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\Client\pers_file_xfer.C">
 				<FileConfiguration
@@ -863,15 +733,9 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\lib\prefs.C">
-			</File>
 			<File
 				RelativePath="..\client\proxy.C">
 			</File>
-			<File
-				RelativePath="..\lib\proxy_info.C">
-			</File>
 			<File
 				RelativePath="..\Client\scheduler_op.C">
 				<FileConfiguration
@@ -895,29 +759,6 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\lib\shmem.C">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\client\ss_logic.C">
 				<FileConfiguration
@@ -941,9 +782,6 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\lib\stackwalker_win.cpp">
-			</File>
 			<File
 				RelativePath="..\Client\time_stats.C">
 				<FileConfiguration
@@ -967,29 +805,6 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\lib\util.C">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\client\whetstone.C">
 			</File>
@@ -1006,9 +821,6 @@
 			<File
 				RelativePath="..\client\app.h">
 			</File>
-			<File
-				RelativePath="..\lib\app_ipc.h">
-			</File>
 			<File
 				RelativePath="..\lib\base64.h">
 			</File>
@@ -1030,9 +842,6 @@
 			<File
 				RelativePath="..\client\dhrystone.h">
 			</File>
-			<File
-				RelativePath="..\lib\diagnostics.h">
-			</File>
 			<File
 				RelativePath="..\lib\error_numbers.h">
 			</File>
@@ -1042,15 +851,9 @@
 			<File
 				RelativePath="..\client\file_xfer.h">
 			</File>
-			<File
-				RelativePath="..\lib\filesys.h">
-			</File>
 			<File
 				RelativePath="..\client\gui_rpc_server.h">
 			</File>
-			<File
-				RelativePath="..\lib\hostinfo.h">
-			</File>
 			<File
 				RelativePath="..\client\hostinfo_network.h">
 			</File>
@@ -1069,18 +872,6 @@
 			<File
 				RelativePath="..\client\maybe_gui.h">
 			</File>
-			<File
-				RelativePath="..\lib\md5.h">
-			</File>
-			<File
-				RelativePath="..\lib\md5_file.h">
-			</File>
-			<File
-				RelativePath="..\lib\mfile.h">
-			</File>
-			<File
-				RelativePath="..\lib\miofile.h">
-			</File>
 			<File
 				RelativePath="..\lib\msg_log.h">
 			</File>
@@ -1090,45 +881,24 @@
 			<File
 				RelativePath="..\client\net_xfer.h">
 			</File>
-			<File
-				RelativePath="..\lib\network.h">
-			</File>
-			<File
-				RelativePath="..\lib\parse.h">
-			</File>
 			<File
 				RelativePath="..\Client\pers_file_xfer.h">
 			</File>
-			<File
-				RelativePath="..\lib\prefs.h">
-			</File>
 			<File
 				RelativePath="..\client\proxy.h">
 			</File>
-			<File
-				RelativePath="..\lib\proxy_info.h">
-			</File>
 			<File
 				RelativePath="..\client\scheduler_op.h">
 			</File>
-			<File
-				RelativePath="..\lib\shmem.h">
-			</File>
 			<File
 				RelativePath="..\client\ss_logic.h">
 			</File>
-			<File
-				RelativePath="..\lib\stackwalker_win.h">
-			</File>
 			<File
 				RelativePath="..\client\stdafx.h">
 			</File>
 			<File
 				RelativePath="..\client\time_stats.h">
 			</File>
-			<File
-				RelativePath="..\lib\util.h">
-			</File>
 			<File
 				RelativePath="..\version.h">
 			</File>
diff --git a/win_build/boinc_ss.vcproj b/win_build/boinc_ss.vcproj
index f3fdeaa96e..3125a67547 100644
--- a/win_build/boinc_ss.vcproj
+++ b/win_build/boinc_ss.vcproj
@@ -22,9 +22,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../,../api/,../lib,../client/"
-				PreprocessorDefinitions="WIN32;_DEBUG;_MT;_WINDOWS;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="boinc_win.h"
@@ -42,7 +42,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="LIBCMTD.LIB LIBCPMTD.LIB wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib"
+				AdditionalDependencies="MSVCRTD.LIB MSVCPRTD.LIB wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib"
 				OutputFile="Build\Debug\boinc.scr"
 				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
@@ -103,9 +103,9 @@
 				FavorSizeOrSpeed="1"
 				OptimizeForWindowsApplication="TRUE"
 				AdditionalIncludeDirectories="../api/,../lib/,../client,.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_MT;_WINDOWS;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
 				StringPooling="TRUE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="boinc_win.h"
@@ -122,7 +122,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="LIBCMT.LIB LIBCPMT.LIB wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib"
+				AdditionalDependencies="MSVCRT.LIB MSVCPRT.LIB wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib"
 				ShowProgress="0"
 				OutputFile="Build\Release/boinc.scr"
 				LinkIncremental="1"
@@ -170,42 +170,9 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\lib\diagnostics.C">
-			</File>
-			<File
-				RelativePath="..\lib\filesys.C">
-			</File>
 			<File
 				RelativePath="..\lib\gui_rpc_client.C">
 			</File>
-			<File
-				RelativePath="..\lib\md5.c">
-			</File>
-			<File
-				RelativePath="..\lib\md5_file.C">
-			</File>
-			<File
-				RelativePath="..\lib\mfile.C">
-			</File>
-			<File
-				RelativePath="..\lib\miofile.C">
-			</File>
-			<File
-				RelativePath="..\lib\network.C">
-			</File>
-			<File
-				RelativePath="..\lib\parse.C">
-			</File>
-			<File
-				RelativePath="..\lib\prefs.C">
-			</File>
-			<File
-				RelativePath="..\lib\stackwalker_win.cpp">
-			</File>
-			<File
-				RelativePath="..\lib\util.C">
-			</File>
 			<File
 				RelativePath="..\client\win\win_screensaver.cpp">
 				<FileConfiguration
@@ -237,42 +204,9 @@
 			<File
 				RelativePath="..\lib\boinc_win.h">
 			</File>
-			<File
-				RelativePath="..\lib\diagnostics.h">
-			</File>
-			<File
-				RelativePath="..\lib\filesys.h">
-			</File>
 			<File
 				RelativePath="..\lib\gui_rpc_client.h">
 			</File>
-			<File
-				RelativePath="..\lib\md5.h">
-			</File>
-			<File
-				RelativePath="..\lib\md5_file.h">
-			</File>
-			<File
-				RelativePath="..\lib\mfile.h">
-			</File>
-			<File
-				RelativePath="..\lib\miofile.h">
-			</File>
-			<File
-				RelativePath="..\lib\network.h">
-			</File>
-			<File
-				RelativePath="..\lib\parse.h">
-			</File>
-			<File
-				RelativePath="..\lib\prefs.h">
-			</File>
-			<File
-				RelativePath="..\lib\stackwalker_win.h">
-			</File>
-			<File
-				RelativePath="..\lib\util.h">
-			</File>
 			<File
 				RelativePath="..\client\win\win_screensaver.h">
 			</File>
diff --git a/win_build/boinc_guirpc_test.vcproj b/win_build/boinccmd.vcproj
similarity index 69%
rename from win_build/boinc_guirpc_test.vcproj
rename to win_build/boinccmd.vcproj
index 2f07d6d64d..8dee848f12 100644
--- a/win_build/boinc_guirpc_test.vcproj
+++ b/win_build/boinccmd.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="boinc_cmd"
+	ProjectGUID="{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}"
 	RootNamespace="boinc_guirpctest"
 	SccProjectName=""
 	SccLocalPath="">
@@ -23,9 +24,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../lib/,../api/,../RSAEuro/source/,../client/win/,../client;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_MT;_WINDOWS;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="FALSE"
 				UsePrecompiledHeader="2"
@@ -44,9 +45,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib advapi32.lib wsock32.lib wininet.lib winmm.lib oldnames.lib"
+				AdditionalDependencies="MSVCRTD.LIB MSVCPRTD.LIB kernel32.lib user32.lib advapi32.lib wsock32.lib wininet.lib winmm.lib oldnames.lib"
 				OutputFile=".\Build\Debug/boinccmd.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
 				IgnoreAllDefaultLibraries="TRUE"
 				IgnoreDefaultLibraryNames=""
@@ -98,9 +99,9 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../lib/,../api/,../RSAEuro/source/,../client/win/,../client,.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_MT;_WINDOWS;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
 				StringPooling="TRUE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="boinc_win.h"
@@ -117,7 +118,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib user32.lib advapi32.lib wsock32.lib wininet.lib winmm.lib libcmt.lib libcpmt.lib oldnames.lib"
+				AdditionalDependencies="kernel32.lib user32.lib advapi32.lib wsock32.lib wininet.lib winmm.lib MSVCRT.LIB MSVCPRT.LIB oldnames.lib"
 				ShowProgress="0"
 				OutputFile=".\Build\Release/boinccmd.exe"
 				LinkIncremental="1"
@@ -169,65 +170,9 @@
 			<File
 				RelativePath="..\lib\boinc_cmd.C">
 			</File>
-			<File
-				RelativePath="..\lib\diagnostics.C">
-			</File>
-			<File
-				RelativePath="..\lib\exception.C">
-			</File>
-			<File
-				RelativePath="..\lib\filesys.C">
-			</File>
 			<File
 				RelativePath="..\lib\gui_rpc_client.C">
 			</File>
-			<File
-				RelativePath="..\lib\md5.c">
-			</File>
-			<File
-				RelativePath="..\lib\md5_file.C">
-			</File>
-			<File
-				RelativePath="..\lib\mfile.C">
-			</File>
-			<File
-				RelativePath="..\lib\miofile.C">
-			</File>
-			<File
-				RelativePath="..\lib\network.C">
-			</File>
-			<File
-				RelativePath="..\Lib\parse.C">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\lib\prefs.C">
-			</File>
-			<File
-				RelativePath="..\lib\stackwalker_win.cpp">
-			</File>
-			<File
-				RelativePath="..\lib\util.C">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -235,51 +180,9 @@
 			<File
 				RelativePath="..\client\win\boinc_cmd.h">
 			</File>
-			<File
-				RelativePath="..\lib\boinc_win.h">
-			</File>
-			<File
-				RelativePath="..\lib\diagnostics.h">
-			</File>
-			<File
-				RelativePath="..\lib\error_numbers.h">
-			</File>
-			<File
-				RelativePath="..\lib\exception.h">
-			</File>
-			<File
-				RelativePath="..\lib\filesys.h">
-			</File>
 			<File
 				RelativePath="..\lib\gui_rpc_client.h">
 			</File>
-			<File
-				RelativePath="..\lib\md5.h">
-			</File>
-			<File
-				RelativePath="..\lib\md5_file.h">
-			</File>
-			<File
-				RelativePath="..\lib\mfile.h">
-			</File>
-			<File
-				RelativePath="..\lib\miofile.h">
-			</File>
-			<File
-				RelativePath="..\lib\network.h">
-			</File>
-			<File
-				RelativePath="..\lib\parse.h">
-			</File>
-			<File
-				RelativePath="..\lib\prefs.h">
-			</File>
-			<File
-				RelativePath="..\lib\stackwalker_win.h">
-			</File>
-			<File
-				RelativePath="..\lib\util.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win_build/BOINCGUI.vcproj b/win_build/boincmgr.vcproj
similarity index 81%
rename from win_build/BOINCGUI.vcproj
rename to win_build/boincmgr.vcproj
index ec558fa2a5..980e86005c 100644
--- a/win_build/BOINCGUI.vcproj
+++ b/win_build/boincmgr.vcproj
@@ -24,12 +24,12 @@
 				Optimization="2"
 				GlobalOptimizations="TRUE"
 				AdditionalIncludeDirectories="$(WXWIN)\include;$(WXWIN)\contrib\include;$(WXWIN)\lib\vc_lib\msw;..\lib;..\api;..\clientgui;..\client\win;.."
-				PreprocessorDefinitions="WIN32;_WIN32;_NDEBUG;_WINDOWS;_MT;__WXNDEBUG__;WXNDEBUG;wxUSE_GUI=1"
+				PreprocessorDefinitions="WIN32;_WIN32;_NDEBUG;_WINDOWS;_MT;_DLL;__WXNDEBUG__;WXNDEBUG;wxUSE_GUI=1"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="TRUE"
 				EnableFunctionLevelLinking="FALSE"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdwx.h"
 				WarningLevel="3"
 				WarnAsError="FALSE"
@@ -40,7 +40,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="MSVCRT.LIB MSVCPRT.LIB kernel32.lib user32.lib gdi32.lib ole32.lib shell32.lib comdlg32.lib advapi32.lib oldnames.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib wxmsw26_adv.lib wxbase26.lib wxbase26_net.lib wxmsw26_core.lib wxmsw26_html.lib wxregex.lib"
+				AdditionalDependencies="MSVCRT.LIB MSVCPRT.LIB kernel32.lib user32.lib gdi32.lib ole32.lib oleacc.lib shell32.lib comdlg32.lib advapi32.lib oldnames.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib wxmsw26_adv.lib wxbase26.lib wxbase26_net.lib wxmsw26_core.lib wxmsw26_html.lib wxregex.lib"
 				OutputFile="$(OutDir)/boincmgr.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;$(WXWIN)\contrib\lib"
@@ -95,7 +95,7 @@
 				EnableFunctionLevelLinking="FALSE"
 				EnableEnhancedInstructionSet="0"
 				DisableLanguageExtensions="FALSE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdwx.h"
 				PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
 				WarningLevel="3"
@@ -107,9 +107,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="MSVCRTD.LIB MSVCPRTD.LIB kernel32.lib user32.lib gdi32.lib ole32.lib shell32.lib comdlg32.lib advapi32.lib oldnames.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib wxmsw26d_adv.lib wxbase26d.lib wxbase26d_net.lib wxmsw26d_core.lib wxmsw26d_html.lib wxregexd.lib"
+				AdditionalDependencies="MSVCRTD.LIB MSVCPRTD.LIB kernel32.lib user32.lib gdi32.lib ole32.lib oleacc.lib shell32.lib comdlg32.lib advapi32.lib oldnames.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib wxmsw26d_adv.lib wxbase26d.lib wxbase26d_net.lib wxmsw26d_core.lib wxmsw26d_html.lib wxregexd.lib"
 				OutputFile="$(OutDir)/boincmgr.exe"
-				LinkIncremental="2"
+				LinkIncremental="0"
 				AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;$(WXWIN)\contrib\lib"
 				IgnoreAllDefaultLibraries="TRUE"
 				GenerateDebugInformation="TRUE"
@@ -170,12 +170,6 @@
 						Name="VCCLCompilerTool"
 						CompileAs="2"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\clientgui\DlgAbout.cpp">
@@ -204,20 +198,6 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
@@ -273,12 +253,6 @@
 						Name="VCCLCompilerTool"
 						CompileAs="2"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\lib\mfile.C">
@@ -286,20 +260,6 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
@@ -309,20 +269,6 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
@@ -334,12 +280,6 @@
 						Name="VCCLCompilerTool"
 						CompileAs="2"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\lib\parse.C">
@@ -347,20 +287,6 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
@@ -372,12 +298,6 @@
 						Name="VCCLCompilerTool"
 						CompileAs="2"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\lib\stackwalker_win.cpp">
@@ -406,20 +326,6 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
diff --git a/win_build/libboinc.vcproj b/win_build/libboinc.vcproj
new file mode 100644
index 0000000000..b3ca8cddf0
--- /dev/null
+++ b/win_build/libboinc.vcproj
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="libboinc"
+	ProjectGUID="{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Build/Debug"
+			IntermediateDirectory="Build/Debug/libboinc/obj"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../;../win_build;../lib;../api;"
+				PreprocessorDefinitions="_WIN32;WIN32;_MT;_DLL;_DEBUG;_LIB_WIN32;_WINDOWS;_CONSOLE;HAVE_STD_MAX;HAVE_STD_MIN;HAVE_STD_TRANSFORM;CLIENT;BOINC_APP_GRAPHICS"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="boinc_win.h"
+				PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
+				BrowseInformation="1"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="2"
+				ForcedIncludeFiles="boinc_win.h"
+				ShowIncludes="FALSE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/libboincd.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Build/Release"
+			IntermediateDirectory="Build/Release/libboinc/obj"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../;../win_build;../lib;../api;"
+				PreprocessorDefinitions="_WIN32;WIN32;_MT;_DLL;NDEBUG;_LIB_WIN32;_WINDOWS;_CONSOLE;HAVE_STD_MAX;HAVE_STD_MIN;HAVE_STD_TRANSFORM;CLIENT;BOINC_APP_GRAPHICS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="boinc_win.h"
+				PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="2"
+				ForcedIncludeFiles="boinc_win.h"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/libboinc.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\lib\app_ipc.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\diagnostics.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\exception.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\filesys.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\hostinfo.C">
+			</File>
+			<File
+				RelativePath="..\lib\md5.c">
+			</File>
+			<File
+				RelativePath="..\lib\md5_file.C">
+			</File>
+			<File
+				RelativePath="..\lib\mem_usage.C">
+			</File>
+			<File
+				RelativePath="..\lib\mfile.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\miofile.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\network.C">
+			</File>
+			<File
+				RelativePath="..\lib\parse.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\prefs.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\proxy_info.C">
+			</File>
+			<File
+				RelativePath="..\lib\shmem.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\stackwalker_win.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\lib\util.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\lib\app_ipc.h">
+			</File>
+			<File
+				RelativePath="..\lib\boinc_win.h">
+			</File>
+			<File
+				RelativePath="..\lib\diagnostics.h">
+			</File>
+			<File
+				RelativePath="..\lib\error_numbers.h">
+			</File>
+			<File
+				RelativePath="..\lib\exception.h">
+			</File>
+			<File
+				RelativePath="..\lib\filesys.h">
+			</File>
+			<File
+				RelativePath="..\lib\hostinfo.h">
+			</File>
+			<File
+				RelativePath="..\lib\md5.h">
+			</File>
+			<File
+				RelativePath="..\lib\md5_file.h">
+			</File>
+			<File
+				RelativePath="..\lib\mem_usage.h">
+			</File>
+			<File
+				RelativePath="..\lib\mfile.h">
+			</File>
+			<File
+				RelativePath="..\lib\miofile.h">
+			</File>
+			<File
+				RelativePath="..\lib\network.h">
+			</File>
+			<File
+				RelativePath="..\lib\parse.h">
+			</File>
+			<File
+				RelativePath="..\lib\prefs.h">
+			</File>
+			<File
+				RelativePath="..\lib\proxy_info.h">
+			</File>
+			<File
+				RelativePath="..\lib\stackwalker_win.h">
+			</File>
+			<File
+				RelativePath="..\lib\std_fixes.h">
+			</File>
+			<File
+				RelativePath="..\lib\util.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win_build/libboincapi.vcproj b/win_build/libboincapi.vcproj
new file mode 100644
index 0000000000..a815f4ec15
--- /dev/null
+++ b/win_build/libboincapi.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="libboinc_api"
+	ProjectGUID="{0BC1DB36-030A-4321-B387-1CEE2611E329}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Build/Debug"
+			IntermediateDirectory="Build/Debug/libboinc_api/"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../;../win_build;../lib"
+				PreprocessorDefinitions="_WIN32;WIN32;_MT;_DLL;_DEBUG;_LIB_WIN32;_WINDOWS;_CONSOLE;HAVE_STD_MAX;HAVE_STD_MIN;HAVE_STD_TRANSFORM;CLIENT;BOINC_APP_GRAPHICS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="boinc_win.h"
+				PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="2"
+				ForcedIncludeFiles="boinc_win.h"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/libboinc_apid.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Build/Release"
+			IntermediateDirectory="Build/Release/libboinc_api/obj"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../;../win_build;../lib"
+				PreprocessorDefinitions="_WIN32;WIN32;_MT;_DLL;NDEBUG;_LIB_WIN32;_WINDOWS;_CONSOLE;HAVE_STD_MAX;HAVE_STD_MIN;HAVE_STD_TRANSFORM;CLIENT;BOINC_APP_GRAPHICS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="boinc_win.h"
+				PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="2"
+				ForcedIncludeFiles="boinc_win.h"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/libboinc_api.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\api\boinc_api.C">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\api\boinc_api.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win_build/RSAEuro.vcproj b/win_build/librsaeuro.vcproj
similarity index 98%
rename from win_build/RSAEuro.vcproj
rename to win_build/librsaeuro.vcproj
index 872675d073..5f9cd1e93f 100644
--- a/win_build/RSAEuro.vcproj
+++ b/win_build/librsaeuro.vcproj
@@ -2,7 +2,8 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="RSAEuro"
+	Name="librsaeuro"
+	ProjectGUID="{48A8C65D-334A-4F36-AB78-35F759205889}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -38,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\Build\Debug\RSAEuro.lib"
+				OutputFile=".\Build\Debug\librsaeurod.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -94,7 +95,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\Build\Release\RSAEuro.lib"
+				OutputFile=".\Build\Release\librsaeuro.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
diff --git a/win_build/upper_case.vcproj b/win_build/upper_case.vcproj
index 9a93777254..ae82dfc69f 100644
--- a/win_build/upper_case.vcproj
+++ b/win_build/upper_case.vcproj
@@ -15,7 +15,7 @@
 			OutputDirectory=".\Build\Release"
 			IntermediateDirectory=".\Build\Release\upper_case\obj"
 			ConfigurationType="1"
-			UseOfMFC="2"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2">
 			<Tool
@@ -27,8 +27,8 @@
 				OptimizeForProcessor="3"
 				OptimizeForWindowsApplication="TRUE"
 				AdditionalIncludeDirectories="../lib/,../api/,../client,../client/win,./,.."
-				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_WINDOWS;_CONSOLE"
-				StringPooling="TRUE"
+				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
+				StringPooling="FALSE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
@@ -46,10 +46,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib opengl32.lib glu32.lib glaux.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="winmm.lib opengl32.lib glu32.lib glaux.lib odbc32.lib odbccp32.lib MSVCRT.LIB MSVCPRT.LIB"
 				OutputFile=".\Build\Release/uppercase_3.07_windows_intelx86.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
+				IgnoreAllDefaultLibraries="TRUE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Build\Release/uppercase_3.07_windows_intelx86.pdb"
 				SubSystem="2"
@@ -95,7 +96,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../,../lib/,../api/,../client,../client/win,./"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE"
+				PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_MT;_DLL;_WINDOWS;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -107,18 +108,19 @@
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 				CompileAs="2"
 				ForcedIncludeFiles="boinc_win.h"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib opengl32.lib glu32.lib glaux.lib ole32.lib"
+				AdditionalDependencies="MSVCRTD.LIB MSVCPRTD.LIB kernel32.lib user32.lib gdi32.lib winmm.lib opengl32.lib glu32.lib glaux.lib ole32.lib"
 				OutputFile=".\Build\Debug/uppercase_2.06_windows_intelx86.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\boinc_dll\Debug"
+				IgnoreAllDefaultLibraries="TRUE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Build\Debug/uppercase_2.06_windows_intelx86.pdb"
 				SubSystem="2"
@@ -157,246 +159,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="BOINC Source Files"
-			Filter="">
-			<File
-				RelativePath="..\lib\app_ipc.C">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\api\boinc_api.C">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\lib\diagnostics.C">
-			</File>
-			<File
-				RelativePath="..\lib\exception.C">
-			</File>
-			<File
-				RelativePath="..\lib\filesys.C">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\lib\hostinfo.C">
-			</File>
-			<File
-				RelativePath="..\lib\md5.c">
-			</File>
-			<File
-				RelativePath="..\lib\md5_file.C">
-			</File>
-			<File
-				RelativePath="..\lib\mem_usage.C">
-			</File>
-			<File
-				RelativePath="..\lib\mfile.C">
-			</File>
-			<File
-				RelativePath="..\lib\miofile.C">
-			</File>
-			<File
-				RelativePath="..\lib\parse.C">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\lib\prefs.C">
-			</File>
-			<File
-				RelativePath="..\lib\proxy_info.C">
-			</File>
-			<File
-				RelativePath="..\lib\shmem.C">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\lib\stackwalker_win.cpp">
-			</File>
-			<File
-				RelativePath="..\lib\util.C">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="BOINC Header Files"
-			Filter="">
-			<File
-				RelativePath="..\lib\app_ipc.h">
-			</File>
-			<File
-				RelativePath="..\Api\boinc_api.h">
-			</File>
-			<File
-				RelativePath="..\lib\diagnostics.h">
-			</File>
-			<File
-				RelativePath="..\lib\error_numbers.h">
-			</File>
-			<File
-				RelativePath="..\lib\exception.h">
-			</File>
-			<File
-				RelativePath="..\client\file_names.h">
-			</File>
-			<File
-				RelativePath="..\lib\filesys.h">
-			</File>
-			<File
-				RelativePath="..\api\graphics_api.h">
-			</File>
-			<File
-				RelativePath="..\lib\hostinfo.h">
-			</File>
-			<File
-				RelativePath="..\lib\md5.h">
-			</File>
-			<File
-				RelativePath="..\lib\md5_file.h">
-			</File>
-			<File
-				RelativePath="..\lib\mem_usage.h">
-			</File>
-			<File
-				RelativePath="..\lib\mfile.h">
-			</File>
-			<File
-				RelativePath="..\lib\miofile.h">
-			</File>
-			<File
-				RelativePath="..\lib\parse.h">
-			</File>
-			<File
-				RelativePath="..\lib\prefs.h">
-			</File>
-			<File
-				RelativePath="..\lib\proxy_info.h">
-			</File>
-			<File
-				RelativePath="..\lib\shmem.h">
-			</File>
-			<File
-				RelativePath="..\lib\stackwalker_win.h">
-			</File>
-			<File
-				RelativePath="..\lib\util.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="App Source Files"
+			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
 				RelativePath="..\apps\upper_case.C">
@@ -427,7 +190,7 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 		</Filter>
 		<Filter
-			Name="App Header Files"
+			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 		</Filter>
 	</Files>