21 files changed, 2130 insertions, 0 deletions
diff --git a/infrastructure/BoxPlatform.pm.in b/infrastructure/BoxPlatform.pm.in
index 59ab5d85..f3c71308 100644
--- a/infrastructure/BoxPlatform.pm.in
+++ b/infrastructure/BoxPlatform.pm.in
@@ -24,11 +24,25 @@ BEGIN
 	# Cygwin Builds usually something like CYGWIN_NT-5.0, CYGWIN_NT-5.1
 	# Box Backup tried on Win2000,XP only :)
 	$build_os = 'CYGWIN' if $build_os =~ m/CYGWIN/;
+<<<<<<< HEAD
 
 	$make_command = ($build_os eq 'Darwin') ? 'bsdmake' : ($build_os eq 'SunOS') ? 'gmake' : 'make';
 
 	$bsd_make = ($build_os ne 'Linux' && $build_os ne 'CYGWIN' &&
 		$build_os ne "SunOS" && $build_os ne 'GNU/kFreeBSD');
+=======
+	$build_os = 'MINGW32' if $build_os =~ m/MINGW32/;
+
+	if ($build_os eq 'Darwin') {
+		$xcode_ver = `xcodebuild -version | awk '/^Xcode/ {print \$2}'`
+	}
+
+	$make_command = ($build_os eq 'Darwin' && $xcode_ver < 4) ? 'bsdmake' : ($build_os eq 'SunOS') ? 'gmake' : 'make';
+
+	$bsd_make = ($build_os ne 'Linux' && $build_os ne 'CYGWIN' &&
+		$build_os ne "MINGW32" && $build_os ne "SunOS"
+		&& $build_os ne 'GNU/kFreeBSD' && $xcode_ver < 4);
+>>>>>>> 0.12
 
 	# blank extra flags by default
 	$platform_compile_line_extra = '';
@@ -82,6 +96,7 @@ BEGIN
 	# where to put the files
 	$install_into_dir = '@sbindir_expanded@';
 
+<<<<<<< HEAD
 	# if it's Darwin,
 	if($build_os eq 'Darwin')
 	{
@@ -93,6 +108,32 @@ BEGIN
 			$sub_make_options = ' -j '.($1 + 1);
 		}
 		
