Merge rewritten build system.

Add a new CMake build system, based on the one used to build for AppVeyor (Windows) and made to work with Linux and fully tested by Travis CI.

Rewrite the old autoconf-based Makefile generator build system to solve performance and correctness problems caused by highly parallelised recursive Make, which was causing Travis builds to fail. Now uses a single monolithic generated Makefile instead of recursive Make. Should also be faster, both for initial builds (with parallelism) and for rebuilds.

Remove the old outdated Visual Studio project files, since it should now be possible to generate these with CMake.

Add a CMake project that builds Box Backup and its dependencies, particularly useful for getting started as a developer on Windows.

59 files changed, 1463 insertions, 7191 deletions

diff --git a/infrastructure/BoxPlatform.pm.in b/infrastructure/BoxPlatform.pm.in
index 8f9daa81..bdcca279 100644
--- a/infrastructure/BoxPlatform.pm.in
+++ b/infrastructure/BoxPlatform.pm.in
@@ -127,6 +127,11 @@ BEGIN
 			$platform_link_line_extra = '-L/sw/lib ';
 		}
 	}
+
+	if ($target_windows)
+	{
+		$platform_exe_ext = '.exe';
+	}
 }
 
 sub make_flag
diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt
index a9bd549f..22c21553 100644
--- a/infrastructure/cmake/CMakeLists.txt
+++ b/infrastructure/cmake/CMakeLists.txt
@@ -1,17 +1,16 @@
 cmake_minimum_required(VERSION 2.6)
+
+find_program(CCACHE_PROGRAM ccache)
+if(CCACHE_PROGRAM)
+	# Support Unix Makefiles and Ninja
+	set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+endif()
+
 project(BoxBackup)
 enable_testing()
 
 set(base_dir ${CMAKE_SOURCE_DIR}/../..)
 
-macro(cmake_to_native_path cmake_path native_path)
-	if(WIN32)
-		string(REPLACE "/" "\\" ${native_path} "${cmake_path}")
-	else()
-		set(${native_path} "${cmake_path}")
-	endif()
-endmacro()
-
 set(files_to_configure
 	bin/bbackupd/bbackupd-config
 	bin/bbstored/bbstored-certs
@@ -31,7 +30,6 @@ set(files_to_configure
 	contrib/windows/installer/boxbackup.mpi
 	infrastructure/BoxPlatform.pm
 	infrastructure/makebuildenv.pl
-	infrastructure/makeparcels.pl
 	infrastructure/makedistribution.pl
 	lib/bbackupquery/makedocumentation.pl
 	lib/common/BoxPortsAndFiles.h
@@ -56,23 +54,54 @@ set(files_to_configure
 include(FindPerl)
 set(TARGET_PERL ${PERL_EXECUTABLE})
 
+function(replace_file_if_different dest_file source_file)
+	execute_process(
+		COMMAND "${CMAKE_COMMAND}" -E
+		copy_if_different "${source_file}" "${dest_file}")
+	execute_process(
+		COMMAND "${CMAKE_COMMAND}" -E
+		remove "${source_file}")
+endfunction()
+
+function(move_file_if_exists source_file dest_file)
+	if(EXISTS "${source_file}")
+		execute_process(
+			COMMAND "${CMAKE_COMMAND}" -E
+			rename "${source_file}" "${dest_file}")
+	endif()
+endfunction()
+
 foreach(file_to_configure ${files_to_configure})
-	configure_file("${base_dir}/${file_to_configure}.in" "${base_dir}/${file_to_configure}" @ONLY)
+	configure_file("${base_dir}/${file_to_configure}.in" "${base_dir}/${file_to_configure}.out" @ONLY)
+	replace_file_if_different(
+		"${base_dir}/${file_to_configure}"
+		"${base_dir}/${file_to_configure}.out")
 endforeach()
 
-file(READ "${base_dir}/infrastructure/buildenv-testmain-template.cpp" test_template)
-
-
+# Work out the current Box version (requires Perl) and update lib/common/BoxVersion.h,
+# but only if it has changed, to avoid unnecessary complete rebuilds due to timestamps.
 execute_process(
-	COMMAND ${PERL_EXECUTABLE} ${base_dir}/infrastructure/msvc/getversion.pl
+	COMMAND ${PERL_EXECUTABLE} ${base_dir}/infrastructure/cmake/getversion.pl
+	WORKING_DIRECTORY ${base_dir}/infrastructure
 	RESULT_VARIABLE status
-	OUTPUT_VARIABLE command_output
+	OUTPUT_VARIABLE new_version_define
 	ERROR_VARIABLE command_output)
 if(NOT status EQUAL 0)
 	message(FATAL_ERROR "Failed to execute: "
-		"${PERL_EXECUTABLE} ${base_dir}/infrastructure/msvc/getversion.pl: "
+		"${PERL_EXECUTABLE} ${base_dir}/infrastructure/cmake/getversion.pl: "
 		"status ${status}: ${command_output}")
 endif()
+file(WRITE "${base_dir}/lib/common/BoxVersion.h.new" "${new_version_define}")
+replace_file_if_different(
+	"${base_dir}/lib/common/BoxVersion.h"
+	"${base_dir}/lib/common/BoxVersion.h.new")
+
+add_definitions(-DBOX_CMAKE -DNEED_BOX_VERSION_H)
+if(WIN32)
+	add_definitions(-DWIN32)
+endif()
+
+file(READ "${base_dir}/infrastructure/buildenv-testmain-template.cpp" test_template)
 
 # Parsing Makefile.extra files in CMake script is a pain, so the relevant rules for
 # code-generating Perl scripts are hard-coded here.
@@ -107,8 +136,8 @@ foreach(exception_file ${exception_files})
 endforeach()
 
 set(protocol_files
-	lib/backupstore/backupprotocol.txt
-	test/basicserver/testprotocol.txt
+	lib/backupstore/BackupProtocol.txt
+	test/basicserver/TestProtocol.txt
 )
 
 foreach(protocol_file ${protocol_files})
@@ -128,7 +157,7 @@ foreach(protocol_file ${protocol_files})
 endforeach()
 
 set(documentation_files
-	lib/bbackupquery/documentation.txt
+	lib/bbackupquery/Documentation.txt
 )
 
 foreach(documentation_file ${documentation_files})
@@ -148,12 +177,7 @@ foreach(documentation_file ${documentation_files})
 endforeach()
 
 file(STRINGS ${base_dir}/modules.txt module_deps REGEX "^[^#]")
-# qdbm, lib/common and lib/win32 aren't listed in modules.txt, so hard-code them.
-foreach(module_dep
-	"qdbm"
-	"lib/win32"
-	"lib/common qdbm lib/win32"
-	${module_deps})
+foreach(module_dep ${module_deps})
 
 	string(REGEX MATCH "([^	 ]+)[	 ]*(.*)" valid_module_line ${module_dep})
 	if(valid_module_line)
@@ -165,16 +189,19 @@ foreach(module_dep
 		set(module_path ${base_dir}/${module_dir})
 		string(REPLACE "/" "_" module_name ${CMAKE_MATCH_1})
 		string(REPLACE "/" "_" dependencies "${CMAKE_MATCH_2}")
-		file(GLOB module_files ${module_path}/*.c ${module_path}/*.cpp
-			${module_path}/*.h)
-		set(module_files ${module_files} ${${module_name}_extra_files})
 
-		# everything except qdbm, lib/common and lib/win32 implicitly depend on
-		# lib/common, so express that dependency here.
-		if(module_name MATCHES "^(qdbm|lib_(common|win32))$")
+		# We are replacing QDBM's normal build system, and we only want to include
+		# the modules that we actually need, to avoid warnings about duplicate
+		# definitions, and potential conflicts with Box Backup code in future, so
+		# we specify the C files to compile in explicitly.
+		if(module_name STREQUAL "qdbm")
+			file(GLOB module_files ${module_path}/depot.c ${module_path}/myconf.c)
 		else()
-			set(dependencies "${dependencies} lib_common")
+			file(GLOB module_files ${module_path}/*.cpp ${module_path}/*.h)
 		endif()
+
+		set(module_files ${module_files} ${${module_name}_extra_files})
+
 		string(REGEX REPLACE "^ " "" dependencies "${dependencies}")
 		string(REGEX REPLACE " $" "" dependencies "${dependencies}")
 
@@ -185,6 +212,18 @@ foreach(module_dep
 				message(STATUS "add executable '${module_name}': '${module_files}'")
 			endif()
 			add_executable(${module_name} ${module_files})
+
+			# Unfortunately we have to use install(PROGRAMS) instead of
+			# install(TARGETS) because TARGETS doesn't allow us to change
+			# the executable name.
+			install(PROGRAMS "$<TARGET_FILE:${module_name}>"
+				CONFIGURATIONS Debug
+				DESTINATION "${base_dir}/debug/${module_dir}"
+				RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}")
+			install(PROGRAMS "$<TARGET_FILE:${module_name}>"
+				CONFIGURATIONS Release
+				DESTINATION "${base_dir}/release/${module_dir}"
+				RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}")
 		elseif(module_name MATCHES "^test_")
 			string(REGEX MATCH "^test_(.*)" valid_test ${module_name})
 			set(test_name ${CMAKE_MATCH_1})
@@ -195,12 +234,62 @@ foreach(module_dep
 			endif()
 
 			string(REPLACE "TEST_NAME" ${test_name} test_main "${test_template}")
-			file(WRITE "${module_path}/_main.cpp" "${test_main}")
+			file(WRITE "${module_path}/_main.cpp.new" "${test_main}")
+			replace_file_if_different(
+				"${module_path}/_main.cpp"
+				"${module_path}/_main.cpp.new")
 			add_executable(${module_name} ${module_files}
 				"${module_path}/_main.cpp")
+
+			if(WIN32)
+				install(PROGRAMS "$<TARGET_FILE:${module_name}>"
+					CONFIGURATIONS Debug
+					DESTINATION "${base_dir}/debug/${module_dir}")
+				install(PROGRAMS "$<TARGET_FILE:${module_name}>"
+					CONFIGURATIONS Release
+					DESTINATION "${base_dir}/release/${module_dir}")
+				set(test_executable "$<TARGET_FILE_NAME:${module_name}>")
+			else()
+				# Unfortunately we have to use install(PROGRAMS) instead of
+				# install(TARGETS) because TARGETS doesn't allow us to change
+				# the executable name.
+				install(PROGRAMS "$<TARGET_FILE:${module_name}>"
+					CONFIGURATIONS Debug
+					DESTINATION "${base_dir}/debug/${module_dir}"
+					RENAME "_test")
+				install(PROGRAMS "$<TARGET_FILE:${module_name}>"
+					CONFIGURATIONS Release
+					DESTINATION "${base_dir}/release/${module_dir}"
+					RENAME "_test")
+				set(test_executable "./_test")
+			endif()
+
+			if(${APPVEYOR_MODE})
+				set(appveyor_runtest_pl_switch -a)
+			else()
+				set(appveyor_runtest_pl_switch)
+			endif()
+
+			target_compile_definitions(${module_name} PRIVATE
+				-DTEST_EXECUTABLE="${test_executable}")
 			add_test(NAME ${test_name}
-				COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl.in ${test_name}
-				$<CONFIG> WORKING_DIRECTORY ${base_dir})
+				COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl
+				${appveyor_runtest_pl_switch} -c ${test_name}
+				$<CONFIG> "$<TARGET_FILE:${module_name}>" "${test_executable}"
+				WORKING_DIRECTORY ${base_dir})
+
+			if(${APPVEYOR_MODE})
+				execute_process(COMMAND appveyor AddTest -Name ${test_name}
+					-Framework Custom -FileName "")
+			endif()
+
+			# It helps with debugging if the test depends on another step which
+			# prepares the target directory, and is always out of date.
+			add_custom_target(${module_name}-prepare
+				COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl
+				-n -c ${test_name}
+				$<CONFIG> "$<TARGET_FILE:${module_name}>" "${test_executable}"
+				WORKING_DIRECTORY ${base_dir})
 		elseif(module_name MATCHES "^(lib_.*|qdbm)$")
 			if(DEBUG)
 				message(STATUS "add library '${module_name}': '${module_files}'")
@@ -210,19 +299,6 @@ foreach(module_dep
 			message(FATAL_ERROR "Unsupported module type: " ${module_name})
 		endif()
 
-		if(module_name MATCHES "^(bin|test)_")
-			# We need to install binaries in specific places so that test
-			# runner can find them:
-			install(FILES "$<TARGET_FILE:${module_name}>"
-				CONFIGURATIONS Debug
-				DESTINATION "${base_dir}/debug/${module_dir}"
-				RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}")
-			install(FILES "$<TARGET_FILE:${module_name}>"
-				CONFIGURATIONS Release
-				DESTINATION "${base_dir}/release/${module_dir}"
-				RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}")
-		endif()
-
 		target_compile_definitions(${module_name} PRIVATE -DBOX_MODULE="${module_name}")
 
 		if(dependencies)
@@ -254,47 +330,359 @@ foreach(module_dep
 	endif()
 endforeach()
 
-#include(ExternalProject)
-#ExternalProject_Add(pcre
-#	PREFIX "../pcre"
-#	BUILD_COMMAND "${CMAKE_EXECUTABLE
+# We can't do anything conditional on CMAKE_BUILD_TYPE because that's not valid for multi-configuration
+# generators such as MSVC. We need to use a generator expression instead.
+target_compile_definitions(lib_common PUBLIC $<$<CONFIG:Release>:BOX_RELEASE_BUILD>)
 
-# Tell QDBM not to build itself as a DLL, because we want to link statically to it.
-target_compile_definitions(qdbm PUBLIC -DQDBM_STATIC)
+# Detect platform features and write BoxConfig.h.in. Reuse code from
+# infrastructure/m4/boxbackup_tests.m4 where possible
 
-# Silence some less-useful warnings
-if(MSVC)
-	add_definitions(/wd4996 /wd4291)
-	# target_link_libraries(qdbm PRIVATE /IGNORE:LNK4006)
-	set_property(TARGET qdbm PROPERTY CMAKE_STATIC_LINKER_FLAGS /IGNORE:LNK4006)
-endif(MSVC)
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+include(CheckSymbolExists)
+include(CheckLibraryExists)
+include(CheckCXXSourceCompiles)
 
-target_link_libraries(lib_common PUBLIC ws2_32 gdi32)
+set(boxconfig_h_file "${CMAKE_BINARY_DIR}/BoxConfig.h.in")
+file(REMOVE "${boxconfig_h_file}")
+file(WRITE "${boxconfig_h_file}" "// Auto-generated by CMake. Do not edit.\n")
+
+if(WIN32)
+	target_link_libraries(lib_common PUBLIC ws2_32 gdi32)
+endif()
 
 # Link to ZLib
+# http://stackoverflow.com/a/6174604/648162
 include_directories(${base_dir}/../zlib-win32/include)
-find_library(zlibstaticd_lib_path zlibstaticd ${base_dir}/../zlib-win32/lib)
-find_library(zlibstatic_lib_path  zlibstatic  ${base_dir}/../zlib-win32/lib)
-target_link_libraries(lib_compress PUBLIC debug     ${zlibstaticd_lib_path})
-target_link_libraries(lib_compress PUBLIC optimized ${zlibstatic_lib_path})
+# On Windows we want to statically link zlib to make debugging and distribution easier,
+# but FindZLIB.cmake doesn't offer that as an option, so we have to go through some
+# contortions to "find" the correct library. ZLIB_ROOT is required in this case.
+if(WIN32)
+	if(NOT DEFINED ZLIB_ROOT)
+		message(FATAL_ERROR "You must set ZLIB_ROOT to point to include/zlib.h and lib/zlibstatic[d].lib on Windows")
+	endif()
+
+	message(STATUS "Searching for Zlib in: ${ZLIB_ROOT}")
+	find_path(ZLIB_INCLUDE_DIR zlib.h PATHS ${ZLIB_ROOT}/include NO_DEFAULT_PATH)
+	include_directories(${ZLIB_INCLUDE_DIR})
+	message(STATUS "Found Zlib headers: ${ZLIB_INCLUDE_DIR}")
+
+	# We must link against zlibstaticD if this is a debug build, otherwise
+	# we have a C runtime mismatch (/MD versus /MDd) and the application
+	# crashes at runtime.
+	find_library(ZLIB_LIBRARY_STATIC_DEBUG NAMES zlibstaticd
+		PATHS ${ZLIB_ROOT}/lib NO_DEFAULT_PATH)
+	find_library(ZLIB_LIBRARY_STATIC_RELEASE NAMES zlibstatic
+		PATHS ${ZLIB_ROOT}/lib NO_DEFAULT_PATH)
+
+	target_link_libraries(lib_compress PUBLIC
+		debug ${ZLIB_LIBRARY_STATIC_DEBUG}
+		optimized ${ZLIB_LIBRARY_STATIC_RELEASE})
+else()
+	find_package(ZLIB REQUIRED)
+	include_directories(${ZLIB_INCLUDE_DIRS})
+	target_link_libraries(lib_compress PUBLIC ${ZLIB_LIBRARIES})
+endif()
 
 # Link to OpenSSL
-include_directories(${base_dir}/../openssl-win32/include)
-find_library(libeay32_lib_path libeay32 ${base_dir}/../openssl-win32/lib)
-find_library(ssleay32_lib_path ssleay32 ${base_dir}/../openssl-win32/lib)
-target_link_libraries(lib_crypto PUBLIC ${libeay32_lib_path} ${ssleay32_lib_path})
+find_package(OpenSSL REQUIRED)
+include_directories(${OPENSSL_INCLUDE_DIR})
+target_link_libraries(lib_crypto PUBLIC ${OPENSSL_LIBRARIES})
 
 # Link to PCRE
-include_directories(${base_dir}/../pcre-win32/include)
-target_compile_definitions(lib_common PUBLIC -DPCRE_STATIC)
-find_library(pcreposix_lib_path  pcreposix  ${base_dir}/../pcre-win32/lib)
-find_library(pcreposixd_lib_path pcreposixd ${base_dir}/../pcre-win32/lib)
-find_library(pcre_lib_path  pcre  ${base_dir}/../pcre-win32/lib)
-find_library(pcred_lib_path pcred ${base_dir}/../pcre-win32/lib)
-target_link_libraries(lib_common PUBLIC debug "${pcreposixd_lib_path}" optimized "${pcreposix_lib_path}")
-target_link_libraries(lib_common PUBLIC debug "${pcred_lib_path}"      optimized "${pcre_lib_path}")
+if (WIN32)
+	if(NOT DEFINED PCRE_ROOT)
+		message(FATAL_ERROR "You must set PCRE_ROOT to point to include/pcreposix.h and lib/pcreposix[d].lib on Windows")
+	endif()
+
+	target_compile_definitions(lib_common PUBLIC -DPCRE_STATIC)
+	find_library(pcreposix_lib_path  pcreposix  ${PCRE_ROOT}/lib)
+	find_library(pcreposixd_lib_path pcreposixd ${PCRE_ROOT}/lib)
+	find_library(pcre_lib_path  pcre  ${PCRE_ROOT}/lib)
+	find_library(pcred_lib_path pcred ${PCRE_ROOT}/lib)
+	target_link_libraries(lib_common PUBLIC debug "${pcreposixd_lib_path}" optimized "${pcreposix_lib_path}")
+	target_link_libraries(lib_common PUBLIC debug "${pcred_lib_path}"      optimized "${pcre_lib_path}")
+	include_directories(${PCRE_ROOT}/include)
+else()
+	find_package(PkgConfig REQUIRED)
+	pkg_check_modules(PCRE REQUIRED libpcreposix)
+	include_directories(${PCRE_INCLUDE_DIRS})
+	target_link_libraries(lib_common PUBLIC ${PCRE_LIBRARIES})
+
+	if(DEBUG)
+		message(STATUS "Linking PCRE libraries from ${PCRE_LIBRARY_DIRS}: ${PCRE_LIBRARIES}")
+	endif()
+endif()
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+find_package(Readline)
+if(READLINE_FOUND)
+	include_directories(${Readline_INCLUDE_DIR})
+	target_link_libraries(lib_common PUBLIC ${Readline_LIBRARY})
+endif()
+
+set(boxconfig_cmake_h_dir "${base_dir}/lib/common")
+# Get the values of all directories added to the INCLUDE_DIRECTORIES property
+# by include_directory() statements, and save it in CMAKE_REQUIRED_INCLUDES
+# which check_include_files() uses to set the include file search path:
+get_property(CMAKE_REQUIRED_INCLUDES DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
+list(APPEND CMAKE_REQUIRED_INCLUDES "${boxconfig_cmake_h_dir}")
+# message(STATUS "CMAKE_REQUIRED_INCLUDES=${CMAKE_REQUIRED_INCLUDES}")
+
+# Save the original BoxConfig.cmake.h so that we can move it back later,
+# and not need to recompile everything.
+move_file_if_exists(
+	"${boxconfig_cmake_h_dir}/BoxConfig.cmake.h"
+	"${boxconfig_cmake_h_dir}/BoxConfig.cmake.h.bak")
+
+foreach(m4_filename boxbackup_tests.m4 ax_check_mount_point.m4 ax_func_syscall.m4)
+	file(STRINGS "${base_dir}/infrastructure/m4/${m4_filename}" m4_functions REGEX "^ *AC[_A-Z]+\\(.*\\)$")
+	foreach(m4_function ${m4_functions})
+		if(DEBUG)
+			message(STATUS "Processing m4_function: ${m4_function}")
+		endif()
+
+		string(REGEX MATCH .* ac_check_headers ${m4_function})
+		if(m4_function MATCHES "^ *AC_CHECK_HEADERS?\\(\\[([a-z./ ]+)\\](.*)\\)$")
+			if(DEBUG)
+				message(STATUS "Processing ac_check_headers: ${CMAKE_MATCH_1}")
+			endif()
+
+			# http://stackoverflow.com/questions/5272781/what-is-common-way-to-split-string-into-list-with-cmake
+			string(REPLACE " " ";" header_files ${CMAKE_MATCH_1})
+
+			foreach(header_file ${header_files})
+				list(APPEND detect_header_files ${header_file})
+			endforeach()
+		elseif(m4_function MATCHES "^ *AC_CHECK_FUNCS\\(\\[([a-z./_ ]+)\\](.*)\\)$")
+			if(DEBUG)
+				message(STATUS "Processing ac_check_funcs: ${CMAKE_MATCH_1}")
+			endif()
+
+			# http://stackoverflow.com/questions/5272781/what-is-common-way-to-split-string-into-list-with-cmake
+			string(REPLACE " " ";" function_names ${CMAKE_MATCH_1})
+
+			foreach(function_name ${function_names})
+				list(APPEND detect_functions ${function_name})
+			endforeach()
+		elseif(m4_function MATCHES "^ *AC_CHECK_DECLS\\(\\[([A-Za-z._/ ]+)\\](,,, ..#include <([^>]+)>..)?\\)$")
+			if(DEBUG)
+				message(STATUS "Processing ac_check_decls: ${CMAKE_MATCH_1} in ${CMAKE_MATCH_3}")
+			endif()
+
+			# http://stackoverflow.com/questions/5272781/what-is-common-way-to-split-string-into-list-with-cmake
+			string(REPLACE " " ";" decl_names "${CMAKE_MATCH_1}")
+			string(REPLACE " " ";" header_files "${CMAKE_MATCH_3}")
+
+			foreach(decl_name ${decl_names})
+				string(TOUPPER ${decl_name} platform_var_name)
+				string(REGEX REPLACE "[/.]" "_" platform_var_name ${platform_var_name})
+				check_symbol_exists("${decl_name}" "${header_files}" HAVE_DECL_${platform_var_name})
+				file(APPEND "${boxconfig_h_file}" "#cmakedefine01 HAVE_DECL_${platform_var_name}\n")
+			endforeach()
+		elseif(m4_function MATCHES "^ *AC_SEARCH_LIBS\\(\\[([A-Za-z._/ ]+)\\], \\[([A-Za-z._]+)\\]\\)$")
+			if(DEBUG)
+				message(STATUS "Processing ac_search_libs: ${CMAKE_MATCH_1} in ${CMAKE_MATCH_2}")
+			endif()
+
+			set(function_name ${CMAKE_MATCH_1})
+			# http://stackoverflow.com/questions/5272781/what-is-common-way-to-split-string-into-list-with-cmake
+			string(REPLACE " " ";" library_names "${CMAKE_MATCH_2}")
+
+			foreach(library_name ${library_names})
+				string(TOUPPER ${library_name} platform_var_name)
+				check_library_exists(${library_name} ${function_name} "" HAVE_LIB_${platform_var_name})
+				if(HAVE_LIB_${platform_var_name})
+					target_link_libraries(lib_common PUBLIC ${library_name})
+				endif()
+			endforeach()
+		elseif(m4_function MATCHES "^ *AC_CHECK_MEMBERS\\(\\[([A-Za-z._/ ]+)\\.([[A-Za-z_]+)\\](,,, ..(#include <([^>]+)>)..)?\\)$")
+			if(DEBUG)
+				message(STATUS "Processing ac_check_members: ${CMAKE_MATCH_1}.${CMAKE_MATCH_2} in ${CMAKE_MATCH_5}")
+			endif()
+
+			set(struct_name "${CMAKE_MATCH_1}")
+			set(member_name "${CMAKE_MATCH_2}")
+			set(include_file "${CMAKE_MATCH_5}")
+
+			string(TOUPPER "${struct_name}_${member_name}" platform_var_name)
+			string(REGEX REPLACE "[/. ]" "_" platform_var_name ${platform_var_name})
+
+			CHECK_CXX_SOURCE_COMPILES([=[
+				#include "BoxConfig.cmake.h"
+				#include <${include_file}>
+				int main()
+				{
+					${struct_name} foo;
+					return sizeof(foo.${member_name}) > 0 ? 0 : 1;
+				}
+				]=] "HAVE_${platform_var_name}")
+			file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_${platform_var_name}\n")
+		endif()
+	endforeach()
+
+	# Build an intermediate version of BoxConfig.cmake.h for use in the following tests.
+	configure_file("${boxconfig_h_file}" "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h")
+endforeach()
+
+list(APPEND detect_header_files mntent.h sys/mnttab.h sys/mount.h sys/param.h)
+
+foreach(header_file ${detect_header_files})
+	list(APPEND detect_header_files ${header_file})
+	string(TOUPPER ${header_file} platform_var_name)
+	string(REGEX REPLACE "[/.]" "_" platform_var_name ${platform_var_name})
+	check_include_files(${header_file} HAVE_${platform_var_name})
+	file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_${platform_var_name}\n")
+endforeach()
+
+if(NOT HAVE_PCREPOSIX_H)
+	message(FATAL_ERROR "pcreposix.h not found at PCRE_ROOT/include: ${PCRE_ROOT}/include")
+endif()
+
+# PCRE is required, so unconditionally define this:
+set(HAVE_REGEX_SUPPORT 1)
+file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_REGEX_SUPPORT\n")
+
+foreach(function_name ${detect_functions})
+	string(TOUPPER ${function_name} platform_var_name)
+	string(REGEX REPLACE "[/.]" "_" platform_var_name ${platform_var_name})
+	check_function_exists(${function_name} HAVE_${platform_var_name})
+	file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_${platform_var_name}\n")
+endforeach()
+
+check_symbol_exists(dirfd "dirent.h" HAVE_DECL_DIRFD)
+file(APPEND "${boxconfig_h_file}" "#cmakedefine01 HAVE_DECL_DIRFD\n")
+
+# Emulate ax_check_mount_point.m4
+# These checks are run by multi-line M4 commands which are harder to parse/fake using
+# regexps above, so we hard-code them here:
+CHECK_CXX_SOURCE_COMPILES([=[
+	#include "BoxConfig.cmake.h"
+	#ifdef HAVE_SYS_PARAM_H
+	#	include <sys/param.h>
+	#endif
+	#include <sys/mount.h>
+	int main()
+	{
+		struct statfs foo;
+		return sizeof(foo.f_mntonname) > 0 ? 0 : 1;
+	}
+	]=] "HAVE_STRUCT_STATFS_F_MNTONNAME")
+file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_STRUCT_STATFS_F_MNTONNAME\n")
+CHECK_CXX_SOURCE_COMPILES([=[
+	#include "BoxConfig.cmake.h"
+	#ifdef HAVE_SYS_PARAM_H
+	#	include <sys/param.h>
+	#endif
+	#include <sys/mount.h>
+	int main()
+	{
+		struct statvfs foo;
+		return sizeof(foo.f_mntonname) > 0 ? 0 : 1;
+	}
+	]=] "HAVE_STRUCT_STATVFS_F_MNTONNAME")
+file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_STRUCT_STATVFS_F_MNTONNAME\n")
+if(HAVE_STRUCT_STATFS_F_MNTONNAME OR
+	HAVE_STRUCT_STATVFS_F_MNTONNAME OR
+	HAVE_STRUCT_MNTENT_MNT_DIR OR
+	HAVE_STRUCT_MNTTAB_MNT_MOUNTP)
+
+	set(HAVE_MOUNTS 1)
+	file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_MOUNTS\n")
+endif()
+
+# Emulate ax_random_device.m4
+if(EXISTS /dev/urandom)
+	set(RANDOM_DEVICE /dev/urandom)
+elseif(EXISTS /dev/arandom)
+	set(RANDOM_DEVICE /dev/arandom)
+elseif(EXISTS /dev/random)
+	set(RANDOM_DEVICE /dev/random)
+endif()
+if(RANDOM_DEVICE)
+	set(HAVE_RANDOM_DEVICE TRUE)
+endif()
+file(APPEND "${boxconfig_h_file}" "#cmakedefine RANDOM_DEVICE \"${RANDOM_DEVICE}\"\n")
+file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_RANDOM_DEVICE\n")
+
+# Build an intermediate version of BoxConfig.cmake.h for use in the following tests:
+configure_file("${boxconfig_h_file}" "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h")
+
+foreach(struct_member_name "struct ucred.uid" "struct ucred.cr_uid")
+	string(REGEX MATCH "(.*)\\.(.*)" dummy_var ${struct_member_name})
+	set(struct_name "${CMAKE_MATCH_1}")
+	set(member_name "${CMAKE_MATCH_2}")
+	
+	string(TOUPPER "${struct_name}_${member_name}" platform_var_name)
+	string(REGEX REPLACE "[/. ]" "_" platform_var_name ${platform_var_name})
+
+	CHECK_CXX_SOURCE_COMPILES([=[
+		#include "BoxConfig.cmake.h"
+
+		#ifdef HAVE_UCRED_H
+		#	include <ucred.h>
+		#endif
+
+		#ifdef HAVE_SYS_PARAM_H
+		#	include <sys/param.h>
+		#endif
+
+		#ifdef HAVE_SYS_UCRED_H
+		#	include <sys/ucred.h>
+		#endif
+
+		#ifdef HAVE_SYS_SOCKET_H
+		#	include <sys/socket.h>
+		#endif
+
+		int main()
+		{
+			${struct_name} foo;
+			return sizeof(foo.${member_name}) > 0 ? 0 : 1;
+		}
+		]=] "HAVE_${platform_var_name}")
+	file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_${platform_var_name}\n")
+endforeach()
+set(CMAKE_REQUIRED_INCLUDES "")
+
+# Build the final version of BoxConfig.cmake.h, as a temporary file.
+configure_file("${boxconfig_h_file}" "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h.new")
+
+# Move the original back into place, and then replace it with the
+# temporary one if different (which will force a rebuild of everything).
+move_file_if_exists(
+	"${boxconfig_cmake_h_dir}/BoxConfig.cmake.h.bak"
+	"${boxconfig_cmake_h_dir}/BoxConfig.cmake.h")
+replace_file_if_different(
+	"${boxconfig_cmake_h_dir}/BoxConfig.cmake.h"
+	"${boxconfig_cmake_h_dir}/BoxConfig.cmake.h.new")
+
+# Tell QDBM not to build itself as a DLL, because we want to link statically to it.
+target_compile_definitions(qdbm PUBLIC -DQDBM_STATIC)
+
+# Silence some less-useful warnings
+if(MSVC)
+	add_definitions(/wd4996 /wd4291)
+	set_property(TARGET qdbm PROPERTY CMAKE_STATIC_LINKER_FLAGS /IGNORE:LNK4006)
+endif(MSVC)
 
 # Define the location of the Perl executable, needed by testbackupstorefix
-cmake_to_native_path("${PERL_EXECUTABLE}" perl_executable_native)
+file(TO_NATIVE_PATH "${PERL_EXECUTABLE}" perl_executable_native)
 string(REPLACE "\\" "\\\\" perl_path_escaped ${perl_executable_native})
 target_compile_definitions(test_backupstorefix PRIVATE -DPERL_EXECUTABLE="${perl_path_escaped}")
+
+# Configure test timeouts:
+# I've set the timeout to 4 times as long as it took to run on a particular run on Appveyor:
+# https://ci.appveyor.com/project/qris/boxbackup/build/job/xm10itascygtu93j
+set_tests_properties(common PROPERTIES TIMEOUT 20)
+set_tests_properties(crypto PROPERTIES TIMEOUT 4)
+set_tests_properties(compress PROPERTIES TIMEOUT 80)
+set_tests_properties(raidfile PROPERTIES TIMEOUT 32)
+set_tests_properties(basicserver PROPERTIES TIMEOUT 80)
+set_tests_properties(backupstore PROPERTIES TIMEOUT 560)
+set_tests_properties(backupstorefix PROPERTIES TIMEOUT 140)
+set_tests_properties(backupstorepatch PROPERTIES TIMEOUT 320)
+set_tests_properties(backupdiff PROPERTIES TIMEOUT 32)
+set_tests_properties(bbackupd PROPERTIES TIMEOUT 1200)
+set_tests_properties(s3store PROPERTIES TIMEOUT 20)
+set_tests_properties(httpserver PROPERTIES TIMEOUT 40)
diff --git a/infrastructure/cmake/FindReadline.cmake b/infrastructure/cmake/FindReadline.cmake
new file mode 100644
index 00000000..3ba4d21d
--- /dev/null
+++ b/infrastructure/cmake/FindReadline.cmake
@@ -0,0 +1,84 @@
+# https://github.com/bro/cmake/blob/master/FindReadline.cmake
+#
+# Copyright (c) 1995-2015, The Regents of the University of California
+# through the Lawrence Berkeley National Laboratory and the
+# International Computer Science Institute. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# (1) Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 
+# (2) Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+# 
+# (3) Neither the name of the University of California, Lawrence Berkeley
+#     National Laboratory, U.S. Dept. of Energy, International Computer
+#     Science Institute, nor the names of contributors may be used to endorse
+#     or promote products derived from this software without specific prior
+#     written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# 
+# Note that some files in the distribution may carry their own copyright
+# notices.
+
+# - Try to find readline include dirs and libraries 
+#
+# Usage of this module as follows:
+#
+#     find_package(Readline)
+#
+# Variables used by this module, they can change the default behaviour and need
+# to be set before calling find_package:
+#
+#  Readline_ROOT_DIR         Set this variable to the root installation of
+#                            readline if the module has problems finding the
+#                            proper installation path.
+#
+# Variables defined by this module:
+#
+#  READLINE_FOUND            System has readline, include and lib dirs found
+#  Readline_INCLUDE_DIR      The readline include directories. 
+#  Readline_LIBRARY          The readline library.
+
+find_path(Readline_ROOT_DIR
+    NAMES include/readline/readline.h
+)
+
+find_path(Readline_INCLUDE_DIR
+    NAMES readline/readline.h
+    HINTS ${Readline_ROOT_DIR}/include
+)
+
+find_library(Readline_LIBRARY
+    NAMES readline
+    HINTS ${Readline_ROOT_DIR}/lib
+)
+
+if(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
+  set(READLINE_FOUND TRUE)
+else(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
+  FIND_LIBRARY(Readline_LIBRARY NAMES readline)
+  include(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG Readline_INCLUDE_DIR Readline_LIBRARY )
+  MARK_AS_ADVANCED(Readline_INCLUDE_DIR Readline_LIBRARY)
+endif(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
+
+mark_as_advanced(
+    Readline_ROOT_DIR
+    Readline_INCLUDE_DIR
+    Readline_LIBRARY
+)
diff --git a/infrastructure/cmake/getversion.pl b/infrastructure/cmake/getversion.pl
new file mode 100755
index 00000000..67e1f8a5
--- /dev/null
+++ b/infrastructure/cmake/getversion.pl
@@ -0,0 +1,13 @@
+#!perl
+
+use File::Basename;
+$basedir = dirname($0)."/../..";
+
+-d $basedir or die "Base directory $basedir does not exist!";
+chdir $basedir or die "Failed to change to base directory: $basedir: $!";
+
+require "$basedir/infrastructure/BoxPlatform.pm.in";
+
+print "#define BOX_VERSION \"$BoxPlatform::product_version\"\n";
+
+exit 0;
diff --git a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user
new file mode 100755
index 00000000..fa1f3d34
--- /dev/null
+++ b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>testfiles\bbackupd.conf</LocalDebuggerCommandArguments>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\bbackupd</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user
new file mode 100755
index 00000000..339cddee
--- /dev/null
+++ b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>testfiles/bbstored.conf</LocalDebuggerCommandArguments>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstorefix</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/infrastructure/cmake/msvc/test_backupstore.vcxproj.user b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user
new file mode 100755
index 00000000..7d7b3158
--- /dev/null
+++ b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstore</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user
new file mode 100755
index 00000000..170fb496
--- /dev/null
+++ b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstorefix</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user
new file mode 100755
index 00000000..ebf8c6a3
--- /dev/null
+++ b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>-e test_basics</LocalDebuggerCommandArguments>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\bbackupd</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/infrastructure/cmake/msvc/test_common.vcxproj.user b/infrastructure/cmake/msvc/test_common.vcxproj.user
new file mode 100755
index 00000000..e5854a80
--- /dev/null
+++ b/infrastructure/cmake/msvc/test_common.vcxproj.user
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\common</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/infrastructure/cmake/msvc/test_httpserver.vcxproj.user b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user
new file mode 100755
index 00000000..ac1512a8
--- /dev/null
+++ b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\httpserver</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/infrastructure/cmake/msvc/test_raidfile.vcxproj.user b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user
new file mode 100755
index 00000000..620aa4bb
--- /dev/null
+++ b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\raidfile</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/infrastructure/cmake/windows/CMakeLists.txt b/infrastructure/cmake/windows/CMakeLists.txt
new file mode 100644
index 00000000..42152714
--- /dev/null
+++ b/infrastructure/cmake/windows/CMakeLists.txt
@@ -0,0 +1,89 @@
+cmake_minimum_required(VERSION 2.6)
+
+project(BoxBackup_Windows)
+
+set(boxbackup_dir ${CMAKE_SOURCE_DIR}/../../..)
+set_property(DIRECTORY PROPERTY EP_PREFIX .)
+set(install_dir ${CMAKE_BINARY_DIR}/install)
+
+# Automate the process of downloading, building and "installing" dependencies on Windows,
+# as used by AppVeyor.
+set(ZLIB_VERSION    1.2.8  CACHE STRING "Version of zlib to download, build, and compile Box Backup against")
+set(ZLIB_HASH MD5=126f8676442ffbd97884eb4d6f32afb4
+	CACHE STRING "Hash of the zlib download file, to be verified after download")
+set(OPENSSL_VERSION 1.0.2h CACHE STRING "Version of OpenSSL to download, build, and compile Box Backup against")
+set(OPENSSL_HASH SHA256=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919
+	CACHE STRING "Hash of the OpenSSL download file, to be verified after download")
+set(PCRE_VERSION    8.38   CACHE STRING "Version of PCRE to download, build, and compile Box Backup against")
+set(OPENSSL_HASH SHA256=dbef7cf80258c29396d435804cd5dba34006a77548850bca8bad6db6a6eac110
+	CACHE STRING "Hash of the PCRE download file, to be verified after download")
+
+include(ExternalProject)
+
+string(REPLACE "." "" zlib_version_nodots ${ZLIB_VERSION})
+ExternalProject_Add(zlib
+	URL "http://zlib.net/zlib${zlib_version_nodots}.zip"
+	URL_HASH ${ZLIB_HASH}
+	DOWNLOAD_NO_PROGRESS 1
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_dir}
+	# We need to build both versions, debug and release, because cmake requires both to be
+	# present to generate its multi-configuration project files for Visual Studio/MSBuild.
+	INSTALL_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install --config Debug
+	COMMAND         ${CMAKE_COMMAND} --build <BINARY_DIR> --target install --config Release
+	STEP_TARGETS configure install
+)
+
+if(WIN32)
+	ExternalProject_Add(openssl
+		DEPENDS zlib
+		URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz"
+		URL_HASH ${OPENSSL_HASH}
+		DOWNLOAD_NO_PROGRESS 1
+		CONFIGURE_COMMAND perl Configure debug-VC-WIN32 no-asm --prefix=${install_dir}
+		COMMAND cmd /c ms\\do_ms.bat
+		# You would expect us to use nt.mak to compile a static library here, but mk1mf.pl uses the /MT[d]
+		# CRT in that case, which is incompatible with our dynamic runtime, /MD[d]. It seems that the libs
+		# built by ntdll.mak, which are compiled with /MD[d], are full libraries and not import libs,
+		# so we can link statically against them and still get a dynamic runtime.
+		BUILD_IN_SOURCE 1
+		BUILD_COMMAND   nmake /s /f ms\\nt.mak
+		INSTALL_COMMAND nmake /s /f ms\\nt.mak install
+	)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	ExternalProject_Add(openssl
+		DEPENDS zlib
+		URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz"
+		URL_HASH ${OPENSSL_HASH}
+		DOWNLOAD_NO_PROGRESS 1
+		CONFIGURE_COMMAND perl Configure darwin64-x86_64-cc --prefix=${install_dir}
+		BUILD_IN_SOURCE 1
+	)
+else()
+	ExternalProject_Add(openssl
+		DEPENDS zlib
+		URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz"
+		URL_HASH ${OPENSSL_HASH}
+		DOWNLOAD_NO_PROGRESS 1
+		CONFIGURE_COMMAND ./config --prefix=${install_dir}
+		BUILD_IN_SOURCE 1
+	)
+
+endif()
+
+ExternalProject_Add(pcre
+	URL "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PCRE_VERSION}.zip"
+	URL_HASH ${PCRE_HASH}
+	DOWNLOAD_NO_PROGRESS 1
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_dir}
+	# We need to build both versions, debug and release, because cmake requires both to be
+	# present to generate its multi-configuration project files for Visual Studio/MSBuild.
+	INSTALL_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install --config Debug
+	COMMAND         ${CMAKE_COMMAND} --build <BINARY_DIR> --target install --config Release
+)
+
+ExternalProject_Add(boxbackup
+	DEPENDS zlib openssl pcre
+	SOURCE_DIR ${boxbackup_dir}/infrastructure/cmake
+	CMAKE_ARGS -DZLIB_ROOT=${install_dir} -DOPENSSL_ROOT_DIR=${install_dir} -DPCRE_ROOT=${install_dir} -DAPPVEYOR_MODE=1
+	STEP_TARGETS configure build install
+)
diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4
index b18d77fd..c7838a7f 100644
--- a/infrastructure/m4/boxbackup_tests.m4
+++ b/infrastructure/m4/boxbackup_tests.m4
@@ -113,7 +113,7 @@ AX_PATH_BDB([1.x or 4.1], [
 ])
 
 # need to find libdl before trying to link openssl, apparently
-AC_SEARCH_LIBS([dlsym], ["dl"])
+AC_SEARCH_LIBS([dlsym], [dl])
 AC_CHECK_FUNCS([dlsym dladdr])
 
 ## Check for Open SSL, use old versions only if explicitly requested
@@ -138,20 +138,12 @@ Upgrade or read the documentation for alternatives]])
 
 ### Checks for header files.
 
-case $target_os in
-mingw32*) ;;
-winnt*)   ;;
-*)
-  AC_HEADER_DIRENT
-  ;;
-esac
-
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([dlfcn.h fcntl.h getopt.h netdb.h process.h pwd.h signal.h])
-AC_CHECK_HEADERS([syslog.h time.h cxxabi.h])
+AC_CHECK_HEADERS([cxxabi.h dirent.h dlfcn.h fcntl.h getopt.h netdb.h process.h pwd.h signal.h])
+AC_CHECK_HEADERS([syslog.h time.h unistd.h])
 AC_CHECK_HEADERS([netinet/in.h netinet/tcp.h])
-AC_CHECK_HEADERS([sys/file.h sys/param.h sys/poll.h sys/socket.h sys/time.h])
+AC_CHECK_HEADERS([sys/file.h sys/param.h sys/poll.h sys/socket.h sys/stat.h sys/time.h])
 AC_CHECK_HEADERS([sys/types.h sys/uio.h sys/un.h sys/wait.h sys/xattr.h])
 AC_CHECK_HEADERS([sys/ucred.h],,, [
 	#ifdef HAVE_SYS_PARAM_H
@@ -205,11 +197,11 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 
-AC_CHECK_MEMBERS([struct stat.st_flags])
-AC_CHECK_MEMBERS([struct stat.st_atim])
-AC_CHECK_MEMBERS([struct stat.st_atimespec])
-AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec])
-AC_CHECK_MEMBERS([struct stat.st_atimensec])
+AC_CHECK_MEMBERS([struct stat.st_flags],,, [[#include <sys/stat.h>]])
+AC_CHECK_MEMBERS([struct stat.st_atim],,, [[#include <sys/stat.h>]])
+AC_CHECK_MEMBERS([struct stat.st_atimespec],,, [[#include <sys/stat.h>]])
+AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec],,, [[#include <sys/stat.h>]])
+AC_CHECK_MEMBERS([struct stat.st_atimensec],,, [[#include <sys/stat.h>]])
 AC_CHECK_MEMBERS([struct sockaddr_in.sin_len],,, [[
   #include <sys/types.h>
   #include <netinet/in.h>
@@ -218,7 +210,7 @@ AC_CHECK_MEMBERS([DIR.d_fd],,,  [[#include <dirent.h>]])
 AC_CHECK_MEMBERS([DIR.dd_fd],,, [[#include <dirent.h>]])
 AC_CHECK_MEMBERS([struct tcp_info.tcpi_rtt],,, [[#include <netinet/tcp.h>]])
 
-AC_CHECK_DECLS([O_BINARY])
+AC_CHECK_DECLS([O_BINARY],,, [[#include <fcntl.h>]])
 
 AC_CHECK_DECLS([ENOTSUP],,, [[#include <sys/errno.h>]])
 AC_CHECK_DECLS([INFTIM],,, [[#include <poll.h>]])
@@ -297,7 +289,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_CHECK_FUNCS([ftruncate getpeereid getpeername getpid gettimeofday lchown])
 AC_CHECK_FUNCS([setproctitle utimensat])
-AC_SEARCH_LIBS([setproctitle], ["bsd"])
+AC_SEARCH_LIBS([setproctitle], [bsd])
 
 # NetBSD implements kqueue too differently for us to get it fixed by 0.10
 # TODO: Remove this when NetBSD kqueue implementation is working. The main
diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in
index 5f1b0618..e4f3b0f3 100755
--- a/infrastructure/makebuildenv.pl.in
+++ b/infrastructure/makebuildenv.pl.in
@@ -14,7 +14,10 @@ $|=1;
 
 print "Box build environment setup.\n";
 
-my @implicit_deps = ('lib/common');
+# Modules that everything else depends on, without being explicitly specified.
+# Deprecated because we can't specify dependencies between them in the usual way,
+# and it's totally unnecessary anyway:
+my @implicit_deps;
 
 # work out platform variables
 use lib 'infrastructure';
@@ -26,10 +29,6 @@ print "Building on '$build_os $build_os_ver' using ".
 # keep copy of command line args
 my $makebuildenv_args = join(' ',@ARGV);
 
-# do command line arguments
-my $compile_line_extra = $platform_compile_line_extra;
-my $link_line_extra = $platform_link_line_extra;
-
 # make sure local files directory exists
 unless(-d 'local')
 {
@@ -40,9 +39,6 @@ unless(-d 'local')
 # flags about the environment
 my %env_flags;
 
-$module_dependency{"lib/common"} = ["lib/win32"];
-push @implicit_deps, "lib/win32";
-
 # print "Flag: $_\n" for(keys %env_flags);
 
 # seed autogen code
@@ -377,17 +373,155 @@ for my $mod (@modules, @implicit_deps)
 	closedir DIR;
 }
 
-# Then write a makefile for each module
+my $default_cflags = '@CFLAGS@';
+my $default_cxxflags = '@CXXFLAGS@';
+$default_cflags =~ s/ -O2//g;
+$default_cxxflags =~ s/ -O2//g;
+my $debug_base_dir = 'debug';
+my $release_base_dir = 'release';
+
+my $release_flags = "-O2";
+if ($target_windows)
+{
+	$release_flags = "-O0 -g";
+}
+
+# Then write a master Makefile, and a mini-Makefile for each module
 print "done\n\nGenerating Makefiles...\n";
 
-my %module_resources_win32;
+my $makefile_ifdef_prefix = $bsd_make ? "." : "";
+
+open MASTER_MAKEFILE, ">Makefile" or die "Makefile: $!";
+print MASTER_MAKEFILE <<__E;
+#
+# AUTOMATICALLY GENERATED FILE
+#    do not edit!
+#
+#
+
+# "parcels" is defined near the end of this Makefile.
+default: parcels
+
+CC = @CC@
+CXX = @CXX@
+AR = @AR@
+RANLIB = @RANLIB@
+PERL = @PERL@
+WINDRES = @WINDRES@
+
+# Work around a mistake in QDBM (using <angled> includes for a file not in the
+# system path) by adding it to the include path with -I.
+DEFAULT_CFLAGS = \@CPPFLAGS@ $default_cflags \@CXXFLAGS_STRICT@ \\
+	$extra_platform_defines $platform_compile_line_extra \\
+	-DBOX_VERSION="\\"$product_version\\"" -Iqdbm
+DEFAULT_CXXFLAGS = \@CPPFLAGS@ $default_cxxflags \@CXXFLAGS_STRICT@ \\
+	$extra_platform_defines $platform_compile_line_extra \\
+	-DBOX_VERSION="\\"$product_version\\""
+LDFLAGS += \@LDFLAGS@ \@LDADD_RDYNAMIC@ $platform_link_line_extra
+
+RELEASE_CFLAGS   = \$(DEFAULT_CFLAGS)   -DBOX_RELEASE_BUILD $release_flags
+RELEASE_CXXFLAGS = \$(DEFAULT_CXXFLAGS) -DBOX_RELEASE_BUILD $release_flags
+RELEASE_OUTBASE  = $release_base_dir
+# http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode_using.html#debug_mode.using.mode
+DEBUG_CFLAGS   = \$(DEFAULT_CFLAGS)   -g -O0 -D_GLIBCXX_DEBUG
+DEBUG_CXXFLAGS = \$(DEFAULT_CXXFLAGS) -g -O0 -D_GLIBCXX_DEBUG
+DEBUG_OUTBASE  = $debug_base_dir
+
+__E
+
+if ($bsd_make)
+{
+	print MASTER_MAKEFILE <<__E;
+.ifdef V
+HIDE     = 
+_CC      = \$(CC)
+_CXX     = \$(CXX)
+_LINK    = \$(CXX)
+_WINDRES = \$(WINDRES)
+_AR      = \$(AR)
+_RANLIB  = \$(RANLIB)
+_PERL    = \$(PERL)
+.else
+HIDE     = @
+_CC      = @ echo "  [CC]     " \$(*F) && \$(CC)
+_CXX     = @ echo "  [CXX]    " \$(*F) && \$(CXX)
+_LINK    = @ echo "  [LINK]   " \$(*F) && \$(CXX)
+_WINDRES = @ echo "  [WINDRES]" \$(*F) && \$(WINDRES)
+_AR      = @ echo "  [AR]     " \$(*F) && \$(AR)
+_RANLIB  = @ echo "  [RANLIB] " \$(*F) && \$(RANLIB)
+_PERL    = @ echo "  [PERL]   " \$(*F) && \$(PERL) >/dev/null
+.endif
+
+__E
+}
+else
+{
+	print MASTER_MAKEFILE <<__E;
+HIDE     = \$(if \$(V),,@)
+_CC      = \$(if \$(V),\$(CC),      @ echo "  [CC]      \$<" && \$(CC))
+_CXX     = \$(if \$(V),\$(CXX),     @ echo "  [CXX]     \$<" && \$(CXX))
+_LINK    = \$(if \$(V),\$(CXX),     @ echo "  [LINK]    \$@" && \$(CXX))
+_WINDRES = \$(if \$(V),\$(WINDRES), @ echo "  [WINDRES] \$<" && \$(WINDRES))
+_AR      = \$(if \$(V),\$(AR),      @ echo "  [AR]      \$@" && \$(AR))
+_RANLIB  = \$(if \$(V),\$(RANLIB),  @ echo "  [RANLIB]  \$@" && \$(RANLIB))
+_PERL    = \$(if \$(V),\$(PERL),    @ echo "  [PERL]    \$@" && \$(PERL) >/dev/null)
+
+__E
+}
 
+my %module_resources_win32;
+my @debug_build_targets;
+my @release_build_targets;
+my @all_clean_targets;
+my @all_realclean_targets;
+my %mod_type_name;
+my %mod_end_targets;
+my %library_targets;
+
+# First, loop over all modules and quickly categorise them and generate the target filenames.
+# We need this to write correct dependency info into the makefile when modules are listed
+# out of order in modules.txt, which isn't strictly necessary but may look tidier.
 for my $mod (@implicit_deps, @modules)
 {
 	print $mod,"\n";
 	
 	my ($type,$name) = split /\//,$mod;
-	
+	if (not $name)
+	{
+		# External modules such as qdbm have no "type" in the directory path.
+		$name = $mod;
+		$type = 'lib';
+	}
+
+	# is target a library?
+	my $target_is_library = ($type ne 'bin' && $type ne 'test');
+
+	# make target name
+	my $end_target_file = $name;
+
+	if ($target_is_library)
+	{
+		$end_target_file .= '.a';
+	}
+	else
+	{
+		$end_target_file .= $platform_exe_ext;
+	}
+
+	$end_target_file = '_test'.$platform_exe_ext if $type eq 'test';
+
+	$mod_type_name{$mod} = [$type, $name];
+	$mod_end_targets{$mod} = $end_target_file;
+	$library_targets{$mod} = $target_is_library;
+}
+
+# Now loop over them again, generating makefile instructions etc.
+for my $mod (@implicit_deps, @modules)
+{
+	my ($type,$name) = @{$mod_type_name{$mod}};
+	my $end_target_file = $mod_end_targets{$mod};
+	my $target_is_library = $library_targets{$mod};
+
 	# add additional files for tests
 	if($type eq 'test')
 	{
@@ -478,9 +612,9 @@ __E
 			close TESTFILE;
 		}
 		
-		writetestfile("$mod/_t", "GLIBCXX_FORCE_NEW=1 ".
+		writetestfile("$mod/t", "GLIBCXX_FORCE_NEW=1 ".
 			'./_test' . $platform_exe_ext . ' "$@"', $mod);
-		writetestfile("$mod/_t-gdb", "GLIBCXX_FORCE_NEW=1 ".
+		writetestfile("$mod/t-gdb", "GLIBCXX_FORCE_NEW=1 ".
 			'gdb ./_test' . $platform_exe_ext . ' "$@"', $mod);
 		
 	}
@@ -516,124 +650,70 @@ __E
 			}
 		}
 	}	
-	
-
-	# make include path
-	my $include_paths = join(' ',map {'-I../../'.$_} @all_deps_for_module);
-
-	# is target a library?
-	my $target_is_library = ($type ne 'bin' && $type ne 'test');
 
-	# make target name
-	my $end_target = $name;
+	# get the list of library things to add -- in order of dependency 
+	# so things link properly
+	my @lib_files;
+	my @dep_targets;
+	my @include_search_dirs;
 
-	if ($target_is_library)
-	{
-		$end_target .= '.a';
-	}
-	else
+	foreach my $dep (reverse @all_deps_for_module)
 	{
-		$end_target .= $platform_exe_ext;
+		my $dep_target = $mod_end_targets{$dep};
+		die "No output file found for $dep" unless $dep_target;
+		$dep_target = "$dep/$dep_target";
+		push @dep_targets, $dep_target;
+
+		if ($dep =~ m|^lib\/(.+)$|)
+		{
+			push @lib_files, $dep_target;
+			push @include_search_dirs, $dep;
+		}
+		elsif ($dep =~ m|^([^/]+)$|)
+		{
+			push @lib_files, $dep_target;
+			push @include_search_dirs, $dep;
+		}
 	}
 
-	$end_target = '_test'.$platform_exe_ext if $type eq 'test';
+	# make include path
+	my $cpp_include_paths = join(' ',map {"-I$_"} @include_search_dirs);
+	print MASTER_MAKEFILE "${type}_${name}_includes = $cpp_include_paths\n";
 
 	# adjust for outdir
-	$end_target = '$(OUTDIR)/' . $end_target;
+	my $debug_end_target   = "\$(DEBUG_OUTBASE)/$mod/$end_target_file";
+	my $release_end_target = "\$(RELEASE_OUTBASE)/$mod/$end_target_file";
+	push @debug_build_targets,   $debug_end_target;
+	push @release_build_targets, $release_end_target;
 
 	# start the makefile
-	my $mk_name_extra = ($bsd_make)?'':'X';
-	open MAKE,">$mod/Makefile".$mk_name_extra or die "Can't open Makefile for $mod\n";
-	my $debug_link_extra = ($target_is_library)?'':'../../debug/lib/debug/debug.a';
-
-	my $default_cxxflags = '@CXXFLAGS@';
-	$default_cxxflags =~ s/ -O2//g;
-
-	my $release_flags = "-O2";
-	if ($target_windows)
-	{
-		$release_flags = "-O0 -g";
-	}
-
-	print MAKE <<__E;
+	open MINI_MODULE_MAKEFILE,">$mod/Makefile" or die "Can't open Makefile for $mod\n";
+	print MINI_MODULE_MAKEFILE <<__E;
 #
 # AUTOMATICALLY GENERATED FILE
 #    do not edit!
 #
-#
-CXX = @CXX@
-AR = @AR@
-RANLIB = @RANLIB@
-PERL = @PERL@
-WINDRES = @WINDRES@
-
-DEFAULT_CXXFLAGS = @CPPFLAGS@ $default_cxxflags @CXXFLAGS_STRICT@ \\
-	$include_paths $extra_platform_defines \\
-	-DBOX_VERSION="\\"$product_version\\""
-LDFLAGS += @LDFLAGS@ @LDADD_RDYNAMIC@
-
-.ifdef RELEASE
-CXXFLAGS += \$(DEFAULT_CXXFLAGS) -DBOX_RELEASE_BUILD $release_flags
-OUTBASE = ../../release
-OUTDIR = ../../release/$mod
-DEPENDMAKEFLAGS = -D RELEASE
-VARIENT = RELEASE
-.else
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode_using.html#debug_mode.using.mode
-CXXFLAGS += \$(DEFAULT_CXXFLAGS) -g -O0 -D_GLIBCXX_DEBUG
-OUTBASE = ../../debug
-OUTDIR = ../../debug/$mod
-DEPENDMAKEFLAGS =
-VARIENT = DEBUG
-.endif
-
-__E
+${makefile_ifdef_prefix}ifdef RELEASE
+TARGET = $release_base_dir/$mod/$end_target_file
+${makefile_ifdef_prefix}else
+TARGET = $debug_base_dir/$mod/$end_target_file
+${makefile_ifdef_prefix}endif
 
-	if ($bsd_make)
-	{
-		print MAKE <<__E;
-.ifdef V
-HIDE     = 
-_CXX     = \$(CXX)
-_LINK    = \$(CXX)
-_WINDRES = \$(WINDRES)
-_AR      = \$(AR)
-_RANLIB  = \$(RANLIB)
-_PERL    = \$(PERL)
-.else
-HIDE     = @
-_CXX     = @ echo "  [CXX]    " \$(*F) && \$(CXX)
-_LINK    = @ echo "  [LINK]   " \$(*F) && \$(CXX)
-_WINDRES = @ echo "  [WINDRES]" \$(*F) && \$(WINDRES)
-_AR      = @ echo "  [AR]     " \$(*F) && \$(AR)
-_RANLIB  = @ echo "  [RANLIB] " \$(*F) && \$(RANLIB)
-_PERL    = @ echo "  [PERL]   " \$(*F) && \$(PERL) >/dev/null
-.endif
+.PHONY: default
+default:
+	\$(MAKE) -C ../.. \$(TARGET)
 
-__E
-	}
-	else
-	{
-		print MAKE <<__E;
-HIDE     = \$(if \$(V),,@)
-_CXX     = \$(if \$(V),\$(CXX),     @ echo "  [CXX]     $mod/\$<" && \$(CXX))
-_LINK    = \$(if \$(V),\$(CXX),     @ echo "  [LINK]    $mod/\$@" && \$(CXX))
-_WINDRES = \$(if \$(V),\$(WINDRES), @ echo "  [WINDRES] $mod/\$<" && \$(WINDRES))
-_AR      = \$(if \$(V),\$(AR),      @ echo "  [AR]      $mod/\$@" && \$(AR))
-_RANLIB  = \$(if \$(V),\$(RANLIB),  @ echo "  [RANLIB]  $mod/\$@" && \$(RANLIB))
-_PERL    = \$(if \$(V),\$(PERL),    @ echo "  [PERL]    $mod/\$@" && \$(PERL) >/dev/null)
+.PHONY: clean
+clean:
+	\$(MAKE) -C ../.. clean_${type}_${name}
 
+.PHONY: realclean
+realclean:
+	\$(MAKE) -C ../.. realclean_${type}_${name}
 __E
-	}
+	close MINI_MODULE_MAKEFILE;
 
-	# if there is a Makefile.pre, include it now
-	if(-e "$mod/Makefile.pre")
-	{
-		print MAKE ".include <Makefile.pre>\n\n";
-	}
-	
-	# read directory
-	opendir DIR,$mod;
+	opendir DIR, $mod;
 	my @items = readdir DIR;
 	closedir DIR;
 	
@@ -646,10 +726,10 @@ __E
 			{
 				# Read items
 				my $d = "$mod/$di";
-				opendir DIR,$d;
+				opendir DIR, $d;
 				my @i = readdir DIR;
 				closedir DIR;
-				for(@i)
+				for (@i)
 				{
 					next if m/\A\./;
 					push @autogen_items,"$di/$_"
@@ -678,294 +758,587 @@ __E
 		}
 	}
 	
-	# ready for the rest of the details...
-	my $make;
-	
-	# then... do the cpp files...
-	my @obj_base;
-	for my $file (@items)
+	# write the recipes for debug and release builds of each file
+	foreach my $var_prefix ('DEBUG', 'RELEASE')
 	{
-		my $is_cpp = $file =~ m/\A(.+)\.cpp\Z/i;
-		my $is_rc  = $file =~ m/\A(.+)\.rc\Z/i;
-		my $base = $1;
+		my $make;
 
-		if ($target_windows)
+		# then... do the cpp files...
+		my @obj_base;
+		for my $file (@items)
 		{
-			next if not $is_cpp and not $is_rc;
-		}
-		else
-		{
-			next if not $is_cpp;
-		}
+			my $is_c = $file =~ m/\A(.+)\.c\Z/i;
+			my $is_cpp = $file =~ m/\A(.+)\.cpp\Z/i;
+			my $is_rc  = $file =~ m/\A(.+)\.rc\Z/i;
+			my $base = $1;
 
-		next if $file =~ /\A\._/; # Temp Mac OS Resource hack
+			# Don't try to compile .rc files except on Windows:
+			next if not $is_c and not $is_cpp and not ($is_rc and $target_windows);
+			next if $file =~ /\A\._/; # Temp Mac OS Resource hack
 
-		# store for later
-		push @obj_base,$base;
-	
-		# get the file...
-		open FL,"$mod/$file";
-		my $f;
-		read FL,$f,-s "$mod/$file";
-		close FL;
+			# store for later
+			push @obj_base, $base;
 		
-		my %dep;
+			# get the file...
+			open FL, "$mod/$file";
+			my $f;
+			read FL, $f, -s "$mod/$file";
+			close FL;
+			
+			my %dep;
 
-		while($f =~ m/\#include\s+"([^"]+?)"/g)
-		{
-			insert_dep($1, \%dep) if exists $hfiles{$1};
+			while($f =~ m/\#include\s+"([^"]+?)"/g)
+			{
+				insert_dep($1, \%dep) if exists $hfiles{$1};
+			}
+			
+			# output filename
+			my $out_name = "\$(${var_prefix}_OUTBASE)/$mod/$base.o";
+			
+			# write the line for this cpp file
+			my @dep_paths = map 
+			{ 
+				($hfiles{$_} eq $mod)
+				? "$mod/$_" 
+				: $hfiles{$_}."/$_"
+			}
+			keys %dep;
+
+			$make .= "$out_name: $mod/$file @dep_paths\n";
+
+			if ($is_c)
+			{
+				$make .= "\t\$(_CC) \$(${var_prefix}_CFLAGS) ".
+					"\$(${type}_${name}_includes) -DBOX_MODULE=\"\\\"$mod\\\"\" " .
+					"-c $mod/$file -o $out_name\n\n";
+			}
+			if ($is_cpp)
+			{
+				$make .= "\t\$(_CXX) \$(${var_prefix}_CXXFLAGS) ".
+					"\$(${type}_${name}_includes) -DBOX_MODULE=\"\\\"$mod\\\"\" " .
+					"-c $mod/$file -o $out_name\n\n";
+			}
+			elsif ($is_rc)
+			{
+				$make .= "\t\$(_WINDRES) $file $out_name\n\n";
+				my $res_list = $module_resources_win32{$mod};
+				$res_list ||= [];
+				push @$res_list, $base.'.o';
+				$module_resources_win32{$mod} = $res_list;
+			}
 		}
+
+		# need to see if the extra makefile fragments require extra object files
+		# or include any more makefiles
+		my @objs = @obj_base;
+		my @makefile_includes;
 		
-		# output filename
-		my $out_name = '$(OUTDIR)/'.$base.'.o';
+		additional_objects_from_make_fragment("$mod/Makefile.extra", \@objs, \@makefile_includes);
+		additional_objects_from_make_fragment("$mod/Makefile.extra.$build_os", \@objs, \@makefile_includes);
+
+		my $prefixed_end_target = "\$(${var_prefix}_OUTBASE)/$mod/$end_target_file";
+		my $o_file_list = join(' ',map {"\$(${var_prefix}_OUTBASE)/$mod/$_.o"} sort @objs);
+		my @prefixed_lib_files = map {"\$(${var_prefix}_OUTBASE)/$_"} @lib_files;
+		my @prefixed_dep_targets = map {"\$(${var_prefix}_OUTBASE)/$_"} @dep_targets;
+
+		print MASTER_MAKEFILE "$prefixed_end_target: $o_file_list";
+		print MASTER_MAKEFILE " @prefixed_dep_targets" unless $target_is_library;
+		print MASTER_MAKEFILE "\n";
 		
-		# write the line for this cpp file
-		my @dep_paths = map 
-		{ 
-			($hfiles{$_} eq $mod)
-			? $_ 
-			: '../../'.$hfiles{$_}."/$_"
+		if ($target_windows)
+		{
+			foreach my $dep (@all_deps_for_module)
+			{
+				my $res_list = $module_resources_win32{$dep};
+				next unless $res_list;
+				$o_file_list .= ' '.join(' ', 
+					map {"\$(${var_prefix}_OUTBASE)/$dep/$_"} @$res_list);
+			}
 		}
-		keys %dep;
 
-		$make .= $out_name.': '.join(' ',$file,@dep_paths)."\n";
-
-		if ($is_cpp)
+		# stuff to make the final target...
+		if($target_is_library)
 		{
-			$make .= "\t\$(_CXX) \$(CXXFLAGS) $compile_line_extra ".
-				"-DBOX_MODULE=\"\\\"$mod\\\"\" " .
-				"-c $file -o $out_name\n\n";
+			# make a library archive...
+			print MASTER_MAKEFILE "\t\$(HIDE) (rm -f $prefixed_end_target)\n";
+			print MASTER_MAKEFILE "\t\$(_AR) cq $prefixed_end_target $o_file_list\n";
+			print MASTER_MAKEFILE "\t\$(_RANLIB) $prefixed_end_target\n";
 		}
-		elsif ($is_rc)
+		else
 		{
-			$make .= "\t\$(_WINDRES) $file $out_name\n\n";
-			my $res_list = $module_resources_win32{$mod};
-			$res_list ||= [];
-			push @$res_list, $base.'.o';
-			$module_resources_win32{$mod} = $res_list;
+			# work out library options
+			# need to be... least used first, in absolute order they appear in the modules.txt file
+			my @libops;
+			
+			sub libops_fill
+			{
+				my ($module, $libops_ref) = @_;
+				
+				my $library_link_opts = $module_library_link_opts{$module};
+				if ($library_link_opts)
+				{
+					push @$libops_ref, @$library_link_opts;
+				}
+				
+				my $deps = $module_dependency{$module};
+				foreach my $dep (@$deps)
+				{
+					libops_fill($dep, $libops_ref);
+				}
+			}
+			
+			libops_fill($mod,\@libops);
+			
+			my $lo = '';
+			my %ldone;
+			for(@libops)
+			{
+				next if exists $ldone{$_};
+				$lo .= ' '.$_;
+				$ldone{$_} = 1;
+			}
+		
+			# link line...
+			print MASTER_MAKEFILE "\t\$(_LINK) \$(LDFLAGS) " .
+				"-o $prefixed_end_target $o_file_list " .
+				"@prefixed_lib_files $lo $platform_lib_files\n";
 		}
-	}
 
-	my $has_deps = ($#{$module_dependency{$mod}} >= 0);
-# ----- # always has dependencies with debug library
-	$has_deps = 1;
-	$has_deps = 0 if $target_is_library;
-
-	# Dependency stuff
-	my $deps_makeinfo;
-	if($has_deps)
-	{
-		if($bsd_make)
+		# tests need to copy the test file over
+		if($type eq 'test')
 		{
-			$deps_makeinfo = <<'__E';
-.BEGIN::
-.ifndef NODEPS
-.	if $(.TARGETS) == ""
+			print MASTER_MAKEFILE <<__E;
+	\$(HIDE) cp $mod/t \$(${var_prefix}_OUTBASE)/$mod/t
+	\$(HIDE) chmod u+x \$(${var_prefix}_OUTBASE)/$mod/t
+	\$(HIDE) cp $mod/t-gdb \$(${var_prefix}_OUTBASE)/$mod/t-gdb
+	\$(HIDE) chmod u+x \$(${var_prefix}_OUTBASE)/$mod/t-gdb
 __E
 		}
-		else
+
+		print MASTER_MAKEFILE $make,"\n";
+
+		for(@makefile_includes)
 		{
-			# gnu make
-			$deps_makeinfo = <<'__E';
-.PHONY:	dep_modules
-dep_modules:
-ifndef NODEPS
-ifeq ($(strip $(.TARGETS)),)
-__E
+			print MASTER_MAKEFILE "\n.include <$_>\n";
 		}
+}
+
+	print MASTER_MAKEFILE <<__E;
+clean_${type}_${name}:
+	rm -rf \$(DEBUG_OUTBASE)/$mod/*
+	rm -rf \$(RELEASE_OUTBASE)/$mod/*
+
+realclean_${type}_${name}: clean_${type}_${name}
+	rm -f $mod/t $mod/t-gdb $mod/Makefile
+	find $mod -name 'autogen_*' -type f -exec rm -f {} \\;
+__E
+	push @all_clean_targets, "clean_${type}_${name}";
+	push @all_realclean_targets, "realclean_${type}_${name}";
+
+	my $includes = "";
+	
+	if(-e "$mod/Makefile.extra")
+	{
+		$includes .= ".include <$mod/Makefile.extra>\n\n";
+	}
+	if(-e "$mod/Makefile.extra.$build_os")
+	{
+		$includes .= ".include <$mod/Makefile.extra.$build_os>\n\n";
+	}
+
+	if(!$bsd_make)
+	{
+		# need to post process this into a GNU makefile
+		$includes =~ s/\A\.\s*(ifdef|else|endif|ifndef)/$1/;
+		$includes =~ s/\A\.\s*include\s+<(.+?)>/include $1/;
+		$includes =~ s/-D\s+(\w+)/$1=1/g;
+	}
+
+	print MASTER_MAKEFILE $includes;
+}
+
+my @parcels;
+my %parcel_contents;
+
+sub starts_with ($$)
+{
+	my ($string,$expected) = @_;
+	return substr($string, 0, length $expected) eq $expected;
+}
+
+sub os_matches ($)
+{
+	my ($prefix_string) = @_;
+	my @prefixes = split m'\,', $prefix_string;
+	foreach my $prefix (@prefixes)
+	{
+		return 1 if starts_with($build_os,  $prefix);
+		return 1 if starts_with($ac_target_os, $prefix);
+		return 1 if starts_with("$ac_target_cpu-$ac_target_os",
+			$prefix);
+		return 1 if starts_with($ac_target, $prefix);
+	}
+	return 0;
+}
+
+my $copy_command = "cp -p";
+
+open PARCELS,"parcels.txt" or die "Can't open parcels file";
+{
+	my $cur_parcel = '';
+	while(<PARCELS>)
+	{
+		chomp; s/#.+\Z//; s/\s+\Z//; s/\s+/ /g;
+		next unless m/\S/;
 		
-		# run make for things we require
-		for my $dep (@all_deps_for_module)
+		# omit bits on some platforms?
+		next if m/\AEND-OMIT/;
+		if(m/\AOMIT:(.+)/)
 		{
-			my $dep_target = "";
-			if ($dep =~ m|^lib/(.*)|)
+			if (os_matches($1))
 			{
-				$dep_target = "\$(OUTBASE)/$dep/$1.a";
+				while(<PARCELS>)
+				{
+					last if m/\AEND-OMIT/;	
+				}
 			}
-			elsif ($dep =~ m|^.*/(.*)|)
+			next;
+		}
+
+		if (m'\AONLY:(.+)')
+		{
+			if (not os_matches($1))
 			{
-				$dep_target = "\$(OUTBASE)/$dep/$1$platform_exe_ext";
+				while (<PARCELS>)
+				{
+					last if m'\AEND-ONLY';
+				}
 			}
-			else
+			next;
+		}
+		next if (m'\AEND-ONLY');
+
+		if (m'\AEXCEPT:(.+)')
+		{
+			if (os_matches($1))
 			{
-				$dep_target = "lib$dep.a";
+				while (<PARCELS>)
+				{
+					last if m'\AEND-EXCEPT';
+				}
 			}
-
-			$deps_makeinfo .= <<EOF;
-	\$(HIDE) ( \\
-		cd ../../$dep; \\
-		\$(MAKE) $sub_make_options -q \$(DEPENDMAKEFLAGS) -D NODEPS $dep_target \\
-		|| \$(MAKE) $sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS $dep_target \\
-	)
-EOF
+			next;
 		}
-
-		$deps_makeinfo .= ".\tendif\n.endif\n\n";
-	}
-	print MAKE $deps_makeinfo if $bsd_make;
-	
-	# get the list of library things to add -- in order of dependency 
-	# so things link properly
-	my @lib_files;
-	foreach my $dep (reverse @all_deps_for_module)
-	{
-		if ($dep =~ m|^lib\/(.+)$|)
+		next if (m'\AEND-EXCEPT');
+		
+		# new parcel, or a new parcel definition?
+		if(m/\A\s+(.+)\Z/)
 		{
-			push @lib_files, "\$(OUTBASE)/$dep/$1.a";
+			push @{$parcel_contents{$cur_parcel}},$1
 		}
-		elsif ($dep =~ m|^([^/]+)$|)
+		else
 		{
-			push @lib_files, "../../$dep/lib$1.a";
+			$cur_parcel = $_;
+			push @parcels,$_;
 		}
 	}
+}
+close PARCELS;
 
-	# need to see if the extra makefile fragments require extra object files
-	# or include any more makefiles
-	my @objs = @obj_base;
-	my @makefile_includes;
-	
-	additional_objects_from_make_fragment("$mod/Makefile.extra", \@objs, \@makefile_includes);
-	additional_objects_from_make_fragment("$mod/Makefile.extra.$build_os", \@objs, \@makefile_includes);
+# create parcels directory
+mkdir "parcels",0755;
+mkdir "parcels/scripts",0755;
+
+print MASTER_MAKEFILE "parcels:\t",join(' ',map {"build-".$_} @parcels),"\n\n";
+
+my $runtest_script = $target_windows ? './infrastructure/mingw/runtest.sh' 
+	: './runtest.pl';
+
+print MASTER_MAKEFILE <<__END_OF_FRAGMENT;
+.PHONY: test
+test:	debug_tests release_tests
+
+.PHONY: debug_tests
+debug_tests:
+	$runtest_script ALL debug
+
+.PHONY: release_tests
+release_tests:
+	$runtest_script ALL release
+
+.PHONY: docs
+docs:
+	cd docs; \$(MAKE)
+
+__END_OF_FRAGMENT
 
-	my $o_file_list = join(' ',map {'$(OUTDIR)/'.$_.'.o'} sort @objs);
+my $release_flag = BoxPlatform::make_flag('RELEASE');
+my @parcel_targets;
 
-	if ($has_deps and not $bsd_make)
+for my $parcel (@parcels)
+{
+	my $version = BoxPlatform::parcel_root($parcel);
+	my $make_target = BoxPlatform::parcel_target($parcel);
+	my $dir = BoxPlatform::parcel_dir($parcel);
+	my @parcel_deps;
+
+	# Need to use BSD install on Solaris
+	my $install_bin = $build_os eq 'SunOS' ? '/usr/ucb/install' : 'install';
+
+	unless ($target_windows)
 	{
-		print MAKE ".PHONY: all\n" .
-			"all: dep_modules $end_target\n\n";
+		open SCRIPT,">parcels/scripts/install-$parcel" or die
+			"Can't open installer script for $parcel for writing";
+		print SCRIPT "#!/bin/sh\n\n";
 	}
 
-	print MAKE $end_target,': ',$o_file_list;
-	print MAKE " @lib_files" unless $target_is_library;
-	print MAKE "\n";
-	
-	if ($target_windows)
+	for(@{$parcel_contents{$parcel}})
 	{
-		foreach my $dep (@all_deps_for_module)
+		my @args = split /\s+/;
+
+		my ($type,$name,$dest) = @args;
+		my $optional = 0;
+		my $install  = 1;
+
+		if ($type eq 'optional')
 		{
-			my $res_list = $module_resources_win32{$dep};
-			next unless $res_list;
-			$o_file_list .= ' '.join(' ', 
-				map {'$(OUTBASE)/'.$dep."/$_"} @$res_list);
+			$optional = 1;
+			shift @args;
+			($type,$name,$dest) = @args;
 		}
-	}
 
-	# stuff to make the final target...
-	if($target_is_library)
-	{
-		# make a library archive...
-		print MAKE "\t\$(HIDE) (echo -n > $end_target; rm $end_target)\n";
-		print MAKE "\t\$(_AR) cq $end_target $o_file_list\n";
-		print MAKE "\t\$(_RANLIB) $end_target\n";
-	}
-	else
-	{
-		# work out library options
-		# need to be... least used first, in absolute order they appear in the modules.txt file
-		my @libops;
-		
-		sub libops_fill
+		if ($type eq 'noinstall')
 		{
-			my ($module, $libops_ref) = @_;
-			
-			my $library_link_opts = $module_library_link_opts{$module};
-			if ($library_link_opts)
+			$install = 0;
+			shift @args;
+			($type,$name,$dest) = @args;
+		}
+
+		if($type eq 'bin')
+		{
+			my $exeext = $platform_exe_ext;
+			print MASTER_MAKEFILE <<EOF;
+$dir/$name$exeext: release/bin/$name/$name$exeext
+	mkdir -p $dir
+	$copy_command release/bin/$name/$name$exeext $dir
+
+EOF
+			push @parcel_deps, "$dir/$name$exeext";
+		}
+		elsif ($type eq 'script')
+		{
+			# Replace any variables ($ac_target etc.) with their
+			# values.
+			$name =~ s|(\$[^/ ]+)|$1|eeg;
+			my $fullpath = $name;
+			my $filename = $name;
+			# remove path from script name
+			$filename =~ s{.*/}{};
+
+			print MASTER_MAKEFILE <<EOF;
+$dir/$filename: $fullpath
+	mkdir -p $dir
+EOF
+
+			if ($optional)
 			{
-				push @$libops_ref, @$library_link_opts;
+				print MASTER_MAKEFILE "\ttest -r $fullpath " .
+					"&& $copy_command $fullpath $dir || true\n";
 			}
-			
-			my $deps = $module_dependency{$module};
-			foreach my $dep (@$deps)
+			else
 			{
-				libops_fill($dep, $libops_ref);
+				print MASTER_MAKEFILE "\t$copy_command $fullpath $dir\n";
 			}
+
+			print MASTER_MAKEFILE "\n";
+
+			push @parcel_deps, "$dir/$filename";
 		}
-		
-		libops_fill($mod,\@libops);
-		
-		my $lo = '';
-		my %ldone;
-		for(@libops)
+		elsif($type eq 'man')
 		{
-			next if exists $ldone{$_};
-			$lo .= ' '.$_;
-			$ldone{$_} = 1;
+			print MASTER_MAKEFILE <<EOF;
+$dir/${name}.gz: docs/man/${name}.gz
+	mkdir -p $dir
+	$copy_command docs/man/${name}.gz $dir
+
+EOF
+			# Releases have the docs pre-made, but users
+			# may want to rebuild them for some reason.
+			my $docbook_source = "docs/docbook/${name}";
+			$docbook_source =~ s/\.[58]$/.xml/;
+			print MASTER_MAKEFILE <<EOF;
+docs/man/${name}.gz: $docbook_source docs/docbook/bb-man.xsl
+	cd docs; \$(MAKE) man/${name}.gz
+
+EOF
+			push @parcel_deps, "$dir/${name}.gz";
 		}
-	
-		# link line...
-		print MAKE "\t\$(_LINK) \$(LDFLAGS) $link_line_extra " .
-			"-o $end_target $o_file_list " .
-			"@lib_files $lo $platform_lib_files\n";
-	}
+		elsif($type eq 'html')
+		{
+			print MASTER_MAKEFILE <<EOF;
+$dir/docs/${name}.html: docs/htmlguide/man-html/${name}.html
+	mkdir -p $dir/docs
+	$copy_command docs/htmlguide/man-html/${name}.html $dir/docs
 
-	# tests need to copy the test file over
-	if($type eq 'test')
-	{
-		print MAKE "\tcp _t \$(OUTDIR)/t\n\tchmod u+x \$(OUTDIR)/t\n";
-		print MAKE "\tcp _t-gdb \$(OUTDIR)/t-gdb\n\tchmod u+x \$(OUTDIR)/t-gdb\n";
+EOF
+			# Releases have the docs pre-made, but users
+			# may want to rebuild them for some reason.
+			my $docbook_source = "docs/docbook/${name}.xml";
+			print MASTER_MAKEFILE <<EOF;
+docs/htmlguide/man-html/${name}.html: $docbook_source docs/docbook/bb-nochunk-book.xsl
+	cd docs; \$(MAKE) htmlguide/man-html/${name}.html
+
+EOF
+			push @parcel_deps, "$dir/docs/${name}.html";
+		}
+		elsif ($type eq 'subdir')
+		{
+			push @parcel_deps, "build_${type}_${name}";
+		}
 	}
 
-	# dependency line?
-	print MAKE "\n";
+	print MASTER_MAKEFILE <<EOF;
+build-$parcel:	$make_target
 
-	# module dependencies for GNU make?
-	print MAKE $deps_makeinfo if !$bsd_make;
-	
-	# print the rest of the file
-	print MAKE $make,"\n";
-	
-	# and a clean target
-	print MAKE <<EOF;
-clean:
-	-rm -rf \$(OUTDIR)/*
-.	ifndef SUBCLEAN
+$make_target: @parcel_deps
+	test -d $dir || mkdir $dir
 EOF
-	for my $dep (@all_deps_for_module)
-	{
-		print MAKE "\t\$(HIDE) (cd ../../$dep; \$(MAKE) \$(DEPENDMAKEFLAGS) -D SUBCLEAN clean)\n";
-	}
-	print MAKE ".\tendif\n";
+
+	push @parcel_targets, "build-$parcel";
 	
-	# include any extra stuff
-	print MAKE "\n\n";
-	if(-e "$mod/Makefile.extra")
-	{
-		print MAKE ".include <Makefile.extra>\n\n";
-	}
-	if(-e "$mod/Makefile.extra.$build_os")
+	for(@{$parcel_contents{$parcel}})
 	{
-		print MAKE ".include <Makefile.extra.$build_os>\n\n";
+		my @args = split /\s+/;
+
+		my ($type,$name,$dest) = @args;
+
+		my $optional = 0;
+		my $install  = 1;
+
+		if ($type eq 'optional')
+		{
+			$optional = 1;
+			shift @args;
+			($type,$name,$dest) = @args;
+		}
+
+		if ($type eq 'noinstall')
+		{
+			$install = 0;
+			shift @args;
+			($type,$name,$dest) = @args;
+		}
+
+		if ($type eq 'script')
+		{
+			# remove path from script name
+			$name =~ s{.*/}{};
+		}
+
+		if ($type eq 'html')
+		{
+			$dest = "share/doc/@PACKAGE_TARNAME@";
+			$name = "docs/$name.html";
+		}
+
+		if ($type eq 'man')
+		{
+			$name =~ /([0-9])$/;
+			$dest = "man/man$1";
+			$name =~ s/$/\.gz/;
+		}
+
+		if ($install and not $target_windows and not $type eq "subdir")
+		{
+			my $local_install_dir = $install_into_dir;
+			if (defined $dest)
+			{
+				if ($dest =~ m,^/,)
+				{
+					# Don't add $prefix if $dest is a literal path
+					$local_install_dir = $dest;
+				}
+				else
+				{
+					$local_install_dir = "@prefix@/$dest";
+				}
+			}
+			print SCRIPT "mkdir -p " .
+				"\${DESTDIR}$local_install_dir/\n";
+			print SCRIPT "$install_bin $name " .
+				"\${DESTDIR}$local_install_dir\n";
+		}
 	}