+=======
+	# see how many processors there are, and set make flags accordingly
+	if($build_os eq 'Darwin' || $build_os =~ /(Free|Net|Open)BSD/)
+	{
+		$cpus = `sysctl -n hw.ncpu`;
+	}
+	elsif($build_os eq 'Linux')
+	{
+		$cpus = `grep -c ^processor /proc/cpuinfo`;
+	}
+	elsif($build_os eq 'SunOS')
+	{
+		$cpus = `psrinfo -p`;
+	}
+
+	chomp $cpus;
+	if($cpus > 1)
+	{
+		print STDERR "$cpus processors detected, will set make to perform concurrent jobs\n";
+		$sub_make_options = ' -j '.($cpus + 1);
+	}
+		
+	# if it's Darwin,
+	if($build_os eq 'Darwin')
+	{
+>>>>>>> 0.12
 		# test for fink installation
 		if(-d '/sw/include' && -d '/sw/lib')
 		{
diff --git a/infrastructure/buildenv-testmain-template.cpp b/infrastructure/buildenv-testmain-template.cpp
index b646a27b..287c4bff 100644
--- a/infrastructure/buildenv-testmain-template.cpp
+++ b/infrastructure/buildenv-testmain-template.cpp
@@ -29,9 +29,23 @@
 	#include <getopt.h>
 #endif
 
+<<<<<<< HEAD
 #include <sys/stat.h>
 #include <sys/types.h>
 
+=======
+#ifdef HAVE_SYS_SOCKET_H
+#	include <sys/socket.h>
+#endif
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_UN_H
+#	include <sys/un.h>
+#endif
+
+>>>>>>> 0.12
 #include <exception>
 #include <string>
 
@@ -76,7 +90,19 @@ inline bool checkfilesleftopen()  { return false; }
 
 #define FILEDES_MAX 256
 
+<<<<<<< HEAD
 bool filedes_open[FILEDES_MAX];
+=======
+typedef enum
+{
+	OPEN,
+	CLOSED,
+	SYSLOG
+}
+filedes_t;
+
+filedes_t filedes_open[FILEDES_MAX];
+>>>>>>> 0.12
 
 bool check_filedes(bool report)
 {
@@ -87,11 +113,59 @@ bool check_filedes(bool report)
 	{
 		if(::fcntl(d, F_GETFD) != -1)
 		{
+<<<<<<< HEAD
 			// File descriptor obviously exists
 			if (report && !filedes_open[d])
 			{
 				struct stat st;
 				if (fstat(d, &st) == 0)
+=======
+			// File descriptor obviously exists, but is it /dev/log?
+
+			struct stat st;
+			bool stat_success = false;
+			bool is_syslog_socket = false;
+
+			if(fstat(d, &st) == 0)
+			{
+				stat_success = true;
+			}
+
+			if(stat_success && (st.st_mode & S_IFSOCK))
+			{
+				char buffer[256];
+				socklen_t addrlen = sizeof(buffer);
+
+#ifdef HAVE_GETPEERNAME
+				if(getpeername(d, (sockaddr*)buffer, &addrlen) != 0)
+				{
+					BOX_WARNING("Failed to getpeername(" << 
+						d << "), cannot identify /dev/log");
+				}
+				else
+				{
+					struct sockaddr_un *sa = 
+						(struct sockaddr_un *)buffer;
+					if(sa->sun_family == PF_UNIX &&
+						!strcmp(sa->sun_path, "/dev/log"))
+					{
+						is_syslog_socket = true;
+					}
+				}
+#endif // HAVE_GETPEERNAME
+			}
+
+			if(report && filedes_open[d] != OPEN)
+			{
+				if(filedes_open[d] == SYSLOG)
+				{
+					// Different libcs have different ideas
+					// about when to open and close this
+					// socket, and it's not a leak, so
+					// ignore it.
+				}
+				else if(stat_success)
+>>>>>>> 0.12
 				{
 					int m = st.st_mode;
 					#define flag(x) ((m & x) ? #x " " : "")
@@ -105,11 +179,16 @@ bool check_filedes(bool report)
 						flag(S_IFLNK) <<
 						flag(S_IFSOCK) <<
 						" or " << m << ")");
+<<<<<<< HEAD
+=======
+					allOk = false;
+>>>>>>> 0.12
 				}
 				else
 				{
 					BOX_FATAL("File descriptor " << d << 
 						" left open (and stat failed)");
+<<<<<<< HEAD
 				}
 	
 				allOk = false;
@@ -118,10 +197,19 @@ bool check_filedes(bool report)
 			else if (!report)
 			{
 				filedes_open[d] = true;
+=======
+					allOk = false;
+				}
+			}
+			else if (!report)
+			{
+				filedes_open[d] = is_syslog_socket ? SYSLOG : OPEN;
+>>>>>>> 0.12
 			}
 		}
 		else 
 		{
+<<<<<<< HEAD
 			if (report && filedes_open[d])
 			{
 				BOX_FATAL("File descriptor " << d << 
@@ -131,6 +219,27 @@ bool check_filedes(bool report)
 			else
 			{
 				filedes_open[d] = false;
+=======
+			if (report && filedes_open[d] != CLOSED)
+			{
+				if (filedes_open[d] == SYSLOG)
+				{
+					// Different libcs have different ideas
+					// about when to open and close this
+					// socket, and it's not a leak, so
+					// ignore it.
+				}
+				else if(filedes_open[d] == OPEN)
+				{
+					BOX_FATAL("File descriptor " << d << 
+						" was open, now closed");
+					allOk = false;
+				}
+			}
+			else
+			{
+				filedes_open[d] = CLOSED;
+>>>>>>> 0.12
 			}
 		}
 	}
@@ -183,7 +292,11 @@ int main(int argc, char * const * argv)
 	
 	int ch;
 	
+<<<<<<< HEAD
 	while ((ch = getopt_long(argc, argv, "c:d:qs:t:vPTUV", longopts, NULL))
+=======
+	while ((ch = getopt_long(argc, argv, "c:d:qs:t:vPTUVW:", longopts, NULL))
+>>>>>>> 0.12
 		!= -1)
 	{
 		switch(ch)
@@ -255,6 +368,20 @@ int main(int argc, char * const * argv)
 			}
 			break;
 
+<<<<<<< HEAD
+=======
+			case 'W':
+			{
+				logLevel = Logging::GetNamedLevel(optarg);
+				if (logLevel == Log::INVALID)
+				{
+					BOX_FATAL("Invalid logging level: " << optarg);
+					return 2;
+				}
+			}
+			break;
+
+>>>>>>> 0.12
 			case 't':
 			{
 				Logging::SetProgramName(optarg);
@@ -292,6 +419,10 @@ int main(int argc, char * const * argv)
 	}
 
 	Logging::SetGlobalLevel((Log::Level)logLevel);
+<<<<<<< HEAD
+=======
+	Logging::FilterConsole((Log::Level)logLevel);
+>>>>>>> 0.12
 
 	argc -= optind - 1;
 	argv += optind - 1;
@@ -369,6 +500,15 @@ int main(int argc, char * const * argv)
 		
 		return returncode;
 	}
+<<<<<<< HEAD
+=======
+	catch(BoxException &e)
+	{
+		printf("FAILED: Exception caught: %s: %s\n", e.what(),
+			e.GetMessage().c_str());
+		return 1;
+	}
+>>>>>>> 0.12
 	catch(std::exception &e)
 	{
 		printf("FAILED: Exception caught: %s\n", e.what());
diff --git a/infrastructure/m4/ax_check_ssl.m4 b/infrastructure/m4/ax_check_ssl.m4
index 03362bb6..1714080c 100644
--- a/infrastructure/m4/ax_check_ssl.m4
+++ b/infrastructure/m4/ax_check_ssl.m4
@@ -27,7 +27,12 @@ AC_DEFUN([AX_CHECK_SSL], [
 
   ax_check_ssl_found=yes
   AC_CHECK_HEADERS([openssl/ssl.h],, [ax_check_ssl_found=no])
+<<<<<<< HEAD
   AC_CHECK_LIB([ssl], [SSL_read],, [ax_check_ssl_found=no], [-lcrypto])
+=======
+  AC_SEARCH_LIBS([HMAC_CTX_init], [crypto])
+  AC_SEARCH_LIBS([SSL_read], [ssl],, [ax_check_ssl_found=no])
+>>>>>>> 0.12
 
   if test "x$ax_check_ssl_found" = "xyes"; then
     AC_DEFINE([HAVE_SSL], 1, [Define to 1 if SSL is available])
diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4
new file mode 100644
index 00000000..9e6bc2f2
--- /dev/null
+++ b/infrastructure/m4/boxbackup_tests.m4
@@ -0,0 +1,315 @@
+dnl All Box Backup configury magic is here, to be shared with Boxi
+
+case $build_os in
+solaris*)
+  isa_bits=`isainfo -b`
+  AC_MSG_NOTICE([setting compiler to use -m$isa_bits on Solaris])
+  CFLAGS="$CFLAGS -m$isa_bits"
+  CXXFLAGS="$CXXFLAGS -m$isa_bits"
+  LDFLAGS="$LDFLAGS -m$isa_bits"
+  ;;
+esac
+
+if test "x$GXX" = "xyes"; then
+  # Use -Wall if we have gcc. This gives better warnings
+  AC_SUBST([CXXFLAGS_STRICT], ['-Wall -Wundef'])
+
+  # Don't check for gcc -rdynamic on Solaris as it's broken, but returns 0.
+  # On Cygwin it does nothing except cause gcc to emit a warning message.
+  case $build_os in
+  solaris*|cygwin)
+    AC_MSG_NOTICE([skipping check for -rdynamic on $build_os])
+    ;;
+  *)
+    # Check whether gcc supports -rdynamic, thanks to Steve Ellcey
+    # [http://readlist.com/lists/gcc.gnu.org/gcc/6/31502.html]
+    # This is needed to get symbols in backtraces.
+    # Note that this apparently fails on HP-UX and Solaris
+    LDFLAGS="$LDFLAGS -rdynamic"
+    AC_MSG_CHECKING([whether gcc accepts -rdynamic])
+    AC_TRY_LINK([], [return 0;],
+      [AC_MSG_RESULT([yes]); have_rdynamic=yes],
+      [AC_MSG_RESULT([no])])
+    if test x"$have_rdynamic" = x"yes" ; then
+      AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
+    fi
+    ;;
+  esac
+fi
+
+AC_PATH_PROG([PERL], [perl], [AC_MSG_ERROR([[perl executable was not found]])])
+
+case $target_os in
+mingw*) 
+	TARGET_PERL=perl
+	;;
+*)
+	TARGET_PERL=$PERL
+	;;
+esac
+
+AC_SUBST([TARGET_PERL])
+AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$TARGET_PERL"], 
+	[Location of the perl executable])
+
+AC_CHECK_TOOL([AR],     [ar],    
+	[AC_MSG_ERROR([[cannot find ar executable]])])
+AC_CHECK_TOOL([RANLIB], [ranlib],
+	[AC_MSG_ERROR([[cannot find ranlib executable]])])
+
+case $target_os in
+mingw*) 
+	AC_CHECK_TOOL([WINDRES], [windres],
+		[AC_MSG_ERROR([[cannot find windres executable]])])
+	;;
+esac
+
+### Checks for libraries.
+
+case $target_os in
+mingw32*)
+	AC_CHECK_LIB([crypto -lws2_32 -lgdi32], [CRYPTO_lock])
+	;;
+winnt)
+	;;
+*)
+	AC_SEARCH_LIBS([nanosleep], [rt], [ac_have_nanosleep=yes],
+		[AC_MSG_ERROR([[cannot find a short sleep function (nanosleep)]])])
+	;;
+esac
+
+AC_CHECK_HEADER([zlib.h],, [AC_MSG_ERROR([[cannot find zlib.h]])])
+AC_CHECK_LIB([z], [zlibVersion],, [AC_MSG_ERROR([[cannot find zlib]])])
+VL_LIB_READLINE([have_libreadline=yes], [have_libreadline=no])
+AC_CHECK_FUNCS([rl_filename_completion_function])
+
+## Check for Berkely DB. Restrict to certain versions
+AX_PATH_BDB([1.x or 4.1], [
+  LIBS="$BDB_LIBS $LIBS"
+  LDFLAGS="$BDB_LDFLAGS $LDFLAGS"
+  CPPFLAGS="$CPPFLAGS $BDB_CPPFLAGS"
+
+  AX_COMPARE_VERSION([$BDB_VERSION],[ge],[4.1],,
+    [AX_COMPARE_VERSION([$BDB_VERSION],[lt],[2],,
+      [AC_MSG_ERROR([[only Berkely DB versions 1.x or at least 4.1 are currently supported]])]
+      )]
+  )
+  AX_SPLIT_VERSION([BDB_VERSION], [$BDB_VERSION])
+])
+
+# need to find libdl before trying to link openssl, apparently
+AC_SEARCH_LIBS([dlsym], ["dl"])
+AC_CHECK_FUNCS([dlsym dladdr])
+
+## Check for Open SSL, use old versions only if explicitly requested
+AC_SEARCH_LIBS([gethostbyname], [nsl socket resolv])
+AC_SEARCH_LIBS([shutdown], [nsl socket resolv])
+AX_CHECK_SSL(, [AC_MSG_ERROR([[OpenSSL is not installed but is required]])])
+AC_ARG_ENABLE(
+  [old-ssl],
+  [AC_HELP_STRING([--enable-old-ssl],
+                  [Allow use of pre-0.9.7 Open SSL - NOT RECOMMENDED, read the documentation])])
+AC_SEARCH_LIBS(
+  [EVP_CipherInit_ex],
+  [crypto],, [
+  if test "x$enable_old_ssl" = "xyes"; then
+    AC_DEFINE([HAVE_OLD_SSL], 1, [Define to 1 if SSL is pre-0.9.7])
+  else
+    AC_MSG_ERROR([[found an old (pre 0.9.7) version of SSL.
+Upgrade or read the documentation for alternatives]])
+  fi
+  ])
+
+
+### 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 process.h pwd.h signal.h])
+AC_CHECK_HEADERS([syslog.h time.h cxxabi.h])
+AC_CHECK_HEADERS([netinet/in.h netinet/tcp.h])
+AC_CHECK_HEADERS([sys/file.h sys/param.h sys/socket.h sys/time.h sys/types.h])
+AC_CHECK_HEADERS([sys/uio.h sys/un.h sys/wait.h sys/xattr.h])
+AC_CHECK_HEADERS([bsd/unistd.h])
+AC_CHECK_HEADERS([sys/socket.h], [have_sys_socket_h=yes])
+AC_CHECK_HEADERS([winsock2.h], [have_winsock2_h=yes])
+AC_CHECK_HEADERS([execinfo.h], [have_execinfo_h=yes])
+
+if test "$have_execinfo_h" = "yes"; then
+  AC_SEARCH_LIBS([backtrace],[execinfo])
+fi
+
+AC_CHECK_HEADER([regex.h], [have_regex_h=yes])
+
+if test "$have_regex_h" = "yes"; then
+  AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if regex.h is available])
+else
+  AC_CHECK_HEADER([pcreposix.h], [have_pcreposix_h=yes])
+fi
+
+if test "$have_pcreposix_h" = "yes"; then
+  AC_DEFINE([PCRE_STATIC], [1], [Box Backup always uses static PCRE])
+  AC_SEARCH_LIBS([regcomp], ["pcreposix -lpcre"],,[have_pcreposix_h=no_regcomp])
+fi
+
+if test "$have_pcreposix_h" = "yes"; then
+  AC_DEFINE([HAVE_PCREPOSIX_H], [1], [Define to 1 if pcreposix.h is available])
+fi
+
+if test "$have_regex_h" = "yes" -o "$have_pcreposix_h" = "yes"; then
+  have_regex_support=yes
+  AC_DEFINE([HAVE_REGEX_SUPPORT], [1], [Define to 1 if regular expressions are supported])
+else
+  have_regex_support=no
+fi
+
+### Checks for typedefs, structures, and compiler characteristics.
+
+AC_CHECK_TYPES([u_int8_t, u_int16_t, u_int32_t, u_int64_t])
+AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, uint64_t])
+
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_C_BIGENDIAN
+AC_TYPE_UID_T
+AC_TYPE_MODE_T
+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_mtimespec])
+AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec])
+AC_CHECK_MEMBERS([struct stat.st_atimensec])
+AC_CHECK_MEMBERS([struct sockaddr_in.sin_len],,, [[
+  #include <sys/types.h>
+  #include <netinet/in.h>
+  ]])
+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([INFTIM],,, [[#include <poll.h>]])
+AC_CHECK_DECLS([SO_PEERCRED],,, [[#include <sys/socket.h>]])
+AC_CHECK_DECLS([O_BINARY],,,)
+AC_CHECK_DECLS([SOL_TCP],,, [[#include <netinet/tcp.h>]])
+AC_CHECK_DECLS([TCP_INFO],,, [[#include <netinet/tcp.h>]])
+
+if test -n "$have_sys_socket_h"; then
+  AC_CHECK_DECLS([SO_SNDBUF],,, [[#include <sys/socket.h>]])
+elif test -n "$have_winsock2_h"; then
+  AC_CHECK_DECLS([SO_SNDBUF],,, [[#include <winsock2.h>]])
+else
+  # unlikely to succeed, but defined HAVE_DECL_SO_SNDBUF to 0 instead
+  # of leaving it undefined, which makes cpp #ifdefs simpler.
+  AC_CHECK_DECLS([SO_SNDBUF])
+fi
+
+# Solaris provides getpeerucred() instead of getpeereid() or SO_PEERCRED
+AC_CHECK_HEADERS([ucred.h])
+AC_CHECK_FUNCS([getpeerucred])
+
+AC_CHECK_DECLS([optreset],,, [[#include <getopt.h>]])
+AC_CHECK_DECLS([dirfd],,,
+	[[
+		#include <getopt.h>
+		#include <dirent.h>
+	]])
+
+AC_HEADER_TIME
+AC_STRUCT_TM
+AX_CHECK_DIRENT_D_TYPE
+AC_SYS_LARGEFILE
+AX_CHECK_DEFINE_PRAGMA
+if test "x$ac_cv_c_bigendian" != "xyes"; then
+  AX_BSWAP64
+fi
+
+case $target_os in
+mingw32*) ;;
+winnt*)   ;;
+*)
+  AX_RANDOM_DEVICE
+  AX_CHECK_MOUNT_POINT(,[
+    AC_MSG_ERROR([[cannot work out how to discover mount points on your platform]])
+  ])
+  AC_CHECK_MEMBERS([struct dirent.d_ino],,, [[#include <dirent.h>]])
+;;
+esac
+
+AX_CHECK_MALLOC_WORKAROUND
+
+
+### Checks for library functions.
+
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_ERROR_AT_LINE
+AC_TYPE_SIGNAL
+AC_FUNC_STAT
+AC_CHECK_FUNCS([getpeereid getpeername lchown setproctitle getpid gettimeofday waitpid ftruncate])
+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
+netbsd_hack=`echo $target_os | sed 's/netbsd.*/netbsd/'`
+if test "$netbsd_hack" != "netbsd"; then
+  AC_CHECK_FUNCS([kqueue])
+fi
+
+AX_FUNC_SYSCALL
+AX_CHECK_SYSCALL_LSEEK
+AC_CHECK_FUNCS([listxattr llistxattr getxattr lgetxattr setxattr lsetxattr])
+AC_CHECK_DECLS([XATTR_NOFOLLOW],,, [[#include <sys/xattr.h>]])
+
+
+### Miscellaneous complicated feature checks
+
+## Check for large file support active. AC_SYS_LARGEFILE has already worked
+## out how to enable it if necessary, we just use this to report to the user
+AC_CACHE_CHECK([if we have large file support enabled],
+  [box_cv_have_large_file_support],
+  [AC_TRY_RUN([
+    $ac_includes_default
+    int main()
+    {
+      return sizeof(off_t)==4;
+    }
+    ],
+    [box_cv_have_large_file_support=yes],
+    [box_cv_have_large_file_support=no],
+    [box_cv_have_large_file_support=no # safe for cross-compile]
+    )
+  ])
+
+if test "x$box_cv_have_large_file_support" = "xyes"; then
+	AC_DEFINE([HAVE_LARGE_FILE_SUPPORT], [1],
+		[Define to 1 if large files are supported])
+fi
+
+## Find out how to do file locking
+AC_CHECK_FUNCS([flock fcntl])
+AC_CHECK_DECLS([O_EXLOCK],,, [[#include <fcntl.h>]])
+AC_CHECK_DECLS([F_SETLK],,, [[#include <fcntl.h>]])
+
+case $target_os in
+mingw32*) ;;
+winnt*)   ;;
+*)
+if test "x$ac_cv_func_flock" != "xyes" && \
+   test "x$ac_cv_have_decl_O_EXLOCK" != "xyes" && \
+   test "x$ac_cv_have_decl_F_SETLK" != "xyes"
+then
+  AC_MSG_ERROR([[cannot work out how to do file locking on your platform]])
+fi
+;;
+esac
+
+
diff --git a/infrastructure/m4/vl_lib_readline.m4 b/infrastructure/m4/vl_lib_readline.m4
index a0571bfa..e04a5f5f 100644
--- a/infrastructure/m4/vl_lib_readline.m4
+++ b/infrastructure/m4/vl_lib_readline.m4
@@ -79,6 +79,7 @@ AC_DEFUN([VL_LIB_READLINE], [
   fi
 ])
 
+<<<<<<< HEAD
 dnl VL_LIB_READLINE_CHECK(name, libraries, headers, history headers)
 AC_DEFUN([VL_LIB_READLINE_CHECK], [
   AC_CACHE_CHECK([for $1 library],
@@ -87,6 +88,26 @@ AC_DEFUN([VL_LIB_READLINE_CHECK], [
     vl_cv_lib_$1=""
     for readline_lib in $2; do
       for termcap_lib in "" termcap curses ncurses; do
+=======
+dnl BOX_CHECK_VAR(name, where, headers)
+AC_DEFUN([BOX_CHECK_VAR], [
+  AC_CACHE_CHECK([for $1 $2], [vl_cv_var_$1], 
+    [AC_TRY_LINK([$3], [(void) $1], [vl_cv_var_$1=yes], [vl_cv_var_$1=no])
+    ])
+  if test "${vl_cv_var_$1}" = "yes"; then
+    AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$1), 1, [Define if you have $1 $2])
+  fi
+  ])
+
+dnl VL_LIB_READLINE_CHECK(name, libraries, headers, history headers)
+AC_DEFUN([VL_LIB_READLINE_CHECK], [
+  ORIG_LIBS="$LIBS"
+  AC_CACHE_CHECK([for $1 library],
+                 [vl_cv_lib_$1], [
+    vl_cv_lib_$1=""
+    for readline_lib in $2; do
+      for termcap_lib in "" termcap curses ncurses pdcurses; do
+>>>>>>> 0.12
         if test -z "$termcap_lib"; then
           TRY_LIB="-l$readline_lib"
         else
@@ -108,12 +129,44 @@ AC_DEFUN([VL_LIB_READLINE_CHECK], [
     fi
   ])
 
+<<<<<<< HEAD
   vl_cv_lib_readline_compat_found=no
   if test "x$vl_cv_lib_$1" != "xno"; then
     AC_CHECK_HEADERS([$3], [vl_cv_lib_readline_compat_found=yes])
   fi
 
   if test "x$vl_cv_lib_readline_compat_found" = "xyes"; then
+=======
+  vl_cv_lib_includes=""
+
+  vl_cv_lib_readline_compat_found=no
+  if test "x$vl_cv_lib_$1" != "xno"; then
+    AC_CHECK_HEADERS([$3], [
+      vl_cv_lib_readline_compat_found=yes
+      vl_cv_lib_includes="$vl_cv_lib_headers #include <$ac_header>"
+    ])
+  fi
+
+  AC_TRY_LINK([$vl_cv_lib_includes], [(void) readline;],
+    [vl_compiles=yes], [vl_compiles=no])
+  if test "x$vl_compiles" = "xno"; then
+    AC_TRY_LINK([#include <stdio.h>
+      $vl_cv_lib_includes], [(void) readline;],
+      [vl_compiles_with_stdio=yes], [vl_compiles_with_stdio=no])
+    if test "x$vl_compiles_with_stdio" = "xyes"; then
+      vl_cv_lib_includes="#include <stdio.h>
+$vl_cv_lib_includes"
+    fi
+  fi
+
+  if test "x$vl_cv_lib_readline_compat_found" = "xyes"; then
+    BOX_CHECK_VAR([rl_completion_matches], [in readline headers],
+      [$vl_cv_lib_includes])
+
+    BOX_CHECK_VAR([completion_matches], [in readline headers],
+      [$vl_cv_lib_includes])
+
+>>>>>>> 0.12
     AC_DEFINE([HAVE_LIBREADLINE], 1,
               [Define if you have a readline compatible library])
 
diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in
index 33b0b635..ed963c93 100755
--- a/infrastructure/makebuildenv.pl.in
+++ b/infrastructure/makebuildenv.pl.in
@@ -261,7 +261,11 @@ for(@modules_files)
 	push @modules,$mod;
 	my @md;	# module dependencies
 	my @lo; # link line options
+<<<<<<< HEAD
 	for(@deps)
+=======
+	for (@deps)
+>>>>>>> 0.12
 	{
 		if(/\A-l/)
 		{
@@ -277,7 +281,11 @@ for(@modules_files)
 	
 	# make directories, but not if we're using an external library and this a library module
 	my ($s,$d) = split /\//,$mod;
+<<<<<<< HEAD
 	if($s ne 'lib' || $external_lib eq '')
+=======
+	if ($s ne 'lib' or $external_lib eq '')
+>>>>>>> 0.12
 	{
 		mkdir "release/$s",0755;
 		mkdir "release/$s/$d",0755;
@@ -346,7 +354,12 @@ for my $mod (@modules, @implicit_deps)
 	for(grep /\.h\Z/i, @items)
 	{
 		next if /\A\._/;	# Temp Mac OS Resource hack
+<<<<<<< HEAD
 		die "Header file $_ already used in module ".$hfiles{$_}."\n" if exists $hfiles{$_};
+=======
+		die "Header file $_ already used in module ".$hfiles{$_}.
+			", cannot add to $mod\n" if exists $hfiles{$_};
+>>>>>>> 0.12
 		$hfiles{$_} = $mod
 	}
 }
@@ -375,11 +388,18 @@ for my $mod (@modules, @implicit_deps)
 	closedir DIR;
 }
 
+<<<<<<< HEAD
+=======
+# Then write a makefile for each module
+>>>>>>> 0.12
 print "done\n\nGenerating Makefiles...\n";
 
 my %module_resources_win32;
 
+<<<<<<< HEAD
 # Then write a makefile for each module
+=======
+>>>>>>> 0.12
 for my $mod (@implicit_deps, @modules)
 {
 	print $mod,"\n";
@@ -483,6 +503,10 @@ __E
 	}
 	
 	my @all_deps_for_module;
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0.12
 	{
 		# work out what dependencies need to be run
 		my @deps_raw;
@@ -566,16 +590,27 @@ WINDRES = @WINDRES@
 DEFAULT_CXXFLAGS = @CPPFLAGS@ $default_cxxflags @CXXFLAGS_STRICT@ \\
 	$include_paths $extra_platform_defines \\
 	-DBOX_VERSION="\\"$product_version\\""
+<<<<<<< HEAD
 LDFLAGS = @LDFLAGS@ @LDADD_RDYNAMIC@
 
 .ifdef RELEASE
 CXXFLAGS = -DBOX_RELEASE_BUILD $release_flags \$(DEFAULT_CXXFLAGS)
+=======
+LDFLAGS += @LDFLAGS@ @LDADD_RDYNAMIC@
+
+.ifdef RELEASE
+CXXFLAGS += -DBOX_RELEASE_BUILD $release_flags \$(DEFAULT_CXXFLAGS)
+>>>>>>> 0.12
 OUTBASE = ../../release
 OUTDIR = ../../release/$mod
 DEPENDMAKEFLAGS = -D RELEASE
 VARIENT = RELEASE
 .else
+<<<<<<< HEAD
 CXXFLAGS = -g \$(DEFAULT_CXXFLAGS)
+=======
+CXXFLAGS += -g \$(DEFAULT_CXXFLAGS)
+>>>>>>> 0.12
 OUTBASE = ../../debug
 OUTDIR = ../../debug/$mod
 DEPENDMAKEFLAGS =
@@ -620,6 +655,15 @@ _PERL    = \$(if \$(V),\$(PERL),    @ echo "  [PERL]    \$@" && \$(PERL) >/dev/n
 
 __E
 	}
+<<<<<<< HEAD
+=======
+
+	# if there is a Makefile.pre, include it now
+	if(-e "$mod/Makefile.pre")
+	{
+		print MAKE ".include <Makefile.pre>\n\n";
+	}
+>>>>>>> 0.12
 	
 	# read directory
 	opendir DIR,$mod;
@@ -740,7 +784,11 @@ __E
 	$has_deps = 1;
 	$has_deps = 0 if $target_is_library;
 
+<<<<<<< HEAD
 	# Depenency stuff
+=======
+	# Dependency stuff
+>>>>>>> 0.12
 	my $deps_makeinfo;
 	if($has_deps)
 	{
@@ -766,15 +814,56 @@ __E
 		# run make for things we require
 		for my $dep (@all_deps_for_module)
 		{
+<<<<<<< HEAD
 			$deps_makeinfo .= "\t\t\$(HIDE) (cd ../../$dep; \$(MAKE)$sub_make_options -q \$(DEPENDMAKEFLAGS) -D NODEPS || \$(MAKE)$sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS)\n";
+=======
+			my $dep_target = "";
+			if ($dep =~ m|^lib/(.*)|)
+			{
+				$dep_target = "\$(OUTBASE)/$dep/$1.a";
+			}
+			elsif ($dep =~ m|^.*/(.*)|)
+			{
+				$dep_target = "\$(OUTBASE)/$dep/$1$platform_exe_ext";
+			}
+			else
+			{
+				$dep_target = "lib$dep.a";
+			}
+
+			$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
+>>>>>>> 0.12
 		}
 
 		$deps_makeinfo .= ".\tendif\n.endif\n\n";
 	}
 	print MAKE $deps_makeinfo if $bsd_make;
 	
+<<<<<<< HEAD
 	# get the list of library things to add -- in order of dependency so things link properly
 	my $lib_files = join(' ',map {($_ =~ m/lib\/(.+)\Z/)?('$(OUTBASE)/'.$_.'/'.$1.'.a'):undef} (reverse(@all_deps_for_module)));
+=======
+	# 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\/(.+)$|)
+		{
+			push @lib_files, "\$(OUTBASE)/$dep/$1.a";
+		}
+		elsif ($dep =~ m|^([^/]+)$|)
+		{
+			push @lib_files, "../../$dep/lib$1.a";
+		}
+	}
+>>>>>>> 0.12
 
 	# need to see if the extra makefile fragments require extra object files
 	# or include any more makefiles
@@ -793,7 +882,11 @@ __E
 	}
 
 	print MAKE $end_target,': ',$o_file_list;
+<<<<<<< HEAD
 	print MAKE " ",$lib_files unless $target_is_library;
+=======
+	print MAKE " @lib_files" unless $target_is_library;
+>>>>>>> 0.12
 	print MAKE "\n";
 	
 	if ($target_windows)
@@ -820,6 +913,7 @@ __E
 		# work out library options
 		# need to be... least used first, in absolute order they appear in the modules.txt file
 		my @libops;
+<<<<<<< HEAD
 		sub libops_fill
 		{
 			my ($m,$r) = @_;
@@ -827,6 +921,28 @@ __E
 			libops_fill($_,$r) for(@{$module_dependency{$m}});
 		}
 		libops_fill($mod,\@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);
+		
+>>>>>>> 0.12
 		my $lo = '';
 		my %ldone;
 		for(@libops)
@@ -839,14 +955,24 @@ __E
 		# link line...
 		print MAKE "\t\$(_LINK) \$(LDFLAGS) $link_line_extra " .
 			"-o $end_target $o_file_list " .
+<<<<<<< HEAD
 			"$lib_files$lo $platform_lib_files\n";
 	}
+=======
+			"@lib_files $lo $platform_lib_files\n";
+	}
+
+>>>>>>> 0.12
 	# 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";
 	}
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0.12
 	# dependency line?
 	print MAKE "\n";
 
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in
index 4dc94925..f468dc1f 100755
--- a/infrastructure/makeparcels.pl.in
+++ b/infrastructure/makeparcels.pl.in
@@ -123,7 +123,11 @@ release/common/test:
 
 .PHONY: docs
 docs:
+<<<<<<< HEAD
 	\$(MAKE) -C docs
+=======
+	cd docs; \$(MAKE)
+>>>>>>> 0.12
 
 __END_OF_FRAGMENT
 
@@ -137,6 +141,12 @@ for my $parcel (@parcels)
 	my $dir     = BoxPlatform::parcel_dir($parcel);
 	my @parcel_deps;
 
+<<<<<<< HEAD
+=======
+	# Need to use BSD install on Solaris
+	my $install_bin = $build_os eq 'SunOS' ? '/usr/ucb/install' : 'install';
+
+>>>>>>> 0.12
 	unless ($target_windows)
 	{
 		open SCRIPT,">parcels/scripts/install-$parcel" or die
@@ -217,10 +227,18 @@ $dir/${name}.gz: docs/man/${name}.gz
 EOF
 			# Releases have the docs pre-made, but users
 			# may want to rebuild them for some reason.
+<<<<<<< HEAD
 			print MAKE <<EOF;
 .PHONY: docs/man/${name}.gz
 docs/man/${name}.gz:
 	\$(MAKE) -C docs man/${name}.gz
+=======
+			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
+>>>>>>> 0.12
 
 EOF
 			push @parcel_deps, "$dir/${name}.gz";
@@ -235,24 +253,43 @@ $dir/docs/${name}.html: docs/htmlguide/man-html/${name}.html
 EOF
 			# Releases have the docs pre-made, but users
 			# may want to rebuild them for some reason.
+<<<<<<< HEAD
 			print MAKE <<EOF;
 .PHONY: docs/htmlguide/man-html/${name}.html
 docs/htmlguide/man-html/${name}.html:
 	\$(MAKE) -C docs htmlguide/man-html/${name}.html
+=======
+			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
+>>>>>>> 0.12
 
 EOF
 			push @parcel_deps, "$dir/docs/${name}.html";
 		}
 		elsif ($type eq 'subdir')
 		{
+<<<<<<< HEAD
+=======
+			shift @args;
+			my $subdir = shift @args;
+>>>>>>> 0.12
 			print MAKE <<EOF;
 .PHONY: $name-build $name-clean
 
 $name-build:
+<<<<<<< HEAD
 	\$(MAKE) -C $name
 
 $name-clean:
 	\$(MAKE) -C $name clean
+=======
+	cd $subdir; \$(MAKE) @args
+
+$name-clean:
+	cd $name; \$(MAKE) clean
+>>>>>>> 0.12
 EOF
 			push @parcel_deps, "$name-build";
 			push @clean_deps,  "$name-clean";
@@ -297,7 +334,11 @@ EOF
 
 		if ($type eq 'html')
 		{
+<<<<<<< HEAD
 			$dest = "share/doc/$version";
+=======
+			$dest = "share/doc/@PACKAGE_TARNAME@";
+>>>>>>> 0.12
 			$name = "docs/$name.html";
 		}
 
@@ -308,7 +349,11 @@ EOF
 			$name =~ s/$/\.gz/;
 		}
 
+<<<<<<< HEAD
 		if ($install and not $target_windows)
+=======
+		if ($install and not $target_windows and not $type eq "subdir")
+>>>>>>> 0.12
 		{
 			my $local_install_dir = $install_into_dir;
 			if (defined $dest)
@@ -325,7 +370,11 @@ EOF
 			}
 			print SCRIPT "mkdir -p " .
 				"\${DESTDIR}$local_install_dir/\n";
+<<<<<<< HEAD
 			print SCRIPT "install $name " .
+=======
+			print SCRIPT "$install_bin $name " .
+>>>>>>> 0.12
 				"\${DESTDIR}$local_install_dir\n";
 		}
 	}
@@ -359,22 +408,42 @@ install:
 	cat local/install.msg
 
 clean: @clean_deps
+<<<<<<< HEAD
 	\$(MAKE) -C docs clean
+=======
+	cd docs; \$(MAKE) clean
+>>>>>>> 0.12
 EOF
 
 if ($build_os eq 'CYGWIN')
 {
+<<<<<<< HEAD
 	print MAKE "\tfind release debug -type f | xargs -r rm -f\n";
 }
 else
 {
 	print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n";
+=======
+	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";
+>>>>>>> 0.12
 }
 
 for my $parcel (@parcels)
 {
+<<<<<<< HEAD
 	print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel),    "\n";
 	print MAKE "\trm -f ",  BoxPlatform::parcel_target($parcel), "\n";
+=======
+	# 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";
+>>>>>>> 0.12
 }
 
 close MAKE;
diff --git a/infrastructure/mingw/configure.sh b/infrastructure/mingw/configure.sh
index 0486b20d..5f16c558 100755
--- a/infrastructure/mingw/configure.sh
+++ b/infrastructure/mingw/configure.sh
@@ -16,12 +16,21 @@ if [ ! -r "$DEP_PATH/lib/libpcreposix.a" \
 	exit 2
 fi
 
+<<<<<<< HEAD
 export CXX="g++ -mno-cygwin"
 export LD="g++ -mno-cygwin"
 export CFLAGS="-mno-cygwin -mthreads"
 export CXXFLAGS="-mno-cygwin -mthreads"
 export LDFLAGS="-mno-cygwin -mthreads"
 export LIBS="-lcrypto -lws2_32 -lgdi32"
+=======
+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
+>>>>>>> 0.12
 
 if [ ! -x "configure" ]; then
 	if ! ./bootstrap; then
@@ -30,7 +39,16 @@ if [ ! -x "configure" ]; then
 	fi
 fi
 
+<<<<<<< HEAD
 if ! ./configure --target=i686-pc-mingw32; then
+=======
+if ! ./configure "$@" --target=i686-pc-mingw32 \
+	CFLAGS="-mno-cygwin -mthreads" \
+	CPPFLAGS="-mno-cygwin" \
+	CXXFLAGS="-mno-cygwin -mthreads" \
+	LDFLAGS="-Wl,-Bstatic -mno-cygwin -mthreads -L${DEP_PATH}/lib -L${LIBZ_PATH}"
+then
+>>>>>>> 0.12
 	echo "Error: configure failed, aborting." >&2
 	exit 1
 fi
diff --git a/infrastructure/msvc/2010/bbackupctl.vcxproj b/infrastructure/msvc/2010/bbackupctl.vcxproj
new file mode 100644
index 00000000..5751b4d8
--- /dev/null
+++ b/infrastructure/msvc/2010/bbackupctl.vcxproj
@@ -0,0 +1,109 @@
+<?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\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\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\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;%(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
new file mode 100644
index 00000000..a98bd852
--- /dev/null
+++ b/infrastructure/msvc/2010/bbackupd.vcxproj
@@ -0,0 +1,139 @@
+<?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\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\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\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;%(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
new file mode 100644
index 00000000..abaf06db
--- /dev/null
+++ b/infrastructure/msvc/2010/bbstoreaccounts.vcxproj
@@ -0,0 +1,84 @@
+<?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\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
new file mode 100644
index 00000000..7d09f75d
--- /dev/null
+++ b/infrastructure/msvc/2010/bbstored.vcxproj
@@ -0,0 +1,93 @@
+<?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\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
new file mode 100644
index 00000000..384ff58c
--- /dev/null
+++ b/infrastructure/msvc/2010/boxbackup.sln
@@ -0,0 +1,89 @@
+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
new file mode 100644
index 00000000..c419c4b7
--- /dev/null
+++ b/infrastructure/msvc/2010/boxquery.vcxproj
@@ -0,0 +1,123 @@
+<?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;$(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)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\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\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib;$(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.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
new file mode 100644
index 00000000..a644891a
--- /dev/null
+++ b/infrastructure/msvc/2010/common.vcxproj
@@ -0,0 +1,251 @@
+<?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\include;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre</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\build\vc2010\debug\pcre.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2010\debug\pcreposix.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\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\inc32;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre\pcre-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\EventWatchFilesystemObject.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\EventWatchFilesystemObject.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
new file mode 100644
index 00000000..a38b3cf5
--- /dev/null
+++ b/infrastructure/msvc/2010/libbackupclient.vcxproj
@@ -0,0 +1,94 @@
+<?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\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\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>
+    </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
new file mode 100644
index 00000000..7f83d04a
--- /dev/null
+++ b/infrastructure/msvc/2010/libbackupstore.vcxproj
@@ -0,0 +1,151 @@
+<?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\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\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>
+    </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
new file mode 100644
index 00000000..77bf8205
--- /dev/null
+++ b/infrastructure/msvc/2010/qdbm.vcxproj
@@ -0,0 +1,81 @@
+<?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
new file mode 100644
index 00000000..0c61adb3
--- /dev/null
+++ b/infrastructure/msvc/2010/win32test.vcxproj
@@ -0,0 +1,108 @@
+<?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\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\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\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;%(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/fake-config.sub.pl b/infrastructure/msvc/fake-config.sub.pl
new file mode 100644
index 00000000..fa9b6839
--- /dev/null
+++ b/infrastructure/msvc/fake-config.sub.pl
@@ -0,0 +1,18 @@
+#!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
index 12554d01..42ae4b63 100644
--- a/infrastructure/msvc/getversion.pl
+++ b/infrastructure/msvc/getversion.pl
@@ -11,9 +11,32 @@ chdir $basedir or die "$basedir: $!";
 
 require "$basedir\\infrastructure\\BoxPlatform.pm.in";
 
+<<<<<<< HEAD
 open VERSIONFILE, "> $basedir/lib/common/BoxVersion.h" 
 	or die "BoxVersion.h: $!";
 print VERSIONFILE "#define BOX_VERSION \"$BoxPlatform::product_version\"\n";
 close VERSIONFILE;
 
+=======
+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;
+>>>>>>> 0.12
 exit 0;