-	for(@makefile_includes)
-	{
-		print MAKE ".include <$_>\n\n";
+
+	unless ($target_windows)
+	{	
+		close SCRIPT;
+		chmod 0755,"parcels/scripts/install-$parcel";
 	}
 	
-	# and finally a target for rebuilding the build system
-	print MAKE "\nbuildsystem:\n\t(cd ../..; perl ./infrastructure/makebuildenv.pl $makebuildenv_args)\n\n";
-	
-	close MAKE;
+	my $root = BoxPlatform::parcel_root($parcel);
 
-	if(!$bsd_make)
+	unless ($target_windows)
 	{
-		# need to post process this into a GNU makefile
-		open MAKE,">$mod/Makefile";
-		open MAKEB,"$mod/MakefileX";
+		print MAKE "\tcp parcels/scripts/install-$parcel $dir\n";
+	}
 
-		while(<MAKEB>)
-		{
-			s/\A\.\s*(ifdef|else|endif|ifndef)/$1/;
-			s/\A\.\s*include\s+<(.+?)>/include $1/;
-			s/-D\s+(\w+)/$1=1/g;
-			print MAKE;
-		}
+	print MASTER_MAKEFILE "\t(cd parcels; tar cf - $root | gzip -9 - > $root.tgz )\n";
+	
+	print MASTER_MAKEFILE "\n";
 
-		close MAKEB;
-		close MAKE;
-		unlink "$mod/MakefileX";
+	unless ($target_windows)
+	{	
+		print MASTER_MAKEFILE "install-$parcel:\n";
+		print MASTER_MAKEFILE "\t(cd $dir; ./install-$parcel)\n\n";
 	}
 }
 
+print MASTER_MAKEFILE <<EOF;
+
+debug_build:   @debug_build_targets
+release_build: @release_build_targets
+parcels:       @parcel_targets
+
+# well-known targets that users might expect to be able to build:
+install:
+	cat local/install.msg
+
+clean:         @all_clean_targets
+	cd docs; \$(MAKE) clean
+
+realclean: clean @all_realclean_targets
+	find release debug       -type f -exec rm -f {} \\;
+
+# and finally a target for rebuilding the build system:
+buildsystem:
+	perl ./infrastructure/makebuildenv.pl $makebuildenv_args
+EOF
+
+for my $parcel (@parcels)
+{
+	# need to use -f to avoid error if they don't exist (already cleaned)
+	print MASTER_MAKEFILE "\trm -rf ", BoxPlatform::parcel_dir($parcel),    "\n";
+	print MASTER_MAKEFILE "\trm -f  ", BoxPlatform::parcel_target($parcel), "\n";
+}
+
+open INSTALLMSG,">local/install.msg" or die "Can't open install message file for writing";
+print INSTALLMSG <<__E;
+
+Parcels need to be installed separately, and as root. Type one of the following:
+
+__E
+
+for(@parcels)
+{
+	print INSTALLMSG "    $make_command install-".$_."\n";
+}
+print INSTALLMSG "\n";
+
+close INSTALLMSG;
+
+close MASTER_MAKEFILE;
+
 print "\nType 'cd <module_dir>; $make_command' to build a module\n\n";
 
 if($modules_omitted)
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in
deleted file mode 100755
index 56c4ca66..00000000
--- a/infrastructure/makeparcels.pl.in
+++ /dev/null
@@ -1,417 +0,0 @@
-#!@PERL@
-
-use strict;
-use lib 'infrastructure';
-use BoxPlatform;
-
-my @parcels;
-my %parcel_contents;
-
-sub starts_with ($$)
-{
-	my ($string,$expected) = @_;
-	return substr($string, 0, length $expected) eq $expected;
-}
-
-sub os_matches ($)
-{
-	my ($prefix_string) = @_;
-	my @prefixes = split m'\,', $prefix_string;
-	foreach my $prefix (@prefixes)
-	{
-		return 1 if starts_with($build_os,  $prefix);
-		return 1 if starts_with($ac_target_os, $prefix);
-		return 1 if starts_with("$ac_target_cpu-$ac_target_os",
-			$prefix);
-		return 1 if starts_with($ac_target, $prefix);
-	}
-	return 0;
-}
-
-my $copy_command = "cp -p";
-
-if ($build_os eq 'CYGWIN')
-{
-	$copy_command = "cp -pu"; # faster
-}
-
-open PARCELS,"parcels.txt" or die "Can't open parcels file";
-{
-	my $cur_parcel = '';
-	while(<PARCELS>)
-	{
-		chomp; s/#.+\Z//; s/\s+\Z//; s/\s+/ /g;
-		next unless m/\S/;
-		
-		# omit bits on some platforms?
-		next if m/\AEND-OMIT/;
-		if(m/\AOMIT:(.+)/)
-		{
-			if (os_matches($1))
-			{
-				while(<PARCELS>)
-				{
-					last if m/\AEND-OMIT/;	
-				}
-			}
-			next;
-		}
-
-		if (m'\AONLY:(.+)')
-		{
-			if (not os_matches($1))
-			{
-				while (<PARCELS>)
-				{
-					last if m'\AEND-ONLY';
-				}
-			}
-			next;
-		}
-		next if (m'\AEND-ONLY');
-
-		if (m'\AEXCEPT:(.+)')
-		{
-			if (os_matches($1))
-			{
-				while (<PARCELS>)
-				{
-					last if m'\AEND-EXCEPT';
-				}
-			}
-			next;
-		}
-		next if (m'\AEND-EXCEPT');
-		
-		# new parcel, or a new parcel definition?
-		if(m/\A\s+(.+)\Z/)
-		{
-			push @{$parcel_contents{$cur_parcel}},$1
-		}
-		else
-		{
-			$cur_parcel = $_;
-			push @parcels,$_;
-		}
-	}
-}
-close PARCELS;
-
-# create parcels directory
-mkdir "parcels",0755;
-mkdir "parcels/scripts",0755;
-
-# write master makefile
-
-open MAKE,">Makefile" or die "Can't open master Makefile for writing";
-
-print MAKE <<__E;
-#
-# AUTOMATICALLY GENERATED FILE
-#    do not edit!
-#
-#
-
-MAKE = $make_command
-
-__E
-
-print MAKE "all:\t",join(' ',map {"build-".$_} @parcels),"\n\n";
-
-my $runtest_script = $target_windows ? './infrastructure/mingw/runtest.sh' 
-	: './runtest.pl';
-
-print MAKE <<__END_OF_FRAGMENT;
-test:	debug/common/test release/common/test
-
-debug/common/test:
-	$runtest_script ALL debug
-
-release/common/test:
-	$runtest_script ALL release
-
-.PHONY: docs
-docs:
-	cd docs; \$(MAKE)
-
-__END_OF_FRAGMENT
-
-my $release_flag = BoxPlatform::make_flag('RELEASE');
-my @clean_deps;
-
-for my $parcel (@parcels)
-{
-	my $version = BoxPlatform::parcel_root($parcel);
-	my $make_target = BoxPlatform::parcel_target($parcel);
-	my $dir = BoxPlatform::parcel_dir($parcel);
-	my @parcel_deps;
-
-	# Need to use BSD install on Solaris
-	my $install_bin = $build_os eq 'SunOS' ? '/usr/ucb/install' : 'install';
-
-	unless ($target_windows)
-	{
-		open SCRIPT,">parcels/scripts/install-$parcel" or die
-			"Can't open installer script for $parcel for writing";
-		print SCRIPT "#!/bin/sh\n\n";
-	}
-
-	for(@{$parcel_contents{$parcel}})
-	{
-		my @args = split /\s+/;
-
-		my ($type,$name,$dest) = @args;
-		my $optional = 0;
-		my $install  = 1;
-
-		if ($type eq 'optional')
-		{
-			$optional = 1;
-			shift @args;
-			($type,$name,$dest) = @args;
-		}
-
-		if ($type eq 'noinstall')
-		{
-			$install = 0;
-			shift @args;
-			($type,$name,$dest) = @args;
-		}
-
-		if($type eq 'bin')
-		{
-			my $exeext = $platform_exe_ext;
-			print MAKE <<EOF;
-$dir/$name$exeext: release/bin/$name/$name$exeext
-	mkdir -p $dir
-	$copy_command release/bin/$name/$name$exeext $dir
-
-.PHONY: release/bin/$name/$name$exeext
-release/bin/$name/$name$exeext:
-	(cd bin/$name; \$(MAKE) $release_flag)
-
-EOF
-			push @parcel_deps, "$dir/$name$exeext";
-		}
-		elsif ($type eq 'script')
-		{
-			# Replace any variables ($ac_target etc.) with their
-			# values.
-			$name =~ s|(\$[^/ ]+)|$1|eeg;
-			my $fullpath = $name;
-			my $filename = $name;
-			# remove path from script name
-			$filename =~ s{.*/}{};
-
-			print MAKE <<EOF;
-$dir/$filename: $fullpath
-	mkdir -p $dir
-EOF
-
-			if ($optional)
-			{
-				print MAKE "\ttest -r $fullpath " .
-					"&& $copy_command $fullpath $dir || true\n";
-			}
-			else
-			{
-				print MAKE "\t$copy_command $fullpath $dir\n";
-			}
-
-			print MAKE "\n";
-
-			push @parcel_deps, "$dir/$filename";
-		}
-		elsif($type eq 'man')
-		{
-			print MAKE <<EOF;
-$dir/${name}.gz: docs/man/${name}.gz
-	mkdir -p $dir
-	$copy_command docs/man/${name}.gz $dir
-
-EOF
-			# Releases have the docs pre-made, but users
-			# may want to rebuild them for some reason.
-			my $docbook_source = "docs/docbook/${name}";
-			$docbook_source =~ s/\.[58]$/.xml/;
-			print MAKE <<EOF;
-docs/man/${name}.gz: $docbook_source docs/docbook/bb-man.xsl
-	cd docs; \$(MAKE) man/${name}.gz
-
-EOF
-			push @parcel_deps, "$dir/${name}.gz";
-		}
-		elsif($type eq 'html')
-		{
-			print MAKE <<EOF;
-$dir/docs/${name}.html: docs/htmlguide/man-html/${name}.html
-	mkdir -p $dir/docs
-	$copy_command docs/htmlguide/man-html/${name}.html $dir/docs
-
-EOF
-			# Releases have the docs pre-made, but users
-			# may want to rebuild them for some reason.
-			my $docbook_source = "docs/docbook/${name}.xml";
-			print MAKE <<EOF;
-docs/htmlguide/man-html/${name}.html: $docbook_source docs/docbook/bb-nochunk-book.xsl
-	cd docs; \$(MAKE) htmlguide/man-html/${name}.html
-
-EOF
-			push @parcel_deps, "$dir/docs/${name}.html";
-		}
-		elsif ($type eq 'subdir')
-		{
-			shift @args;
-			my $subdir = shift @args;
-			print MAKE <<EOF;
-.PHONY: $name-build $name-clean
-
-$name-build:
-	cd $subdir; \$(MAKE) @args
-
-$name-clean:
-	cd $name; \$(MAKE) clean
-EOF
-			push @parcel_deps, "$name-build";
-			push @clean_deps,  "$name-clean";
-		}
-	}
-
-	print MAKE <<EOF;
-build-$parcel:	$make_target
-
-$make_target: @parcel_deps
-	test -d $dir || mkdir $dir
-EOF
-	
-	for(@{$parcel_contents{$parcel}})
-	{
-		my @args = split /\s+/;
-
-		my ($type,$name,$dest) = @args;
-
-		my $optional = 0;
-		my $install  = 1;
-
-		if ($type eq 'optional')
-		{
-			$optional = 1;
-			shift @args;
-			($type,$name,$dest) = @args;
-		}
-
-		if ($type eq 'noinstall')
-		{
-			$install = 0;
-			shift @args;
-			($type,$name,$dest) = @args;
-		}
-
-		if ($type eq 'script')
-		{
-			# remove path from script name
-			$name =~ s{.*/}{};
-		}
-
-		if ($type eq 'html')
-		{
-			$dest = "share/doc/@PACKAGE_TARNAME@";
-			$name = "docs/$name.html";
-		}
-
-		if ($type eq 'man')
-		{
-			$name =~ /([0-9])$/;
-			$dest = "man/man$1";
-			$name =~ s/$/\.gz/;
-		}
-
-		if ($install and not $target_windows and not $type eq "subdir")
-		{
-			my $local_install_dir = $install_into_dir;
-			if (defined $dest)
-			{
-				if ($dest =~ m,^/,)
-				{
-					# Don't add $prefix if $dest is a literal path
-					$local_install_dir = $dest;
-				}
-				else
-				{
-					$local_install_dir = "@prefix@/$dest";
-				}
-			}
-			print SCRIPT "mkdir -p " .
-				"\${DESTDIR}$local_install_dir/\n";
-			print SCRIPT "$install_bin $name " .
-				"\${DESTDIR}$local_install_dir\n";
-		}
-	}
-
-	unless ($target_windows)
-	{	
-		close SCRIPT;
-		chmod 0755,"parcels/scripts/install-$parcel";
-	}
-	
-	my $root = BoxPlatform::parcel_root($parcel);
-
-	unless ($target_windows)
-	{
-		print MAKE "\tcp parcels/scripts/install-$parcel $dir\n";
-	}
-
-	print MAKE "\t(cd parcels; tar cf - $root | gzip -9 - > $root.tgz )\n";
-	
-	print MAKE "\n";
-
-	unless ($target_windows)
-	{	
-		print MAKE "install-$parcel:\n";
-		print MAKE "\t(cd $dir; ./install-$parcel)\n\n";
-	}
-}
-
-print MAKE <<EOF;
-install:
-	cat local/install.msg
-
-clean: @clean_deps
-	cd docs; \$(MAKE) clean
-EOF
-
-if ($build_os eq 'CYGWIN')
-{
-	print MAKE "\tfind release debug       -type f | xargs -r rm\n";
-	print MAKE "\tfind . -name 'autogen_*' -type f | xargs -r rm\n";
-}
-else
-{
-	print MAKE "\tfind release debug       -type f -exec rm -f {} \\;\n";
-	print MAKE "\tfind . -name 'autogen_*' -type f -exec rm -f {} \\;\n";
-}
-
-for my $parcel (@parcels)
-{
-	# need to use -f to avoid error if they don't exist (already cleaned)
-	print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel),    "\n";
-	print MAKE "\trm -f  ", BoxPlatform::parcel_target($parcel), "\n";
-}
-
-close MAKE;
-
-open INSTALLMSG,">local/install.msg" or die "Can't open install message file for writing";
-print INSTALLMSG <<__E;
-
-Parcels need to be installed separately, and as root. Type one of the following:
-
-__E
-
-for(@parcels)
-{
-	print INSTALLMSG "    $make_command install-".$_."\n";
-}
-print INSTALLMSG "\n";
-
-close INSTALLMSG;
-
diff --git a/infrastructure/mingw/compile-boxbackup-cygwin.sh b/infrastructure/mingw/compile-boxbackup-cygwin.sh
deleted file mode 100755
index 02b05852..00000000
--- a/infrastructure/mingw/compile-boxbackup-cygwin.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-basedir=`cd $(dirname $0)/../../.. && pwd`
-cd $basedir
-
-wget -c https://cygwin.com/setup-x86_64.exe \
-|| powershell wget https://cygwin.com/setup-x86_64.exe -UseBasicParsing -outfile setup-x86_64.exe
-
-chmod a+x setup-x86_64.exe
-./setup-x86_64.exe --quiet-mode --packages \
-	"autoconf,automake,gdb,make,mingw64-x86_64-gcc,mingw64-x86_64-gcc-g++,
-	,mingw64-x86_64-zlib,libxml2,libxslt,perl,subversion,unzip,vim,wget"
-
-install_prefix=/usr/x86_64-w64-mingw32
-compiler_prefix=x86_64-w64-mingw32
-
-openssl_source=https://www.openssl.org/source/
-latest_openssl=`wget -O- -q $openssl_source \
-| grep '<td><a href="openssl-1.0.*.tar.gz">' \
-| sed -e 's/.tar.gz">.*//' -e 's/.*"//' | sort | tail -1`
-
-wget -c $openssl_source/$latest_openssl.tar.gz
-tar xzf $latest_openssl.tar.gz --exclude $latest_openssl/Makefile
-(
-	cd $latest_openssl
-	./Configure --prefix=$install_prefix mingw64 \
-		--cross-compile-prefix=$compiler_prefix-
-
-	# Avoid recompilation by caching the previous Makefile for its timestamp,
-	# and reusing if it hasn't changed.
-	if diff --brief Makefile ../openssl.makefile.cache; then
-		cp -a ../openssl.makefile.cache Makefile
-	else
-		cp -a Makefile ../openssl.makefile.cache
-	fi
-
-	make
-	make install_sw
-)
-
-pcre_url=`wget -O- -q ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
-| grep 'pcre-8.*.tar.bz2"' | sed -e 's/">pcre-.*//' | sed -e 's/.*<a href="//' \
-| tail -1`
-pcre_version=`basename $pcre_url .tar.bz2`
-wget -c $pcre_url
-tar xjf `basename $pcre_url`
-(
-	cd $pcre_version
-	./configure --prefix=$install_prefix --disable-shared \
-		--host=$compiler_prefix
-	make
-	make install
-)
-
diff --git a/infrastructure/mingw/configure.sh b/infrastructure/mingw/configure.sh
deleted file mode 100755
index 98c0cb49..00000000
--- a/infrastructure/mingw/configure.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-source `dirname $0`/environment.sh
-
-if [ ! -r "$DEP_PATH/lib/libssl.a" ]; then
-	echo "Error: install OpenSSL as instructed by" \
-		"docs/backup/win32_build_on_cygwin_using_mingw.txt" >&2
-	exit 2
-fi
-
-if [ ! -r "$DEP_PATH/lib/libpcreposix.a" \
-	-o ! -r "$DEP_PATH/lib/libpcre.a" \
-	-o ! -r "$DEP_PATH/include/pcreposix.h" ]; then
-	echo "Error: install PCRE as instructed by" \
-		"docs/backup/win32_build_on_cygwin_using_mingw.txt" >&2
-	exit 2
-fi
-
-LIBZ_PATH="${DEP_PATH}/sys-root/mingw/lib"
-
-if [ ! -r "$LIBZ_PATH/libz.dll.a" ]; then
-	echo "Error: upgrade your Cygwin mingw-zlib-devel package" >&2
-	exit 2
-fi
-
-if [ ! -x "configure" ]; then
-	if ! ./bootstrap; then
-		echo "Error: bootstrap failed, aborting." >&2
-		exit 1
-	fi
-fi
-
-if ! ./configure "$@" --host=$target \
-	--with-ssl-headers="${DEP_PATH}/include" \
-	--with-ssl-lib="${DEP_PATH}/lib" \
-	CFLAGS="-mthreads" \
-	CXXFLAGS="-mthreads" \
-	LDFLAGS="-Wl,-Bstatic -mthreads -L${LIBZ_PATH}" \
-	LIBS="-lws2_32 -lgdi32"
-then
-	echo "Error: configure failed, aborting." >&2
-	exit 1
-fi
-
-exit 0
diff --git a/infrastructure/mingw/environment.sh b/infrastructure/mingw/environment.sh
deleted file mode 100644
index 1f2f14c2..00000000
--- a/infrastructure/mingw/environment.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-case "`uname -m`" in
-x86_64)
-	DEP_PATH=/usr/x86_64-w64-mingw32
-	target=x86_64-w64-mingw32 ;;
-i686)
-	DEP_PATH=/usr/i686-pc-mingw32
-	target=i686-pc-mingw32 ;;
-*)
-	echo "Error: unknown machine type `uname -m`" >&2; exit 1 ;;
-esac
-
diff --git a/infrastructure/mingw/runtest.sh b/infrastructure/mingw/runtest.sh
deleted file mode 100755
index 4deecb47..00000000
--- a/infrastructure/mingw/runtest.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-source `dirname $0`/environment.sh
-
-export PATH=$DEP_PATH/sys-root/mingw/bin:$PATH
-
-exec `dirname $0`/../../runtest.pl "$@"
diff --git a/infrastructure/msvc/2003/bbackupctl.vcproj b/infrastructure/msvc/2003/bbackupctl.vcproj
deleted file mode 100644
index 02f7482e..00000000
--- a/infrastructure/msvc/2003/bbackupctl.vcproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="bbackupctl"

-	ProjectGUID="{9FD51412-E945-4457-A17A-CA3C505CF431}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32&quot;;&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"

-				OutputFile="$(OutDir)/bbackupctl.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/bbackupctl.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="TRUE"

-				OptimizeForProcessor="1"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="FALSE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib"

-				OutputFile="$(OutDir)/bbackupctl.exe"

-				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<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}">

-			<Filter

-				Name="bin"

-				Filter="">

-				<Filter

-					Name="bbackupctl"

-					Filter="">

-					<File

-						RelativePath="..\..\..\bin\bbackupctl\bbackupctl.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.cpp">

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<File

-				RelativePath="..\..\..\lib\win32\WinNamedPipeStream.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}">

-			<File

-				RelativePath="..\..\..\lib\win32\messages.rc">

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/infrastructure/msvc/2003/bbackupd.vcproj b/infrastructure/msvc/2003/bbackupd.vcproj
deleted file mode 100644
index f34db0cc..00000000
--- a/infrastructure/msvc/2003/bbackupd.vcproj
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="bbackupd"

-	ProjectGUID="{22D325FB-9131-4BD6-B390-968F0491D687}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\db-4.2.52.NC\build_win32&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0&quot;;&quot;$(SolutionDir)..\..\..\..\openssl\include&quot;;&quot;$(SolutionDir)..\..\..\..\zlib\include&quot;;&quot;$(SolutionDir)..\..\..\lib\backupclient&quot;;&quot;$(SolutionDir)..\..\..\lib\server&quot;;&quot;$(SolutionDir)..\..\..\lib\crypto&quot;;&quot;$(SolutionDir)..\..\..\lib\compress&quot;;&quot;$(SolutionDir)..\..\..\lib\win32&quot;;&quot;$(SolutionDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"

-				OutputFile="$(OutDir)/bbackupd.exe"

-				LinkIncremental="2"

-				IgnoreAllDefaultLibraries="FALSE"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/bbackupd.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="TRUE"

-				OptimizeForProcessor="1"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOOST_REGEX_NO_LIB"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="FALSE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib"

-				OutputFile="$(OutDir)/bbackupd.exe"

-				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<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}">

-			<Filter

-				Name="bin"

-				Filter="">

-				<Filter

-					Name="bbackupd"

-					Filter="">

-					<File

-						RelativePath="..\..\..\bin\bbackupd\autogen_ClientException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientContext.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientDeleteList.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupDaemon.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\bbackupd.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\Win32BackupService.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.cpp">

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<Filter

-				Name="bin"

-				Filter="">

-				<Filter

-					Name="bbackupd"

-					Filter="">

-					<File

-						RelativePath="..\..\..\bin\bbackupd\autogen_ClientException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientContext.h">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientDeleteList.h">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.h">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.h">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupDaemon.h">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\Win32BackupService.h">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h">

-					</File>

-				</Filter>

-			</Filter>

-		</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}">

-			<File

-				RelativePath="..\..\..\lib\win32\messages.rc">

-			</File>

-		</Filter>

-		<File

-			RelativePath="..\..\..\ReadMe.txt">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/infrastructure/msvc/2003/boxbackup.sln b/infrastructure/msvc/2003/boxbackup.sln
deleted file mode 100644
index d9a28041..00000000
--- a/infrastructure/msvc/2003/boxbackup.sln
+++ /dev/null
@@ -1,57 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boxquery", "boxquery.vcproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcproj", "{22D325FB-9131-4BD6-B390-968F0491D687}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "win32test.vcproj", "{28C29E72-76A2-4D0C-B35B-12D446733D2E}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vcproj", "{9FD51412-E945-4457-A17A-CA3C505CF431}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug.ActiveCfg = Debug|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug.Build.0 = Debug|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release.ActiveCfg = Release|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release.Build.0 = Release|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug.ActiveCfg = Debug|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug.Build.0 = Debug|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release.ActiveCfg = Release|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release.Build.0 = Release|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Debug.ActiveCfg = Debug|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Debug.Build.0 = Debug|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Release.ActiveCfg = Release|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Release.Build.0 = Release|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug.ActiveCfg = Debug|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug.Build.0 = Debug|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release.ActiveCfg = Release|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release.Build.0 = Release|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug.ActiveCfg = Debug|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug.Build.0 = Debug|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release.ActiveCfg = Release|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/infrastructure/msvc/2003/boxquery.vcproj b/infrastructure/msvc/2003/boxquery.vcproj
deleted file mode 100644
index 6ac09024..00000000
--- a/infrastructure/msvc/2003/boxquery.vcproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="boxquery"

-	ProjectGUID="{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"

-	RootNamespace="boxquery"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0&quot;"

-				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"

-				OutputFile="$(OutDir)/bbackupquery.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/boxquery.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="TRUE"

-				OptimizeForProcessor="1"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOOST_REGEX_NO_LIB"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="FALSE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib"

-				OutputFile="$(OutDir)/bbackupquery.exe"

-				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="FALSE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<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}">

-			<Filter

-				Name="bin"

-				Filter="">

-				<Filter

-					Name="backupquery"

-					Filter="">

-					<File

-						RelativePath="..\..\..\bin\bbackupquery\autogen_Documentation.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupquery\BackupQueries.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupquery\bbackupquery.cpp">

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<Filter

-				Name="bin"

-				Filter="">

-				<Filter

-					Name="backupquery"

-					Filter="">

-					<File

-						RelativePath="..\..\..\bin\bbackupquery\BackupQueries.h">

-					</File>

-				</Filter>

-			</Filter>

-		</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}">

-			<File

-				RelativePath="..\..\..\lib\win32\messages.rc">

-			</File>

-		</Filter>

-		<File

-			RelativePath="..\..\..\ReadMe.txt">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/infrastructure/msvc/2003/common.vcproj b/infrastructure/msvc/2003/common.vcproj
deleted file mode 100644
index fb18b76a..00000000
--- a/infrastructure/msvc/2003/common.vcproj
+++ /dev/null
@@ -1,672 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="common"

-	ProjectGUID="{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0\&quot;"

-				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/common.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="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="4"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="TRUE"

-				OptimizeForProcessor="1"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0\&quot;"

-				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="FALSE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/common.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}">

-			<Filter

-				Name="lib"

-				Filter="">

-				<Filter

-					Name="compress"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\compress\autogen_CompressException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\compress\CompressStream.cpp">

-					</File>

-				</Filter>

-				<Filter

-					Name="common"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\common\autogen_CommonException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\autogen_ConversionException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTime.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTimeToText.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\CollectInBufferStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Configuration.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ConversionString.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\DebugAssertFailed.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\DebugMemLeakFinder.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\DebugPrintf.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\EventWatchFilesystemObject.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ExcludeList.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FdGetLine.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FileStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\IOStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\IOStreamGetLine.cpp">

-					</File>

-					<File

-					        RelativePath="..\..\..\lib\common\Logging.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemBlockStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\PartialReadStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\PathUtils.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ReadGatherStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ReadLoggingStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\StreamableMemBlock.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\UnixUser.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Utils.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\WaitForEvent.cpp">

-					</File>

-				</Filter>

-				<Filter

-					Name="backupclient"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\backupclient\autogen_BackupProtocolClient.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\autogen_BackupStoreException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientCryptoKeys.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientFileAttributes.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientMakeExcludeList.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientRestore.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupDaemonConfigVerify.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreDirectory.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFile.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCmbDiff.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCmbIdx.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCombine.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCryptVar.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileDiff.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileEncodeStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFilename.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFilenameClear.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileRevDiff.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreObjectDump.cpp">

-					</File>

-				</Filter>

-				<Filter

-					Name="crypto"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\crypto\autogen_CipherException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherAES.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherBlowfish.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherContext.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherDescription.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\MD5Digest.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\Random.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\RollingChecksum.cpp">

-					</File>

-				</Filter>

-				<Filter

-					Name="win32"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\win32\emu.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\win32\getopt_long.cxx">

-					</File>

-				</Filter>

-				<Filter

-					Name="server"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\server\autogen_ConnectionException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\autogen_ServerException.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Daemon.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\LocalProcessStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Protocol.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolObject.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolUncertainStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Socket.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketStream.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketStreamTLS.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SSLLib.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\TLSContext.cpp">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\WinNamedPipeStream.cpp">

-					</File>

-

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<Filter

-				Name="lib"

-				Filter="">

-				<Filter

-					Name="compress"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\compress\autogen_CompressException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\compress\Compress.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\compress\CompressException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\compress\CompressStream.h">

-					</File>

-				</Filter>

-				<Filter

-					Name="common"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\common\autogen_CommonException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\autogen_ConversionException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BannerText.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BeginStructPackForWire.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Box.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxPlatform.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxPortsAndFiles.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTime.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTimeToText.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTimeToUnix.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\CollectInBufferStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\CommonException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Configuration.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Conversion.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\EndStructPackForWire.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\EventWatchFilesystemObject.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ExcludeList.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FdGetLine.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FileModificationTime.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FileStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Guards.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\IOStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\IOStreamGetLine.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\LinuxWorkaround.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\LocalProcessStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Logging.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MainHelper.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemBlockStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemLeakFinder.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemLeakFindOff.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemLeakFindOn.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\NamedLock.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\PartialReadStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\PathUtils.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ReadGatherStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\StreamableMemBlock.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\TemporaryDirectory.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Test.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Timer.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\UnixUser.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Utils.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\WaitForEvent.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxVersion.h">

-					</File>

-				</Filter>

-				<Filter

-					Name="backupclient"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\backupclient\autogen_BackupProtocolClient.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\autogen_BackupStoreException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientCryptoKeys.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientFileAttributes.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientMakeExcludeList.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientRestore.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupDaemonConfigVerify.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreConstants.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreDirectory.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFile.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCryptVar.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileEncodeStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFilename.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFilenameClear.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileWire.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreObjectMagic.h">

-					</File>

-				</Filter>

-				<Filter

-					Name="crypto"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\crypto\autogen_CipherException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherAES.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherBlowfish.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherContext.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherDescription.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\MD5Digest.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\Random.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\RollingChecksum.h">

-					</File>

-				</Filter>

-				<Filter

-					Name="win32"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\win32\emu.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\win32\getopt.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h">

-					</File>

-				</Filter>

-				<Filter

-					Name="server"

-					Filter="">

-					<File

-						RelativePath="..\..\..\lib\server\autogen_ConnectionException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\autogen_ServerException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Daemon.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Protocol.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolObject.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolUncertainStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolWire.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ServerException.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ServerStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ServerTLS.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Socket.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketListen.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketStream.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketStreamTLS.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SSLLib.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\TLSContext.h">

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\WinNamedPipeStream.h">

-					</File>

-				</Filter>

-			</Filter>

-		</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/infrastructure/msvc/2003/win32test.vcproj b/infrastructure/msvc/2003/win32test.vcproj
deleted file mode 100644
index 2ef7164e..00000000
--- a/infrastructure/msvc/2003/win32test.vcproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="win32test"

-	ProjectGUID="{28C29E72-76A2-4D0C-B35B-12D446733D2E}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\bin\bbackupd&quot;;&quot;$(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32&quot;;&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"

-				OutputFile="$(OutDir)/win32test.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/win32test.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="TRUE"

-				OptimizeForProcessor="1"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\bin\bbackupd&quot;;&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="FALSE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib"

-				OutputFile="$(OutDir)/win32test.exe"

-				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<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\win32\emu.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\test\win32\testlibwin32.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</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>

-		<File

-			RelativePath="..\..\..\ReadMe.txt">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/infrastructure/msvc/2005/bbackupctl.vcproj b/infrastructure/msvc/2005/bbackupctl.vcproj
deleted file mode 100644
index 216a284b..00000000
--- a/infrastructure/msvc/2005/bbackupctl.vcproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="bbackupctl"

-	ProjectGUID="{9FD51412-E945-4457-A17A-CA3C505CF431}"

-	RootNamespace="bbackupctl"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\common&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\inc32&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib Advapi32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcre.lib"

-				OutputFile="$(OutDir)/bbackupctl.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/bbackupctl.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="true"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\inc32&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.lib"

-				OutputFile="$(OutDir)/bbackupctl.exe"

-				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</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}"

-			>

-			<Filter

-				Name="bin"

-				>

-				<Filter

-					Name="bbackupctl"

-					>

-					<File

-						RelativePath="..\..\..\bin\bbackupctl\bbackupctl.cpp"

-						>

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</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}"

-			>

-			<File

-				RelativePath="..\..\..\lib\win32\messages.rc"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/infrastructure/msvc/2005/bbackupd.vcproj b/infrastructure/msvc/2005/bbackupd.vcproj
deleted file mode 100644
index ac8eb86a..00000000
--- a/infrastructure/msvc/2005/bbackupd.vcproj
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="bbackupd"

-	ProjectGUID="{22D325FB-9131-4BD6-B390-968F0491D687}"

-	RootNamespace="bbackupd"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\lib\backupclient&quot;;&quot;$(SolutionDir)..\..\..\lib\common&quot;;&quot;$(SolutionDir)..\..\..\lib\compress&quot;;&quot;$(SolutionDir)..\..\..\lib\crypto&quot;;&quot;$(SolutionDir)..\..\..\lib\server&quot;;&quot;$(SolutionDir)..\..\..\lib\win32&quot;;&quot;$(SolutionDir)..\..\..\..\openssl\inc32&quot;;&quot;$(SolutionDir)..\..\..\..\zlib\include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib Advapi32.lib User32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcre.lib"

-				OutputFile="$(OutDir)/bbackupd.exe"

-				LinkIncremental="2"

-				IgnoreAllDefaultLibraries="false"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/bbackupd.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="true"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(SolutionDir)..\..\..\..\openssl\inc32&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.lib"

-				OutputFile="$(OutDir)/bbackupd.exe"

-				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</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}"

-			>

-			<Filter

-				Name="bin"

-				>

-				<Filter

-					Name="bbackupd"

-					>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\autogen_ClientException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientContext.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientDeleteList.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupDaemon.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\bbackupd.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\Win32BackupService.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp"

-						>

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<Filter

-				Name="bin"

-				>

-				<Filter

-					Name="bbackupd"

-					>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\autogen_ClientException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientContext.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientDeleteList.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\BackupDaemon.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\Win32BackupService.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.h"

-						>

-					</File>

-				</Filter>

-			</Filter>

-		</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}"

-			>

-			<File

-				RelativePath="..\..\..\lib\win32\messages.rc"

-				>

-			</File>

-		</Filter>

-		<File

-			RelativePath="..\..\..\ReadMe.txt"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/infrastructure/msvc/2005/boxbackup.sln b/infrastructure/msvc/2005/boxbackup.sln
deleted file mode 100644
index 833066e9..00000000
--- a/infrastructure/msvc/2005/boxbackup.sln
+++ /dev/null
@@ -1,55 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual C++ Express 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boxquery", "boxquery.vcproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcproj", "{22D325FB-9131-4BD6-B390-968F0491D687}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "win32test.vcproj", "{28C29E72-76A2-4D0C-B35B-12D446733D2E}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vcproj", "{9FD51412-E945-4457-A17A-CA3C505CF431}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.Build.0 = Debug|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.ActiveCfg = Release|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.Build.0 = Release|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.Build.0 = Debug|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.ActiveCfg = Release|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.Build.0 = Release|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.ActiveCfg = Debug|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.Build.0 = Debug|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.ActiveCfg = Release|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.Build.0 = Release|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.Build.0 = Debug|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.ActiveCfg = Release|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.Build.0 = Release|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.Build.0 = Debug|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.ActiveCfg = Release|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/infrastructure/msvc/2005/boxbackup.suo b/infrastructure/msvc/2005/boxbackup.suo
deleted file mode 100644
index 534f337c..00000000
--- a/infrastructure/msvc/2005/boxbackup.suo
+++ /dev/null
diff --git a/infrastructure/msvc/2005/boxquery.vcproj b/infrastructure/msvc/2005/boxquery.vcproj
deleted file mode 100644
index 776c0ac9..00000000
--- a/infrastructure/msvc/2005/boxquery.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="boxquery"

-	ProjectGUID="{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"

-	RootNamespace="boxquery"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\common&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\..\pcre&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\inc32&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib Advapi32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcre.lib"

-				OutputFile="$(OutDir)/bbackupquery.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/boxquery.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="true"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.lib"

-				OutputFile="$(OutDir)/bbackupquery.exe"

-				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="false"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</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}"

-			>

-			<Filter

-				Name="bin"

-				>

-				<Filter

-					Name="backupquery"

-					>

-					<File

-						RelativePath="..\..\..\bin\bbackupquery\autogen_Documentation.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupquery\BackupQueries.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\bin\bbackupquery\bbackupquery.cpp"

-						>

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<Filter

-				Name="bin"

-				>

-				<Filter

-					Name="backupquery"

-					>

-					<File

-						RelativePath="..\..\..\bin\bbackupquery\BackupQueries.h"

-						>

-					</File>

-				</Filter>

-			</Filter>

-		</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}"

-			>

-			<File

-				RelativePath="..\..\..\lib\win32\messages.rc"

-				>

-			</File>

-		</Filter>

-		<File

-			RelativePath="..\..\..\ReadMe.txt"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/infrastructure/msvc/2005/common.vcproj b/infrastructure/msvc/2005/common.vcproj
deleted file mode 100644
index 256bce06..00000000
--- a/infrastructure/msvc/2005/common.vcproj
+++ /dev/null
@@ -1,896 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="common"

-	ProjectGUID="{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"

-	RootNamespace="common"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				Description="Determining Version Number"

-				CommandLine="perl $(InputDir)..\getversion.pl"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\common&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\inc32&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\..\pcre&quot;;$(NOINHERIT)"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				WarnAsError="false"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/common.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="true"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\inc32&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\..\pcre\pcre-6.7\&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/common.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</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}"

-			>

-			<Filter

-				Name="lib"

-				>

-				<Filter

-					Name="compress"

-					>

-					<File

-						RelativePath="..\..\..\lib\compress\autogen_CompressException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\compress\CompressStream.cpp"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="common"

-					>

-					<File

-						RelativePath="..\..\..\lib\common\autogen_CommonException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\autogen_ConversionException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTime.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTimeToText.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\CollectInBufferStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Configuration.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ConversionString.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\DebugAssertFailed.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\DebugMemLeakFinder.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\DebugPrintf.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\EventWatchFilesystemObject.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ExcludeList.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FdGetLine.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FileStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\IOStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\IOStreamGetLine.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Logging.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemBlockStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\PartialReadStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\PathUtils.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ReadGatherStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ReadLoggingStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\StreamableMemBlock.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Timer.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\UnixUser.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Utils.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\WaitForEvent.cpp"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="backupclient"

-					>

-					<File

-						RelativePath="..\..\..\lib\backupclient\autogen_BackupProtocolClient.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\autogen_BackupStoreException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientCryptoKeys.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientFileAttributes.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientMakeExcludeList.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientRestore.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupDaemonConfigVerify.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreDirectory.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFile.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCmbDiff.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCmbIdx.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCombine.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCryptVar.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileDiff.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileEncodeStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFilename.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFilenameClear.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileRevDiff.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreObjectDump.cpp"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="crypto"

-					>

-					<File

-						RelativePath="..\..\..\lib\crypto\autogen_CipherException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherAES.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherBlowfish.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherContext.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherDescription.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\MD5Digest.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\Random.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\RollingChecksum.cpp"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="win32"

-					>

-					<File

-						RelativePath="..\..\..\lib\win32\emu.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\win32\getopt_long.cxx"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="server"

-					>

-					<File

-						RelativePath="..\..\..\lib\server\autogen_ConnectionException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\autogen_ServerException.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Daemon.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\LocalProcessStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Protocol.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolObject.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolUncertainStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Socket.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketStream.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketStreamTLS.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SSLLib.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\TLSContext.cpp"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\WinNamedPipeStream.cpp"

-						>

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<Filter

-				Name="lib"

-				>

-				<Filter

-					Name="compress"

-					>

-					<File

-						RelativePath="..\..\..\lib\compress\autogen_CompressException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\compress\Compress.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\compress\CompressException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\compress\CompressStream.h"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="common"

-					>

-					<File

-						RelativePath="..\..\..\lib\common\autogen_CommonException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\autogen_ConversionException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BannerText.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BeginStructPackForWire.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Box.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxConfig-MSVC.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxPlatform.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxPortsAndFiles.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTime.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTimeToText.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxTimeToUnix.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\BoxVersion.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\CollectInBufferStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\CommonException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Configuration.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Conversion.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\EndStructPackForWire.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\EventWatchFilesystemObject.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ExcludeList.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FdGetLine.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FileModificationTime.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\FileStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Guards.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\IOStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\IOStreamGetLine.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\LocalProcessStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Logging.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MainHelper.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemBlockStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemLeakFinder.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemLeakFindOff.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\MemLeakFindOn.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\NamedLock.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\PartialReadStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\PathUtils.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ReadGatherStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\ReadLoggingStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\StreamableMemBlock.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\TemporaryDirectory.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Test.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Timer.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\UnixUser.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\Utils.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\common\WaitForEvent.h"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="backupclient"

-					>

-					<File

-						RelativePath="..\..\..\lib\backupclient\autogen_BackupProtocolClient.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\autogen_BackupStoreException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientCryptoKeys.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientFileAttributes.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientMakeExcludeList.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupClientRestore.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupDaemonConfigVerify.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreConstants.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreDirectory.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFile.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileCryptVar.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileEncodeStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFilename.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFilenameClear.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreFileWire.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\backupclient\BackupStoreObjectMagic.h"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="crypto"

-					>

-					<File

-						RelativePath="..\..\..\lib\crypto\autogen_CipherException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherAES.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherBlowfish.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherContext.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherDescription.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\CipherException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\MD5Digest.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\Random.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\crypto\RollingChecksum.h"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="win32"

-					>

-					<File

-						RelativePath="..\..\..\lib\win32\emu.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\win32\getopt.h"

-						>

-					</File>

-				</Filter>

-				<Filter

-					Name="server"

-					>

-					<File

-						RelativePath="..\..\..\lib\server\autogen_ConnectionException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\autogen_ServerException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Daemon.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Protocol.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolObject.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolUncertainStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ProtocolWire.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ServerException.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ServerStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\ServerTLS.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\Socket.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketListen.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketStream.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SocketStreamTLS.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\SSLLib.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\TLSContext.h"

-						>

-					</File>

-					<File

-						RelativePath="..\..\..\lib\server\WinNamedPipeStream.h"

-						>

-					</File>

-				</Filter>

-			</Filter>

-		</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/infrastructure/msvc/2005/win32test.vcproj b/infrastructure/msvc/2005/win32test.vcproj
deleted file mode 100644
index 0f97c302..00000000
--- a/infrastructure/msvc/2005/win32test.vcproj
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="win32test"

-	ProjectGUID="{28C29E72-76A2-4D0C-B35B-12D446733D2E}"

-	RootNamespace="win32test"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\Debug"

-			IntermediateDirectory="..\..\..\Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\bin\bbackupd&quot;;&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\common&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\inc32&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib Advapi32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcre.lib"

-				OutputFile="$(OutDir)/win32test.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/win32test.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\Release"

-			IntermediateDirectory="..\..\..\Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				EnableFiberSafeOptimizations="true"

-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\bin\bbackupd&quot;;&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\inc32&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;"

-				PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.lib"

-				OutputFile="$(OutDir)/win32test.exe"

-				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</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\win32\emu.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\test\win32\testlibwin32.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</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>

-		<File

-			RelativePath="..\..\..\ReadMe.txt"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/infrastructure/msvc/2010/bbackupctl.vcxproj b/infrastructure/msvc/2010/bbackupctl.vcxproj
deleted file mode 100644
index eb40d161..00000000
--- a/infrastructure/msvc/2010/bbackupctl.vcxproj
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{9FD51412-E945-4457-A17A-CA3C505CF431}</ProjectGuid>

-    <RootNamespace>bbackupctl</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)bbackupctl.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\..\openssl-$(Platform)\inc32;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\lib\common\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\Release\common.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)bbackupctl.exe</OutputFile>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\bin\bbackupctl\bbackupctl.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="common.vcxproj">

-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-    </ProjectReference>

-    <ProjectReference Include="libbackupclient.vcxproj">

-      <Project>{32604097-c934-4711-b1ad-206336640e70}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/bbackupd.vcxproj b/infrastructure/msvc/2010/bbackupd.vcxproj
deleted file mode 100644
index 47906a26..00000000
--- a/infrastructure/msvc/2010/bbackupd.vcxproj
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{22D325FB-9131-4BD6-B390-968F0491D687}</ProjectGuid>

-    <RootNamespace>bbackupd</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>ENABLE_VSS;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>VssApi.lib;$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)bbackupd.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\..\openssl-$(Platform)\inc32;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\lib\common\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\Release\common.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)bbackupd.exe</OutputFile>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\bin\bbackupd\autogen_ClientException.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupd\BackupClientContext.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupd\BackupClientDeleteList.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupd\BackupDaemon.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupd\bbackupd.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupd\Win32BackupService.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\bin\bbackupd\autogen_ClientException.h" />

-    <ClInclude Include="..\..\..\bin\bbackupd\BackupClientContext.h" />

-    <ClInclude Include="..\..\..\bin\bbackupd\BackupClientDeleteList.h" />

-    <ClInclude Include="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.h" />

-    <ClInclude Include="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.h" />

-    <ClInclude Include="..\..\..\bin\bbackupd\BackupDaemon.h" />

-    <ClInclude Include="..\..\..\bin\bbackupd\Win32BackupService.h" />

-    <ClInclude Include="..\..\..\bin\bbackupd\Win32ServiceFunctions.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="common.vcxproj">

-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-      <Private>true</Private>

-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>

-      <LinkLibraryDependencies>true</LinkLibraryDependencies>

-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>

-    </ProjectReference>

-    <ProjectReference Include="qdbm.vcxproj">

-      <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project>

-      <Private>true</Private>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>

-      <LinkLibraryDependencies>true</LinkLibraryDependencies>

-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/bbstoreaccounts.vcxproj b/infrastructure/msvc/2010/bbstoreaccounts.vcxproj
deleted file mode 100644
index f9f9d3e8..00000000
--- a/infrastructure/msvc/2010/bbstoreaccounts.vcxproj
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{C8A1509C-F91B-4140-BD51-B87FF24FB95F}</ProjectGuid>

-    <RootNamespace>bbstoreaccounts</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>MaxSpeed</Optimization>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\bin\bbstoreaccounts\bbstoreaccounts.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="common.vcxproj">

-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

-    </ProjectReference>

-    <ProjectReference Include="libbackupstore.vcxproj">

-      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/bbstored.vcxproj b/infrastructure/msvc/2010/bbstored.vcxproj
deleted file mode 100644
index 2d48f9a8..00000000
--- a/infrastructure/msvc/2010/bbstored.vcxproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{D8404314-73DD-4270-8205-BE677F8FDAC7}</ProjectGuid>

-    <RootNamespace>bbstored</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>MaxSpeed</Optimization>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ProjectReference Include="common.vcxproj">

-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

-    </ProjectReference>

-    <ProjectReference Include="libbackupstore.vcxproj">

-      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\bin\bbstored\BackupStoreDaemon.cpp" />

-    <ClCompile Include="..\..\..\bin\bbstored\bbstored.cpp" />

-    <ClCompile Include="..\..\..\bin\bbstored\BBStoreDHousekeeping.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\bin\bbstored\BackupStoreDaemon.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="..\..\..\bin\bbstored\bbstored-certs.in" />

-    <None Include="..\..\..\bin\bbstored\bbstored-config.in" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/boxbackup.sln b/infrastructure/msvc/2010/boxbackup.sln
deleted file mode 100644
index 384ff58c..00000000
--- a/infrastructure/msvc/2010/boxbackup.sln
+++ /dev/null
@@ -1,89 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual C++ Express 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupquery", "boxquery.vcxproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"

-	ProjectSection(ProjectDependencies) = postProject

-		{32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"

-	ProjectSection(ProjectDependencies) = postProject

-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} = {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcxproj", "{22D325FB-9131-4BD6-B390-968F0491D687}"

-	ProjectSection(ProjectDependencies) = postProject

-		{32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}

-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} = {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "win32test.vcxproj", "{28C29E72-76A2-4D0C-B35B-12D446733D2E}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vcxproj", "{9FD51412-E945-4457-A17A-CA3C505CF431}"

-	ProjectSection(ProjectDependencies) = postProject

-		{32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qdbm", "qdbm.vcxproj", "{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstored", "bbstored.vcxproj", "{D8404314-73DD-4270-8205-BE677F8FDAC7}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupstore", "libbackupstore.vcxproj", "{97D89AEF-2BE4-4E34-8703-03BA67BF4494}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstoreaccounts", "bbstoreaccounts.vcxproj", "{C8A1509C-F91B-4140-BD51-B87FF24FB95F}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupclient", "libbackupclient.vcxproj", "{32604097-C934-4711-B1AD-206336640E70}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.Build.0 = Debug|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.ActiveCfg = Release|Win32

-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.Build.0 = Release|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.Build.0 = Debug|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.ActiveCfg = Release|Win32

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.Build.0 = Release|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.ActiveCfg = Debug|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.Build.0 = Debug|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.ActiveCfg = Release|Win32

-		{22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.Build.0 = Release|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.Build.0 = Debug|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.ActiveCfg = Release|Win32

-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.Build.0 = Release|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.Build.0 = Debug|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.ActiveCfg = Release|Win32

-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.Build.0 = Release|Win32

-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Debug|Win32.Build.0 = Debug|Win32

-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Release|Win32.ActiveCfg = Release|Win32

-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Release|Win32.Build.0 = Release|Win32

-		{D8404314-73DD-4270-8205-BE677F8FDAC7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D8404314-73DD-4270-8205-BE677F8FDAC7}.Debug|Win32.Build.0 = Debug|Win32

-		{D8404314-73DD-4270-8205-BE677F8FDAC7}.Release|Win32.ActiveCfg = Release|Win32

-		{D8404314-73DD-4270-8205-BE677F8FDAC7}.Release|Win32.Build.0 = Release|Win32

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Debug|Win32.ActiveCfg = Debug|Win32

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Debug|Win32.Build.0 = Debug|Win32

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Release|Win32.ActiveCfg = Release|Win32

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Release|Win32.Build.0 = Release|Win32

-		{C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Debug|Win32.Build.0 = Debug|Win32

-		{C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Release|Win32.ActiveCfg = Release|Win32

-		{C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Release|Win32.Build.0 = Release|Win32

-		{32604097-C934-4711-B1AD-206336640E70}.Debug|Win32.ActiveCfg = Debug|Win32

-		{32604097-C934-4711-B1AD-206336640E70}.Debug|Win32.Build.0 = Debug|Win32

-		{32604097-C934-4711-B1AD-206336640E70}.Release|Win32.ActiveCfg = Release|Win32

-		{32604097-C934-4711-B1AD-206336640E70}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/infrastructure/msvc/2010/boxquery.vcxproj b/infrastructure/msvc/2010/boxquery.vcxproj
deleted file mode 100644
index 4893f98c..00000000
--- a/infrastructure/msvc/2010/boxquery.vcxproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}</ProjectGuid>

-    <RootNamespace>boxquery</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-    <ProjectName>bbackupquery</ProjectName>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\pcre-$(Platform)\include;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)boxquery.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\lib\common\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\Release\common.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)bbackupquery.exe</OutputFile>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>false</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\bin\bbackupquery\autogen_Documentation.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupquery\BackupQueries.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupquery\bbackupquery.cpp" />

-    <ClCompile Include="..\..\..\bin\bbackupquery\CommandCompletion.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\bin\bbackupquery\BackupQueries.h" />

-    <ClInclude Include="..\..\..\bin\bbackupquery\BoxBackupCompareParams.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="..\..\..\ReadMe.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="common.vcxproj">

-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-    </ProjectReference>

-    <ProjectReference Include="libbackupclient.vcxproj">

-      <Project>{32604097-c934-4711-b1ad-206336640e70}</Project>

-    </ProjectReference>

-    <ProjectReference Include="libbackupstore.vcxproj">

-      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/common.vcxproj b/infrastructure/msvc/2010/common.vcxproj
deleted file mode 100644
index ceefd548..00000000
--- a/infrastructure/msvc/2010/common.vcxproj
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{A089CEE6-EBF0-4232-A0C0-74850A8127A6}</ProjectGuid>

-    <RootNamespace>common</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <PreBuildEvent />

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\qdbm;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre-$(Platform)\include</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <TreatWarningAsError>false</TreatWarningAsError>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Lib />

-    <CustomBuildStep />

-    <CustomBuildStep />

-    <CustomBuildStep />

-    <Lib>

-      <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\ssleay32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>

-    </Lib>

-    <PreBuildEvent>

-      <Command>perl $(ProjectDir)..\getversion.pl</Command>

-    </PreBuildEvent>

-    <PreBuildEvent>

-      <Message>Determining Version Number</Message>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\common\;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\inc32;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre\pcre-$(Platform)\include-6.7\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Lib>

-      <OutputFile>$(OutDir)common.lib</OutputFile>

-    </Lib>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\lib\common\BufferedStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\BufferedWriteStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\FileModificationTime.cpp" />

-    <ClCompile Include="..\..\..\lib\common\GetLine.cpp" />

-    <ClCompile Include="..\..\..\lib\common\InvisibleTempFileStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\NamedLock.cpp" />

-    <ClCompile Include="..\..\..\lib\common\RateLimitingStream.cpp" />

-    <ClCompile Include="..\..\..\lib\compress\autogen_CompressException.cpp" />

-    <ClCompile Include="..\..\..\lib\compress\CompressStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\autogen_CommonException.cpp" />

-    <ClCompile Include="..\..\..\lib\common\autogen_ConversionException.cpp" />

-    <ClCompile Include="..\..\..\lib\common\BoxException.cpp" />

-    <ClCompile Include="..\..\..\lib\common\BoxTime.cpp" />

-    <ClCompile Include="..\..\..\lib\common\BoxTimeToText.cpp" />

-    <ClCompile Include="..\..\..\lib\common\CollectInBufferStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\Configuration.cpp" />

-    <ClCompile Include="..\..\..\lib\common\ConversionString.cpp" />

-    <ClCompile Include="..\..\..\lib\common\DebugAssertFailed.cpp" />

-    <ClCompile Include="..\..\..\lib\common\DebugMemLeakFinder.cpp" />

-    <ClCompile Include="..\..\..\lib\common\DebugPrintf.cpp" />

-    <ClCompile Include="..\..\..\lib\common\ExcludeList.cpp" />

-    <ClCompile Include="..\..\..\lib\common\FdGetLine.cpp" />

-    <ClCompile Include="..\..\..\lib\common\FileStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\IOStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\IOStreamGetLine.cpp" />

-    <ClCompile Include="..\..\..\lib\common\Logging.cpp" />

-    <ClCompile Include="..\..\..\lib\common\MemBlockStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\PartialReadStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\PathUtils.cpp" />

-    <ClCompile Include="..\..\..\lib\common\ReadGatherStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\ReadLoggingStream.cpp" />

-    <ClCompile Include="..\..\..\lib\common\StreamableMemBlock.cpp" />

-    <ClCompile Include="..\..\..\lib\common\Timer.cpp" />

-    <ClCompile Include="..\..\..\lib\common\UnixUser.cpp" />

-    <ClCompile Include="..\..\..\lib\common\Utils.cpp" />

-    <ClCompile Include="..\..\..\lib\common\WaitForEvent.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\autogen_CipherException.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\CipherAES.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\CipherBlowfish.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\CipherContext.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\CipherDescription.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\CryptoUtils.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\MD5Digest.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\Random.cpp" />

-    <ClCompile Include="..\..\..\lib\crypto\RollingChecksum.cpp" />

-    <ClCompile Include="..\..\..\lib\server\Message.cpp" />

-    <ClCompile Include="..\..\..\lib\server\TcpNice.cpp" />

-    <ClCompile Include="..\..\..\lib\win32\emu.cpp" />

-    <ClCompile Include="..\..\..\lib\win32\getopt_long.cpp" />

-    <ClCompile Include="..\..\..\lib\server\autogen_ConnectionException.cpp" />

-    <ClCompile Include="..\..\..\lib\server\autogen_ServerException.cpp" />

-    <ClCompile Include="..\..\..\lib\server\Daemon.cpp" />

-    <ClCompile Include="..\..\..\lib\server\LocalProcessStream.cpp" />

-    <ClCompile Include="..\..\..\lib\server\Protocol.cpp" />

-    <ClCompile Include="..\..\..\lib\server\ProtocolUncertainStream.cpp" />

-    <ClCompile Include="..\..\..\lib\server\Socket.cpp" />

-    <ClCompile Include="..\..\..\lib\server\SocketStream.cpp" />

-    <ClCompile Include="..\..\..\lib\server\SocketStreamTLS.cpp" />

-    <ClCompile Include="..\..\..\lib\server\SSLLib.cpp" />

-    <ClCompile Include="..\..\..\lib\server\TLSContext.cpp" />

-    <ClCompile Include="..\..\..\lib\server\WinNamedPipeStream.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\lib\common\BufferedStream.h" />

-    <ClInclude Include="..\..\..\lib\common\BufferedWriteStream.h" />

-    <ClInclude Include="..\..\..\lib\common\GetLine.h" />

-    <ClInclude Include="..\..\..\lib\common\InvisibleTempFileStream.h" />

-    <ClInclude Include="..\..\..\lib\common\RateLimitingStream.h" />

-    <ClInclude Include="..\..\..\lib\compress\autogen_CompressException.h" />

-    <ClInclude Include="..\..\..\lib\compress\Compress.h" />

-    <ClInclude Include="..\..\..\lib\compress\CompressException.h" />

-    <ClInclude Include="..\..\..\lib\compress\CompressStream.h" />

-    <ClInclude Include="..\..\..\lib\common\autogen_CommonException.h" />

-    <ClInclude Include="..\..\..\lib\common\autogen_ConversionException.h" />

-    <ClInclude Include="..\..\..\lib\common\BannerText.h" />

-    <ClInclude Include="..\..\..\lib\common\BeginStructPackForWire.h" />

-    <ClInclude Include="..\..\..\lib\common\Box.h" />

-    <ClInclude Include="..\..\..\lib\common\BoxConfig-MSVC.h" />

-    <ClInclude Include="..\..\..\lib\common\BoxException.h" />

-    <ClInclude Include="..\..\..\lib\common\BoxPlatform.h" />

-    <ClInclude Include="..\..\..\lib\common\BoxPortsAndFiles.h" />

-    <ClInclude Include="..\..\..\lib\common\BoxTime.h" />

-    <ClInclude Include="..\..\..\lib\common\BoxTimeToText.h" />

-    <ClInclude Include="..\..\..\lib\common\BoxTimeToUnix.h" />

-    <ClInclude Include="..\..\..\lib\common\BoxVersion.h" />

-    <ClInclude Include="..\..\..\lib\common\CollectInBufferStream.h" />

-    <ClInclude Include="..\..\..\lib\common\CommonException.h" />

-    <ClInclude Include="..\..\..\lib\common\Configuration.h" />

-    <ClInclude Include="..\..\..\lib\common\Conversion.h" />

-    <ClInclude Include="..\..\..\lib\common\EndStructPackForWire.h" />

-    <ClInclude Include="..\..\..\lib\common\ExcludeList.h" />

-    <ClInclude Include="..\..\..\lib\common\FdGetLine.h" />

-    <ClInclude Include="..\..\..\lib\common\FileModificationTime.h" />

-    <ClInclude Include="..\..\..\lib\common\FileStream.h" />

-    <ClInclude Include="..\..\..\lib\common\Guards.h" />

-    <ClInclude Include="..\..\..\lib\common\IOStream.h" />

-    <ClInclude Include="..\..\..\lib\common\IOStreamGetLine.h" />

-    <ClInclude Include="..\..\..\lib\crypto\CryptoUtils.h" />

-    <ClInclude Include="..\..\..\lib\server\LocalProcessStream.h" />

-    <ClInclude Include="..\..\..\lib\common\Logging.h" />

-    <ClInclude Include="..\..\..\lib\common\MainHelper.h" />

-    <ClInclude Include="..\..\..\lib\common\MemBlockStream.h" />

-    <ClInclude Include="..\..\..\lib\common\MemLeakFinder.h" />

-    <ClInclude Include="..\..\..\lib\common\MemLeakFindOff.h" />

-    <ClInclude Include="..\..\..\lib\common\MemLeakFindOn.h" />

-    <ClInclude Include="..\..\..\lib\common\NamedLock.h" />

-    <ClInclude Include="..\..\..\lib\common\PartialReadStream.h" />

-    <ClInclude Include="..\..\..\lib\common\PathUtils.h" />

-    <ClInclude Include="..\..\..\lib\common\ReadGatherStream.h" />

-    <ClInclude Include="..\..\..\lib\common\ReadLoggingStream.h" />

-    <ClInclude Include="..\..\..\lib\common\StreamableMemBlock.h" />

-    <ClInclude Include="..\..\..\lib\common\TemporaryDirectory.h" />

-    <ClInclude Include="..\..\..\lib\common\Test.h" />

-    <ClInclude Include="..\..\..\lib\common\Timer.h" />

-    <ClInclude Include="..\..\..\lib\common\UnixUser.h" />

-    <ClInclude Include="..\..\..\lib\common\Utils.h" />

-    <ClInclude Include="..\..\..\lib\common\WaitForEvent.h" />

-    <ClInclude Include="..\..\..\lib\crypto\autogen_CipherException.h" />

-    <ClInclude Include="..\..\..\lib\crypto\CipherAES.h" />

-    <ClInclude Include="..\..\..\lib\crypto\CipherBlowfish.h" />

-    <ClInclude Include="..\..\..\lib\crypto\CipherContext.h" />

-    <ClInclude Include="..\..\..\lib\crypto\CipherDescription.h" />

-    <ClInclude Include="..\..\..\lib\crypto\CipherException.h" />

-    <ClInclude Include="..\..\..\lib\crypto\MD5Digest.h" />

-    <ClInclude Include="..\..\..\lib\crypto\Random.h" />

-    <ClInclude Include="..\..\..\lib\crypto\RollingChecksum.h" />

-    <ClInclude Include="..\..\..\lib\server\Message.h" />

-    <ClInclude Include="..\..\..\lib\server\TcpNice.h" />

-    <ClInclude Include="..\..\..\lib\win32\emu.h" />

-    <ClInclude Include="..\..\..\lib\win32\getopt.h" />

-    <ClInclude Include="..\..\..\lib\server\autogen_ConnectionException.h" />

-    <ClInclude Include="..\..\..\lib\server\autogen_ServerException.h" />

-    <ClInclude Include="..\..\..\lib\server\Daemon.h" />

-    <ClInclude Include="..\..\..\lib\server\Protocol.h" />

-    <ClInclude Include="..\..\..\lib\server\ProtocolUncertainStream.h" />

-    <ClInclude Include="..\..\..\lib\server\ProtocolWire.h" />

-    <ClInclude Include="..\..\..\lib\server\ServerException.h" />

-    <ClInclude Include="..\..\..\lib\server\ServerStream.h" />

-    <ClInclude Include="..\..\..\lib\server\ServerTLS.h" />

-    <ClInclude Include="..\..\..\lib\server\Socket.h" />

-    <ClInclude Include="..\..\..\lib\server\SocketListen.h" />

-    <ClInclude Include="..\..\..\lib\server\SocketStream.h" />

-    <ClInclude Include="..\..\..\lib\server\SocketStreamTLS.h" />

-    <ClInclude Include="..\..\..\lib\server\SSLLib.h" />

-    <ClInclude Include="..\..\..\lib\server\TLSContext.h" />

-    <ClInclude Include="..\..\..\lib\server\WinNamedPipeStream.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="qdbm.vcxproj">

-      <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/libbackupclient.vcxproj b/infrastructure/msvc/2010/libbackupclient.vcxproj
deleted file mode 100644
index b546f8d4..00000000
--- a/infrastructure/msvc/2010/libbackupclient.vcxproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\lib\backupclient\BackupClientCryptoKeys.cpp" />

-    <ClCompile Include="..\..\..\lib\backupclient\BackupClientMakeExcludeList.cpp" />

-    <ClCompile Include="..\..\..\lib\backupclient\BackupClientRestore.cpp" />

-    <ClCompile Include="..\..\..\lib\backupclient\BackupDaemonConfigVerify.cpp" />

-    <ClCompile Include="..\..\..\lib\backupclient\BackupStoreObjectDump.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\lib\backupclient\BackupClientCryptoKeys.h" />

-    <ClInclude Include="..\..\..\lib\backupclient\BackupClientMakeExcludeList.h" />

-    <ClInclude Include="..\..\..\lib\backupclient\BackupClientRestore.h" />

-    <ClInclude Include="..\..\..\lib\backupclient\BackupDaemonConfigVerify.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="libbackupstore.vcxproj">

-      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{32604097-C934-4711-B1AD-206336640E70}</ProjectGuid>

-    <RootNamespace>libbackupstore</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <TargetExt>.lib</TargetExt>

-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;%(AdditionalDependencies)</AdditionalDependencies>

-    </Link>

-    <Lib />

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>MaxSpeed</Optimization>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/libbackupstore.vcxproj b/infrastructure/msvc/2010/libbackupstore.vcxproj
deleted file mode 100644
index 6fe04cd1..00000000
--- a/infrastructure/msvc/2010/libbackupstore.vcxproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{97D89AEF-2BE4-4E34-8703-03BA67BF4494}</ProjectGuid>

-    <RootNamespace>libbackupstore</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <TargetExt>.lib</TargetExt>

-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;%(AdditionalDependencies)</AdditionalDependencies>

-    </Link>

-    <Lib />

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>MaxSpeed</Optimization>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\lib\backupstore\autogen_BackupProtocol.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\autogen_BackupStoreException.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupClientFileAttributes.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupCommands.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreAccountDatabase.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreAccounts.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheck.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheck2.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheckData.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreConfigVerify.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreContext.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreDirectory.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFile.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCmbDiff.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCmbIdx.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCombine.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCryptVar.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileDiff.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileEncodeStream.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFilename.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFilenameClear.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileRevDiff.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreInfo.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreRefCountDatabase.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\HousekeepStoreAccount.cpp" />

-    <ClCompile Include="..\..\..\lib\backupstore\StoreStructure.cpp" />

-    <ClCompile Include="..\..\..\lib\raidfile\autogen_RaidFileException.cpp" />

-    <ClCompile Include="..\..\..\lib\raidfile\RaidFileController.cpp" />

-    <ClCompile Include="..\..\..\lib\raidfile\RaidFileRead.cpp" />

-    <ClCompile Include="..\..\..\lib\raidfile\RaidFileUtil.cpp" />

-    <ClCompile Include="..\..\..\lib\raidfile\RaidFileWrite.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\lib\backupstore\autogen_BackupProtocol.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\autogen_BackupStoreException.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupClientFileAttributes.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupConstants.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreAccountDatabase.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreAccounts.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreCheck.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreConfigVerify.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreConstants.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreContext.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreDirectory.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreException.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFile.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileCryptVar.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileEncodeStream.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFilename.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFilenameClear.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileWire.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreInfo.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreObjectMagic.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreRefCountDatabase.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\HousekeepStoreAccount.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\RunStatusProvider.h" />

-    <ClInclude Include="..\..\..\lib\backupstore\StoreStructure.h" />

-    <ClInclude Include="..\..\..\lib\raidfile\autogen_RaidFileException.h" />

-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileController.h" />

-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileException.h" />

-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileRead.h" />

-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileUtil.h" />

-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileWrite.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="..\..\..\lib\backupstore\backupprotocol.txt" />

-    <None Include="..\..\..\lib\backupstore\BackupStoreException.txt" />

-    <None Include="..\..\..\lib\backupstore\Makefile.extra" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="common.vcxproj">

-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/qdbm.vcxproj b/infrastructure/msvc/2010/qdbm.vcxproj
deleted file mode 100644
index 77bf8205..00000000
--- a/infrastructure/msvc/2010/qdbm.vcxproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}</ProjectGuid>

-    <RootNamespace>qdbm</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <TargetExt>.lib</TargetExt>

-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>Disabled</Optimization>

-      <CompileAsManaged>false</CompileAsManaged>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PreprocessorDefinitions>QDBM_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-    <Lib />

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>MaxSpeed</Optimization>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\qdbm\depot.h" />

-    <ClInclude Include="..\..\..\qdbm\myconf.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\qdbm\depot.c" />

-    <ClCompile Include="..\..\..\qdbm\myconf.c" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2010/win32test.vcxproj b/infrastructure/msvc/2010/win32test.vcxproj
deleted file mode 100644
index ed8b0597..00000000
--- a/infrastructure/msvc/2010/win32test.vcxproj
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{28C29E72-76A2-4D0C-B35B-12D446733D2E}</ProjectGuid>

-    <RootNamespace>win32test</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)win32test.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-      <ShowProgress>NotSet</ShowProgress>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common\;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\inc32;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\Release\common.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)win32test.exe</OutputFile>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\lib\win32\emu.cpp" />

-    <ClCompile Include="..\..\..\test\win32\testlibwin32.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="..\..\..\ReadMe.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="common.vcxproj">

-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/bbackupctl.vcxproj b/infrastructure/msvc/2013/bbackupctl.vcxproj
deleted file mode 100644
index 5f021c26..00000000
--- a/infrastructure/msvc/2013/bbackupctl.vcxproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9FD51412-E945-4457-A17A-CA3C505CF431}</ProjectGuid>
-    <RootNamespace>bbackupctl</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalDependencies>$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)bbackupctl.exe</OutputFile>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\bin\bbackupctl\bbackupctl.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="common.vcxproj">
-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="libbackupclient.vcxproj">
-      <Project>{32604097-c934-4711-b1ad-206336640e70}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/bbackupd.vcxproj b/infrastructure/msvc/2013/bbackupd.vcxproj
deleted file mode 100644
index 791e4813..00000000
--- a/infrastructure/msvc/2013/bbackupd.vcxproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{22D325FB-9131-4BD6-B390-968F0491D687}</ProjectGuid>
-    <RootNamespace>bbackupd</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ENABLE_VSS;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)bbackupd.exe</OutputFile>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\bin\bbackupd\BackupClientContext.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupd\BackupClientDeleteList.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupd\BackupDaemon.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupd\bbackupd.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupd\Win32BackupService.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="common.vcxproj">
-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <ProjectReference Include="qdbm.vcxproj">
-      <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\bin\bbackupd\BackupClientContext.h" />
-    <ClInclude Include="..\..\..\bin\bbackupd\BackupClientDeleteList.h" />
-    <ClInclude Include="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.h" />
-    <ClInclude Include="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.h" />
-    <ClInclude Include="..\..\..\bin\bbackupd\BackupDaemon.h" />
-    <ClInclude Include="..\..\..\bin\bbackupd\BackupDaemonInterface.h" />
-    <ClInclude Include="..\..\..\bin\bbackupd\Win32BackupService.h" />
-    <ClInclude Include="..\..\..\bin\bbackupd\Win32ServiceFunctions.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/bbstoreaccounts.vcxproj b/infrastructure/msvc/2013/bbstoreaccounts.vcxproj
deleted file mode 100644
index d5a37d63..00000000
--- a/infrastructure/msvc/2013/bbstoreaccounts.vcxproj
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C8A1509C-F91B-4140-BD51-B87FF24FB95F}</ProjectGuid>
-    <RootNamespace>bbstoreaccounts</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\bin\bbstoreaccounts\bbstoreaccounts.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="common.vcxproj">
-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbackupstore.vcxproj">
-      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/bbstored.vcxproj b/infrastructure/msvc/2013/bbstored.vcxproj
deleted file mode 100644
index f703ab94..00000000
--- a/infrastructure/msvc/2013/bbstored.vcxproj
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D8404314-73DD-4270-8205-BE677F8FDAC7}</ProjectGuid>
-    <RootNamespace>bbstored</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4521;4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;BOX_RELEASE_BUILD;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <DisableSpecificWarnings>4521;4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(OutDir)\libbackupstore.lib;$(OutDir)\qdbm.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="common.vcxproj">
-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbackupstore.vcxproj">
-      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\bin\bbstored\BackupStoreDaemon.cpp" />
-    <ClCompile Include="..\..\..\bin\bbstored\bbstored.cpp" />
-    <ClCompile Include="..\..\..\bin\bbstored\BBStoreDHousekeeping.cpp" />
-    <ClCompile Include="..\..\..\qdbm\depot.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\bin\bbstored\bbstored-certs.in" />
-    <None Include="..\..\..\bin\bbstored\bbstored-config.in" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\bin\bbstored\BackupStoreDaemon.h" />
-    <ClInclude Include="..\..\..\qdbm\depot.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/boxbackup.sln b/infrastructure/msvc/2013/boxbackup.sln
deleted file mode 100644
index dbd14aae..00000000
--- a/infrastructure/msvc/2013/boxbackup.sln
+++ /dev/null
@@ -1,89 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupquery", "boxquery.vcxproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}
-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} = {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcxproj", "{22D325FB-9131-4BD6-B390-968F0491D687}"
-	ProjectSection(ProjectDependencies) = postProject
-		{32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}
-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} = {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}
-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "win32test.vcxproj", "{28C29E72-76A2-4D0C-B35B-12D446733D2E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vcxproj", "{9FD51412-E945-4457-A17A-CA3C505CF431}"
-	ProjectSection(ProjectDependencies) = postProject
-		{32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}
-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qdbm", "qdbm.vcxproj", "{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstored", "bbstored.vcxproj", "{D8404314-73DD-4270-8205-BE677F8FDAC7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupstore", "libbackupstore.vcxproj", "{97D89AEF-2BE4-4E34-8703-03BA67BF4494}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstoreaccounts", "bbstoreaccounts.vcxproj", "{C8A1509C-F91B-4140-BD51-B87FF24FB95F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupclient", "libbackupclient.vcxproj", "{32604097-C934-4711-B1AD-206336640E70}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.Build.0 = Debug|Win32
-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.ActiveCfg = Release|Win32
-		{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.Build.0 = Release|Win32
-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.Build.0 = Debug|Win32
-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.ActiveCfg = Release|Win32
-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.Build.0 = Release|Win32
-		{22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.ActiveCfg = Debug|Win32
-		{22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.Build.0 = Debug|Win32
-		{22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.ActiveCfg = Release|Win32
-		{22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.Build.0 = Release|Win32
-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.Build.0 = Debug|Win32
-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.ActiveCfg = Release|Win32
-		{28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.Build.0 = Release|Win32
-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.Build.0 = Debug|Win32
-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.ActiveCfg = Release|Win32
-		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.Build.0 = Release|Win32
-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Debug|Win32.Build.0 = Debug|Win32
-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Release|Win32.ActiveCfg = Release|Win32
-		{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Release|Win32.Build.0 = Release|Win32
-		{D8404314-73DD-4270-8205-BE677F8FDAC7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D8404314-73DD-4270-8205-BE677F8FDAC7}.Debug|Win32.Build.0 = Debug|Win32
-		{D8404314-73DD-4270-8205-BE677F8FDAC7}.Release|Win32.ActiveCfg = Release|Win32
-		{D8404314-73DD-4270-8205-BE677F8FDAC7}.Release|Win32.Build.0 = Release|Win32
-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Debug|Win32.ActiveCfg = Debug|Win32
-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Debug|Win32.Build.0 = Debug|Win32
-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Release|Win32.ActiveCfg = Release|Win32
-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Release|Win32.Build.0 = Release|Win32
-		{C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Debug|Win32.Build.0 = Debug|Win32
-		{C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Release|Win32.ActiveCfg = Release|Win32
-		{C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Release|Win32.Build.0 = Release|Win32
-		{32604097-C934-4711-B1AD-206336640E70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{32604097-C934-4711-B1AD-206336640E70}.Debug|Win32.Build.0 = Debug|Win32
-		{32604097-C934-4711-B1AD-206336640E70}.Release|Win32.ActiveCfg = Release|Win32
-		{32604097-C934-4711-B1AD-206336640E70}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/infrastructure/msvc/2013/boxquery.vcxproj b/infrastructure/msvc/2013/boxquery.vcxproj
deleted file mode 100644
index fd871d3b..00000000
--- a/infrastructure/msvc/2013/boxquery.vcxproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}</ProjectGuid>
-    <RootNamespace>boxquery</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectName>bbackupquery</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\pcre;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\pcre;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)bbackupquery.exe</OutputFile>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\bin\bbackupquery\autogen_Documentation.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupquery\BackupQueries.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupquery\bbackupquery.cpp" />
-    <ClCompile Include="..\..\..\bin\bbackupquery\CommandCompletion.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\bin\bbackupquery\BackupQueries.h" />
-    <ClInclude Include="..\..\..\bin\bbackupquery\BoxBackupCompareParams.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="common.vcxproj">
-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="libbackupclient.vcxproj">
-      <Project>{32604097-c934-4711-b1ad-206336640e70}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbackupstore.vcxproj">
-      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/common.vcxproj b/infrastructure/msvc/2013/common.vcxproj
deleted file mode 100644
index 50c93384..00000000
--- a/infrastructure/msvc/2013/common.vcxproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A089CEE6-EBF0-4232-A0C0-74850A8127A6}</ProjectGuid>
-    <RootNamespace>common</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent />
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre;$(ProjectDir)..\..\..\qdbm</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib />
-    <CustomBuildStep />
-    <CustomBuildStep />
-    <CustomBuildStep />
-    <Lib>
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\pcre\build\vc2013\Debug\pcre.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2013\Debug\pcreposix.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\..\zlib\projects\visualc10\LIB Debug\zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-    <PreBuildEvent>
-      <Command>perl $(ProjectDir)..\getversion.pl</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Determining Version Number</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\common\;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre;$(ProjectDir)..\..\..\qdbm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\pcre\build\vc2013\Release\pcre.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2013\Release\pcreposix.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\..\zlib\projects\visualc10\\LIB Release\zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-    <PreBuildEvent>
-      <Command>perl $(ProjectDir)..\getversion.pl</Command>
-      <Message>Determining Version Number</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\lib\common\BufferedStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\BufferedWriteStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\FileModificationTime.cpp" />
-    <ClCompile Include="..\..\..\lib\common\GetLine.cpp" />
-    <ClCompile Include="..\..\..\lib\common\InvisibleTempFileStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\NamedLock.cpp" />
-    <ClCompile Include="..\..\..\lib\common\RateLimitingStream.cpp" />
-    <ClCompile Include="..\..\..\lib\compress\autogen_CompressException.cpp" />
-    <ClCompile Include="..\..\..\lib\compress\CompressStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\autogen_CommonException.cpp" />
-    <ClCompile Include="..\..\..\lib\common\autogen_ConversionException.cpp" />
-    <ClCompile Include="..\..\..\lib\common\BoxException.cpp" />
-    <ClCompile Include="..\..\..\lib\common\BoxTime.cpp" />
-    <ClCompile Include="..\..\..\lib\common\BoxTimeToText.cpp" />
-    <ClCompile Include="..\..\..\lib\common\CollectInBufferStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\Configuration.cpp" />
-    <ClCompile Include="..\..\..\lib\common\ConversionString.cpp" />
-    <ClCompile Include="..\..\..\lib\common\DebugAssertFailed.cpp" />
-    <ClCompile Include="..\..\..\lib\common\DebugMemLeakFinder.cpp" />
-    <ClCompile Include="..\..\..\lib\common\DebugPrintf.cpp" />
-    <ClCompile Include="..\..\..\lib\common\ExcludeList.cpp" />
-    <ClCompile Include="..\..\..\lib\common\FdGetLine.cpp" />
-    <ClCompile Include="..\..\..\lib\common\FileStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\IOStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\IOStreamGetLine.cpp" />
-    <ClCompile Include="..\..\..\lib\common\Logging.cpp" />
-    <ClCompile Include="..\..\..\lib\common\MemBlockStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\PartialReadStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\PathUtils.cpp" />
-    <ClCompile Include="..\..\..\lib\common\ReadGatherStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\ReadLoggingStream.cpp" />
-    <ClCompile Include="..\..\..\lib\common\StreamableMemBlock.cpp" />
-    <ClCompile Include="..\..\..\lib\common\Timer.cpp" />
-    <ClCompile Include="..\..\..\lib\common\UnixUser.cpp" />
-    <ClCompile Include="..\..\..\lib\common\Utils.cpp" />
-    <ClCompile Include="..\..\..\lib\common\WaitForEvent.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\autogen_CipherException.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\CipherAES.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\CipherBlowfish.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\CipherContext.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\CipherDescription.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\CryptoUtils.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\MD5Digest.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\Random.cpp" />
-    <ClCompile Include="..\..\..\lib\crypto\RollingChecksum.cpp" />
-    <ClCompile Include="..\..\..\lib\server\Message.cpp" />
-    <ClCompile Include="..\..\..\lib\server\TcpNice.cpp" />
-    <ClCompile Include="..\..\..\lib\win32\emu.cpp" />
-    <ClCompile Include="..\..\..\lib\win32\getopt_long.cpp" />
-    <ClCompile Include="..\..\..\lib\server\autogen_ConnectionException.cpp" />
-    <ClCompile Include="..\..\..\lib\server\autogen_ServerException.cpp" />
-    <ClCompile Include="..\..\..\lib\server\Daemon.cpp" />
-    <ClCompile Include="..\..\..\lib\server\LocalProcessStream.cpp" />
-    <ClCompile Include="..\..\..\lib\server\Protocol.cpp" />
-    <ClCompile Include="..\..\..\lib\server\ProtocolUncertainStream.cpp" />
-    <ClCompile Include="..\..\..\lib\server\Socket.cpp" />
-    <ClCompile Include="..\..\..\lib\server\SocketStream.cpp" />
-    <ClCompile Include="..\..\..\lib\server\SocketStreamTLS.cpp" />
-    <ClCompile Include="..\..\..\lib\server\SSLLib.cpp" />
-    <ClCompile Include="..\..\..\lib\server\TLSContext.cpp" />
-    <ClCompile Include="..\..\..\lib\server\WinNamedPipeStream.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\lib\common\BufferedStream.h" />
-    <ClInclude Include="..\..\..\lib\common\BufferedWriteStream.h" />
-    <ClInclude Include="..\..\..\lib\common\GetLine.h" />
-    <ClInclude Include="..\..\..\lib\common\InvisibleTempFileStream.h" />
-    <ClInclude Include="..\..\..\lib\common\RateLimitingStream.h" />
-    <ClInclude Include="..\..\..\lib\compress\autogen_CompressException.h" />
-    <ClInclude Include="..\..\..\lib\compress\Compress.h" />
-    <ClInclude Include="..\..\..\lib\compress\CompressException.h" />
-    <ClInclude Include="..\..\..\lib\compress\CompressStream.h" />
-    <ClInclude Include="..\..\..\lib\common\autogen_CommonException.h" />
-    <ClInclude Include="..\..\..\lib\common\autogen_ConversionException.h" />
-    <ClInclude Include="..\..\..\lib\common\BannerText.h" />
-    <ClInclude Include="..\..\..\lib\common\BeginStructPackForWire.h" />
-    <ClInclude Include="..\..\..\lib\common\Box.h" />
-    <ClInclude Include="..\..\..\lib\common\BoxConfig-MSVC.h" />
-    <ClInclude Include="..\..\..\lib\common\BoxException.h" />
-    <ClInclude Include="..\..\..\lib\common\BoxPlatform.h" />
-    <ClInclude Include="..\..\..\lib\common\BoxPortsAndFiles.h" />
-    <ClInclude Include="..\..\..\lib\common\BoxTime.h" />
-    <ClInclude Include="..\..\..\lib\common\BoxTimeToText.h" />
-    <ClInclude Include="..\..\..\lib\common\BoxTimeToUnix.h" />
-    <ClInclude Include="..\..\..\lib\common\BoxVersion.h" />
-    <ClInclude Include="..\..\..\lib\common\CollectInBufferStream.h" />
-    <ClInclude Include="..\..\..\lib\common\CommonException.h" />
-    <ClInclude Include="..\..\..\lib\common\Configuration.h" />
-    <ClInclude Include="..\..\..\lib\common\Conversion.h" />
-    <ClInclude Include="..\..\..\lib\common\EndStructPackForWire.h" />
-    <ClInclude Include="..\..\..\lib\common\ExcludeList.h" />
-    <ClInclude Include="..\..\..\lib\common\FdGetLine.h" />
-    <ClInclude Include="..\..\..\lib\common\FileModificationTime.h" />
-    <ClInclude Include="..\..\..\lib\common\FileStream.h" />
-    <ClInclude Include="..\..\..\lib\common\Guards.h" />
-    <ClInclude Include="..\..\..\lib\common\IOStream.h" />
-    <ClInclude Include="..\..\..\lib\common\IOStreamGetLine.h" />
-    <ClInclude Include="..\..\..\lib\crypto\CryptoUtils.h" />
-    <ClInclude Include="..\..\..\lib\server\LocalProcessStream.h" />
-    <ClInclude Include="..\..\..\lib\common\Logging.h" />
-    <ClInclude Include="..\..\..\lib\common\MainHelper.h" />
-    <ClInclude Include="..\..\..\lib\common\MemBlockStream.h" />
-    <ClInclude Include="..\..\..\lib\common\MemLeakFinder.h" />
-    <ClInclude Include="..\..\..\lib\common\MemLeakFindOff.h" />
-    <ClInclude Include="..\..\..\lib\common\MemLeakFindOn.h" />
-    <ClInclude Include="..\..\..\lib\common\NamedLock.h" />
-    <ClInclude Include="..\..\..\lib\common\PartialReadStream.h" />
-    <ClInclude Include="..\..\..\lib\common\PathUtils.h" />
-    <ClInclude Include="..\..\..\lib\common\ReadGatherStream.h" />
-    <ClInclude Include="..\..\..\lib\common\ReadLoggingStream.h" />
-    <ClInclude Include="..\..\..\lib\common\StreamableMemBlock.h" />
-    <ClInclude Include="..\..\..\lib\common\TemporaryDirectory.h" />
-    <ClInclude Include="..\..\..\lib\common\Test.h" />
-    <ClInclude Include="..\..\..\lib\common\Timer.h" />
-    <ClInclude Include="..\..\..\lib\common\UnixUser.h" />
-    <ClInclude Include="..\..\..\lib\common\Utils.h" />
-    <ClInclude Include="..\..\..\lib\common\WaitForEvent.h" />
-    <ClInclude Include="..\..\..\lib\crypto\autogen_CipherException.h" />
-    <ClInclude Include="..\..\..\lib\crypto\CipherAES.h" />
-    <ClInclude Include="..\..\..\lib\crypto\CipherBlowfish.h" />
-    <ClInclude Include="..\..\..\lib\crypto\CipherContext.h" />
-    <ClInclude Include="..\..\..\lib\crypto\CipherDescription.h" />
-    <ClInclude Include="..\..\..\lib\crypto\CipherException.h" />
-    <ClInclude Include="..\..\..\lib\crypto\MD5Digest.h" />
-    <ClInclude Include="..\..\..\lib\crypto\Random.h" />
-    <ClInclude Include="..\..\..\lib\crypto\RollingChecksum.h" />
-    <ClInclude Include="..\..\..\lib\server\Message.h" />
-    <ClInclude Include="..\..\..\lib\server\TcpNice.h" />
-    <ClInclude Include="..\..\..\lib\win32\emu.h" />
-    <ClInclude Include="..\..\..\lib\win32\getopt.h" />
-    <ClInclude Include="..\..\..\lib\server\autogen_ConnectionException.h" />
-    <ClInclude Include="..\..\..\lib\server\autogen_ServerException.h" />
-    <ClInclude Include="..\..\..\lib\server\Daemon.h" />
-    <ClInclude Include="..\..\..\lib\server\Protocol.h" />
-    <ClInclude Include="..\..\..\lib\server\ProtocolUncertainStream.h" />
-    <ClInclude Include="..\..\..\lib\server\ProtocolWire.h" />
-    <ClInclude Include="..\..\..\lib\server\ServerException.h" />
-    <ClInclude Include="..\..\..\lib\server\ServerStream.h" />
-    <ClInclude Include="..\..\..\lib\server\ServerTLS.h" />
-    <ClInclude Include="..\..\..\lib\server\Socket.h" />
-    <ClInclude Include="..\..\..\lib\server\SocketListen.h" />
-    <ClInclude Include="..\..\..\lib\server\SocketStream.h" />
-    <ClInclude Include="..\..\..\lib\server\SocketStreamTLS.h" />
-    <ClInclude Include="..\..\..\lib\server\SSLLib.h" />
-    <ClInclude Include="..\..\..\lib\server\TLSContext.h" />
-    <ClInclude Include="..\..\..\lib\server\WinNamedPipeStream.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="qdbm.vcxproj">
-      <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/libbackupclient.vcxproj b/infrastructure/msvc/2013/libbackupclient.vcxproj
deleted file mode 100644
index e52e3dd5..00000000
--- a/infrastructure/msvc/2013/libbackupclient.vcxproj
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\lib\backupclient\autogen_ClientException.cpp" />
-    <ClCompile Include="..\..\..\lib\backupclient\BackupClientCryptoKeys.cpp" />
-    <ClCompile Include="..\..\..\lib\backupclient\BackupClientMakeExcludeList.cpp" />
-    <ClCompile Include="..\..\..\lib\backupclient\BackupClientRestore.cpp" />
-    <ClCompile Include="..\..\..\lib\backupclient\BackupDaemonConfigVerify.cpp" />
-    <ClCompile Include="..\..\..\lib\backupclient\BackupStoreObjectDump.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\lib\backupclient\autogen_ClientException.h" />
-    <ClInclude Include="..\..\..\lib\backupclient\BackupClientCryptoKeys.h" />
-    <ClInclude Include="..\..\..\lib\backupclient\BackupClientMakeExcludeList.h" />
-    <ClInclude Include="..\..\..\lib\backupclient\BackupClientRestore.h" />
-    <ClInclude Include="..\..\..\lib\backupclient\BackupDaemonConfigVerify.h" />
-    <ClInclude Include="..\..\..\lib\backupclient\BackupDaemonInterface.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libbackupstore.vcxproj">
-      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{32604097-C934-4711-B1AD-206336640E70}</ProjectGuid>
-    <RootNamespace>libbackupstore</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetExt>.lib</TargetExt>
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/libbackupstore.vcxproj b/infrastructure/msvc/2013/libbackupstore.vcxproj
deleted file mode 100644
index 6bf54572..00000000
--- a/infrastructure/msvc/2013/libbackupstore.vcxproj
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{97D89AEF-2BE4-4E34-8703-03BA67BF4494}</ProjectGuid>
-    <RootNamespace>libbackupstore</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetExt>.lib</TargetExt>
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\lib\backupstore\autogen_BackupProtocol.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\autogen_BackupStoreException.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupAccountControl.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupClientFileAttributes.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupCommands.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreAccountDatabase.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreAccounts.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheck.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheck2.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheckData.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreConfigVerify.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreContext.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreDirectory.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFile.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCmbDiff.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCmbIdx.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCombine.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCryptVar.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileDiff.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileEncodeStream.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFilename.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFilenameClear.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileRevDiff.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreInfo.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\BackupStoreRefCountDatabase.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\HousekeepStoreAccount.cpp" />
-    <ClCompile Include="..\..\..\lib\backupstore\StoreStructure.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\autogen_HTTPException.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\cdecode.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\cencode.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\HTTPQueryDecoder.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\HTTPRequest.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\HTTPResponse.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\HTTPServer.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\S3Client.cpp" />
-    <ClCompile Include="..\..\..\lib\httpserver\S3Simulator.cpp" />
-    <ClCompile Include="..\..\..\lib\raidfile\autogen_RaidFileException.cpp" />
-    <ClCompile Include="..\..\..\lib\raidfile\RaidFileController.cpp" />
-    <ClCompile Include="..\..\..\lib\raidfile\RaidFileRead.cpp" />
-    <ClCompile Include="..\..\..\lib\raidfile\RaidFileUtil.cpp" />
-    <ClCompile Include="..\..\..\lib\raidfile\RaidFileWrite.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\lib\backupstore\autogen_BackupProtocol.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\autogen_BackupStoreException.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupAccountControl.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupClientFileAttributes.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupConstants.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreAccountDatabase.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreAccounts.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreCheck.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreConfigVerify.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreConstants.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreContext.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreDirectory.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreException.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFile.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileCryptVar.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileEncodeStream.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFilename.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFilenameClear.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileWire.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreInfo.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreObjectMagic.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\BackupStoreRefCountDatabase.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\HousekeepStoreAccount.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\RunStatusProvider.h" />
-    <ClInclude Include="..\..\..\lib\backupstore\StoreStructure.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\autogen_HTTPException.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\cdecode.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\cencode.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\decode.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\encode.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\HTTPQueryDecoder.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\HTTPRequest.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\HTTPResponse.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\HTTPServer.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\S3Client.h" />
-    <ClInclude Include="..\..\..\lib\httpserver\S3Simulator.h" />
-    <ClInclude Include="..\..\..\lib\raidfile\autogen_RaidFileException.h" />
-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileController.h" />
-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileException.h" />
-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileRead.h" />
-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileUtil.h" />
-    <ClInclude Include="..\..\..\lib\raidfile\RaidFileWrite.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\lib\backupstore\backupprotocol.txt" />
-    <None Include="..\..\..\lib\backupstore\BackupStoreException.txt" />
-    <None Include="..\..\..\lib\backupstore\Makefile.extra" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="common.vcxproj">
-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/qdbm.vcxproj b/infrastructure/msvc/2013/qdbm.vcxproj
deleted file mode 100644
index 296de088..00000000
--- a/infrastructure/msvc/2013/qdbm.vcxproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}</ProjectGuid>
-    <RootNamespace>qdbm</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetExt>.lib</TargetExt>
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <CompileAsManaged>false</CompileAsManaged>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>QDBM_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <CompileAsManaged>false</CompileAsManaged>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\qdbm\depot.h" />
-    <ClInclude Include="..\..\..\qdbm\myconf.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\qdbm\depot.c" />
-    <ClCompile Include="..\..\..\qdbm\myconf.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/2013/win32test.vcxproj b/infrastructure/msvc/2013/win32test.vcxproj
deleted file mode 100644
index 8369aabc..00000000
--- a/infrastructure/msvc/2013/win32test.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{28C29E72-76A2-4D0C-B35B-12D446733D2E}</ProjectGuid>
-    <RootNamespace>win32test</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4521</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ShowProgress>NotSet</ShowProgress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\lib\win32\emu.cpp" />
-    <ClCompile Include="..\..\..\test\win32\testlibwin32.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="common.vcxproj">
-      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/infrastructure/msvc/fake-config.sub.pl b/infrastructure/msvc/fake-config.sub.pl
deleted file mode 100644
index fa9b6839..00000000
--- a/infrastructure/msvc/fake-config.sub.pl
+++ /dev/null
@@ -1,18 +0,0 @@
-#!perl

-

-use strict;

-use warnings;

-use Cwd;

-

-require "infrastructure\\BoxPlatform.pm.in";

-my $wd = getcwd();

-my $dummy = $BoxPlatform::product_version;

-

-while(<>)

-{

-	s|\@build_dir@|$wd|;

-	s|\@client_parcel_dir@|$wd/Debug|;

-	s|\@box_version@|$BoxPlatform::product_version|;

-	m|[^@](@[^@]+@)| and die "Unknown variable: $1";

-	print;

-}
\ No newline at end of file
diff --git a/infrastructure/msvc/getversion.pl b/infrastructure/msvc/getversion.pl
deleted file mode 100755
index fe958831..00000000
--- a/infrastructure/msvc/getversion.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-#!perl
-
-$basedir = $0;
-$basedir =~ s|/|\\|g;
-$basedir =~ s/\\[^\\]*$//;
-$basedir =~ s/\\[^\\]*$//;
-$basedir =~ s/\\[^\\]*$//;
--d $basedir or die "$basedir: $!";
-chdir $basedir or die "$basedir: $!";
-
-require "$basedir\\infrastructure\\BoxPlatform.pm.in";
-
-my $verfile = "$basedir/lib/common/BoxVersion.h";
-my $newver = "#define BOX_VERSION \"$BoxPlatform::product_version\"\n";
-my $oldver = "";
-
-if (-r $verfile)
-{
-	open VERSIONFILE, "< $verfile" or die "$verfile: $!";
-	$oldver = <VERSIONFILE>;
-	close VERSIONFILE;
-
-}
-
-if ($newver ne $oldver)
-{
-	open VERSIONFILE, "> $verfile" or die "BoxVersion.h: $!";
-	print VERSIONFILE $newver;
-	close VERSIONFILE;
-}
-
-print $BoxPlatform::product_version;
-exit 0;
diff --git a/infrastructure/msvc/win32.bat b/infrastructure/msvc/win32.bat
deleted file mode 100644
index 7c25723a..00000000
--- a/infrastructure/msvc/win32.bat
+++ /dev/null
@@ -1,44 +0,0 @@
-@echo off

-

-echo quick and dirty to get up and running by generating the required files 

-echo using Cygwin and Perl

-

-cd ..\..

-

-copy .\infrastructure\BoxPlatform.pm.in .\infrastructure\BoxPlatform.pm

-copy .\lib\common\BoxPortsAndFiles.h.in .\lib\common\BoxPortsAndFiles.h

-copy .\lib\common\BoxConfig-MSVC.h .\lib\common\BoxConfig.h

-

-cd .\bin\bbackupquery\ & perl ./../../bin/bbackupquery/makedocumentation.pl.in

-cd ..\..\

-

-cd .\lib\backupstore & perl ./../../lib/common/makeexception.pl.in BackupStoreException.txt & perl ./../../lib/server/makeprotocol.pl.in backupprotocol.txt

-cd ..\..\

-

-cd .\lib\compress & perl ./../../lib/common/makeexception.pl.in CompressException.txt

-cd ..\..\

-

-cd .\lib\common & perl ./../../lib/common/makeexception.pl.in CommonException.txt & perl ./../../lib/common/makeexception.pl.in ConversionException.txt

-cd ..\..\

-

-cd .\lib\raidfile & perl ./../../lib/common/makeexception.pl.in RaidFileException.txt

-cd ..\..\

-

-cd .\lib\backupclient & perl ./../../lib/common/makeexception.pl.in ClientException.txt

-cd ..\..\

-

-cd .\lib\crypto & perl ./../../lib/common/makeexception.pl.in CipherException.txt

-cd ..\..\

-

-cd .\lib\httpserver & perl ./../../lib/common/makeexception.pl.in HTTPException.txt

-cd ..\..\

-

-echo server parts - which appears as though some of the clients rely on

-

-cd .\lib\server & perl ./../../lib/common/makeexception.pl.in ServerException.txt & perl ./../../lib/common/makeexception.pl.in ConnectionException.txt

-cd ..\..\

-

-perl -pe 's/@PERL@/perl/' ./test/bbackupd/testfiles/bbackupd.conf.in > .\test\bbackupd\testfiles\bbackupd.conf

-

-echo Generating InstallJammer configuration file

-perl infrastructure/msvc/fake-config.sub.pl ./contrib/windows/installer/boxbackup.mpi.in > ./contrib/windows/installer/boxbackup.mpi

diff --git a/infrastructure/travis-build.sh b/infrastructure/travis-build.sh
new file mode 100755
index 00000000..72a187b3
--- /dev/null
+++ b/infrastructure/travis-build.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+set -x
+
+ccache -s
+
+if [ "$BUILD" = 'cmake' ]; then
+	cd `dirname $0`
+	mkdir -p cmake/build
+	cd cmake/build
+	cmake --version
+	cmake -DCMAKE_BUILD_TYPE:STRING=$TEST_TARGET ..
+	make install
+	[ "$TEST" = "n" ] || ctest -C $TEST_TARGET -V
+else
+	cd `dirname $0`/..
+	./bootstrap
+	./configure CC="ccache $CC" CXX="ccache $CXX" "$@"
+	grep CXX config.status
+	make V=1
+	./runtest.pl ALL $TEST_TARGET
+	if [ "$TEST_TARGET" = "release" ]; then
+		make
+		make parcels
+	fi
+fi
+
+ccache -s