From 311f4df4ebb40eb0ab82e068408811bfd04cbb88 Mon Sep 17 00:00:00 2001
From: Patrick Johnmeyer <pjohnmeyer@gmail.com>
Date: Fri, 23 Aug 2013 22:36:50 -0500
Subject: [PATCH] Replace absolute paths with relative paths in Visual Studio
 project files (untested).

---
 vs_projects/vs2003_x86/TestUnitTest++.vcproj  |  98 ++++++-------
 vs_projects/vs2003_x86/UnitTest++.vcproj      | 134 +++++++++---------
 vs_projects/vs2005_x64/TestUnitTest++.vcproj  |  98 ++++++-------
 vs_projects/vs2005_x64/UnitTest++.vcproj      | 134 +++++++++---------
 vs_projects/vs2005_x86/TestUnitTest++.vcproj  |  98 ++++++-------
 vs_projects/vs2005_x86/UnitTest++.vcproj      | 134 +++++++++---------
 vs_projects/vs2008_x64/TestUnitTest++.vcproj  |  98 ++++++-------
 vs_projects/vs2008_x64/UnitTest++.vcproj      | 134 +++++++++---------
 vs_projects/vs2008_x86/TestUnitTest++.vcproj  |  98 ++++++-------
 vs_projects/vs2008_x86/UnitTest++.vcproj      | 134 +++++++++---------
 vs_projects/vs2010_x64/TestUnitTest++.vcxproj |   8 +-
 vs_projects/vs2010_x64/UnitTest++.vcxproj     |   8 +-
 vs_projects/vs2010_x86/TestUnitTest++.vcxproj |   8 +-
 vs_projects/vs2010_x86/UnitTest++.vcxproj     |   8 +-
 vs_projects/vs2012_x64/TestUnitTest++.vcxproj |   8 +-
 vs_projects/vs2012_x64/UnitTest++.vcxproj     |   8 +-
 vs_projects/vs2012_x86/TestUnitTest++.vcxproj |   8 +-
 vs_projects/vs2012_x86/UnitTest++.vcxproj     |   8 +-
 18 files changed, 612 insertions(+), 612 deletions(-)

diff --git a/vs_projects/vs2003_x86/TestUnitTest++.vcproj b/vs_projects/vs2003_x86/TestUnitTest++.vcproj
index d3eea78..4cc0a43 100644
--- a/vs_projects/vs2003_x86/TestUnitTest++.vcproj
+++ b/vs_projects/vs2003_x86/TestUnitTest++.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="1"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -33,17 +33,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Debug/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2003_x86\Debug/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -64,14 +64,14 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Debug\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Debug\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2003_x86\Debug\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Debug/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2003_x86\Debug/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Debug\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2003_x86\Debug\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -84,7 +84,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="TRUE"
 				InlineFunctionExpansion="2"
@@ -95,17 +95,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Release/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2003_x86\Release/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -126,13 +126,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Release\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Release\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2003_x86\Release\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Release/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2003_x86\Release/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Release\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2003_x86\Release\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|Win32"
@@ -145,7 +145,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="TRUE"
 				InlineFunctionExpansion="1"
@@ -156,17 +156,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2003_x86\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2003_x86\MinSizeRel/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -187,13 +187,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib MinSizeRel\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\MinSizeRel\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2003_x86\MinSizeRel\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2003_x86\MinSizeRel/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2003_x86\MinSizeRel\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2003_x86\MinSizeRel\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|Win32"
@@ -206,7 +206,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="TRUE"
@@ -218,17 +218,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2003_x86\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2003_x86\RelWithDebInfo/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -249,79 +249,79 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib RelWithDebInfo\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\RelWithDebInfo\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2003_x86\RelWithDebInfo\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2003_x86\RelWithDebInfo/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2003_x86\RelWithDebInfo\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2003_x86\RelWithDebInfo\TestUnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\Main.cpp">
+				RelativePath="..\..\tests\Main.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestAssertHandler.cpp">
+				RelativePath="..\..\tests\TestAssertHandler.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCheckMacros.cpp">
+				RelativePath="..\..\tests\TestCheckMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestChecks.cpp">
+				RelativePath="..\..\tests\TestChecks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCompositeTestReporter.cpp">
+				RelativePath="..\..\tests\TestCompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCurrentTest.cpp">
+				RelativePath="..\..\tests\TestCurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestDeferredTestReporter.cpp">
+				RelativePath="..\..\tests\TestDeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestExceptions.cpp">
+				RelativePath="..\..\tests\TestExceptions.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestMemoryOutStream.cpp">
+				RelativePath="..\..\tests\TestMemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTest.cpp">
+				RelativePath="..\..\tests\TestTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestList.cpp">
+				RelativePath="..\..\tests\TestTestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestMacros.cpp">
+				RelativePath="..\..\tests\TestTestMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestResults.cpp">
+				RelativePath="..\..\tests\TestTestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestRunner.cpp">
+				RelativePath="..\..\tests\TestTestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestSuite.cpp">
+				RelativePath="..\..\tests\TestTestSuite.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraint.cpp">
+				RelativePath="..\..\tests\TestTimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraintMacro.cpp">
+				RelativePath="..\..\tests\TestTimeConstraintMacro.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestUnitTestPP.cpp">
+				RelativePath="..\..\tests\TestUnitTestPP.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestXmlTestReporter.cpp">
+				RelativePath="..\..\tests\TestXmlTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\RecordingReporter.h">
+				RelativePath="..\..\tests\RecordingReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\ScopedCurrentTest.h">
+				RelativePath="..\..\tests\ScopedCurrentTest.h">
 			</File>
 	</Files>
 	<Globals>
diff --git a/vs_projects/vs2003_x86/UnitTest++.vcproj b/vs_projects/vs2003_x86/UnitTest++.vcproj
index 652c742..6f39862 100644
--- a/vs_projects/vs2003_x86/UnitTest++.vcproj
+++ b/vs_projects/vs2003_x86/UnitTest++.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="1"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -33,17 +33,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Debug/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2003_x86\Debug/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -61,7 +61,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Debug\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2003_x86\Debug\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="TRUE"
 				InlineFunctionExpansion="2"
@@ -85,17 +85,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Release/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2003_x86\Release/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -113,7 +113,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\Release\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2003_x86\Release\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|Win32"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="TRUE"
 				InlineFunctionExpansion="1"
@@ -137,17 +137,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2003_x86\MinSizeRel/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2003_x86\MinSizeRel/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -165,7 +165,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\MinSizeRel\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2003_x86\MinSizeRel\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|Win32"
@@ -178,7 +178,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="TRUE"
@@ -190,17 +190,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2003_x86\RelWithDebInfo/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2003_x86\RelWithDebInfo/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -218,153 +218,153 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2003_x86\RelWithDebInfo\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2003_x86\RelWithDebInfo\UnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.h">
+				RelativePath="..\..\UnitTest++\AssertException.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CheckMacros.h">
+				RelativePath="..\..\UnitTest++\CheckMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.h">
+				RelativePath="..\..\UnitTest++\Checks.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.h">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Config.h">
+				RelativePath="..\..\UnitTest++\Config.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.h">
+				RelativePath="..\..\UnitTest++\CurrentTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.h">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.h">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExceptionMacros.h">
+				RelativePath="..\..\UnitTest++\ExceptionMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExecuteTest.h">
+				RelativePath="..\..\UnitTest++\ExecuteTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\HelperMacros.h">
+				RelativePath="..\..\UnitTest++\HelperMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.h">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.h">
+				RelativePath="..\..\UnitTest++\ReportAssert.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssertImpl.h">
+				RelativePath="..\..\UnitTest++\ReportAssertImpl.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.h">
+				RelativePath="..\..\UnitTest++\Test.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.h">
+				RelativePath="..\..\UnitTest++\TestDetails.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.h">
+				RelativePath="..\..\UnitTest++\TestList.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestMacros.h">
+				RelativePath="..\..\UnitTest++\TestMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.h">
+				RelativePath="..\..\UnitTest++\TestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.h">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.h">
+				RelativePath="..\..\UnitTest++\TestResults.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.h">
+				RelativePath="..\..\UnitTest++\TestRunner.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestSuite.h">
+				RelativePath="..\..\UnitTest++\TestSuite.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.h">
+				RelativePath="..\..\UnitTest++\TimeConstraint.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTest++.h">
+				RelativePath="..\..\UnitTest++\UnitTest++.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTestPP.h">
+				RelativePath="..\..\UnitTest++\UnitTestPP.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.h">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.cpp">
+				RelativePath="..\..\UnitTest++\AssertException.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.cpp">
+				RelativePath="..\..\UnitTest++\Checks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.cpp">
+				RelativePath="..\..\UnitTest++\CurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.cpp">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.cpp">
+				RelativePath="..\..\UnitTest++\ReportAssert.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.cpp">
+				RelativePath="..\..\UnitTest++\Test.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.cpp">
+				RelativePath="..\..\UnitTest++\TestDetails.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.cpp">
+				RelativePath="..\..\UnitTest++\TestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.cpp">
+				RelativePath="..\..\UnitTest++\TestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.cpp">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.cpp">
+				RelativePath="..\..\UnitTest++\TestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.cpp">
+				RelativePath="..\..\UnitTest++\TestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.cpp">
+				RelativePath="..\..\UnitTest++\TimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.cpp">
 			</File>
 		<Filter
 			Name="Win32"
 			Filter="">
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.cpp">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.cpp">
 			</File>
 		</Filter>
 	</Files>
diff --git a/vs_projects/vs2005_x64/TestUnitTest++.vcproj b/vs_projects/vs2005_x64/TestUnitTest++.vcproj
index e40a68a..ce54f3d 100644
--- a/vs_projects/vs2005_x64/TestUnitTest++.vcproj
+++ b/vs_projects/vs2005_x64/TestUnitTest++.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -34,17 +34,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Debug/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x64\Debug/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -65,14 +65,14 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:x64 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib Debug\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Debug\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2005_x64\Debug\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Debug/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2005_x64\Debug/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Debug\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2005_x64\Debug\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
@@ -85,7 +85,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="2"
@@ -96,17 +96,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Release/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x64\Release/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -127,13 +127,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:x64"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib Release\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Release\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2005_x64\Release\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Release/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2005_x64\Release/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Release\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2005_x64\Release\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|x64"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="1"
@@ -157,17 +157,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x64\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x64\MinSizeRel/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -188,13 +188,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:x64"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib MinSizeRel\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\MinSizeRel\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2005_x64\MinSizeRel\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2005_x64\MinSizeRel/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2005_x64\MinSizeRel\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2005_x64\MinSizeRel\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|x64"
@@ -207,7 +207,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="1"
@@ -219,17 +219,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x64\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x64\RelWithDebInfo/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -250,79 +250,79 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:x64 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib RelWithDebInfo\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\RelWithDebInfo\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2005_x64\RelWithDebInfo\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2005_x64\RelWithDebInfo/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2005_x64\RelWithDebInfo\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2005_x64\RelWithDebInfo\TestUnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\Main.cpp">
+				RelativePath="..\..\tests\Main.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestAssertHandler.cpp">
+				RelativePath="..\..\tests\TestAssertHandler.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCheckMacros.cpp">
+				RelativePath="..\..\tests\TestCheckMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestChecks.cpp">
+				RelativePath="..\..\tests\TestChecks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCompositeTestReporter.cpp">
+				RelativePath="..\..\tests\TestCompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCurrentTest.cpp">
+				RelativePath="..\..\tests\TestCurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestDeferredTestReporter.cpp">
+				RelativePath="..\..\tests\TestDeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestExceptions.cpp">
+				RelativePath="..\..\tests\TestExceptions.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestMemoryOutStream.cpp">
+				RelativePath="..\..\tests\TestMemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTest.cpp">
+				RelativePath="..\..\tests\TestTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestList.cpp">
+				RelativePath="..\..\tests\TestTestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestMacros.cpp">
+				RelativePath="..\..\tests\TestTestMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestResults.cpp">
+				RelativePath="..\..\tests\TestTestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestRunner.cpp">
+				RelativePath="..\..\tests\TestTestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestSuite.cpp">
+				RelativePath="..\..\tests\TestTestSuite.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraint.cpp">
+				RelativePath="..\..\tests\TestTimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraintMacro.cpp">
+				RelativePath="..\..\tests\TestTimeConstraintMacro.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestUnitTestPP.cpp">
+				RelativePath="..\..\tests\TestUnitTestPP.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestXmlTestReporter.cpp">
+				RelativePath="..\..\tests\TestXmlTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\RecordingReporter.h">
+				RelativePath="..\..\tests\RecordingReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\ScopedCurrentTest.h">
+				RelativePath="..\..\tests\ScopedCurrentTest.h">
 			</File>
 	</Files>
 	<Globals>
diff --git a/vs_projects/vs2005_x64/UnitTest++.vcproj b/vs_projects/vs2005_x64/UnitTest++.vcproj
index 382b863..9a8b47a 100644
--- a/vs_projects/vs2005_x64/UnitTest++.vcproj
+++ b/vs_projects/vs2005_x64/UnitTest++.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -34,17 +34,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Debug/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x64\Debug/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -62,7 +62,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Debug\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2005_x64\Debug\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
@@ -75,7 +75,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="2"
@@ -86,17 +86,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Release/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x64\Release/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -114,7 +114,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\Release\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2005_x64\Release\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|x64"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="1"
@@ -138,17 +138,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x64\MinSizeRel/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x64\MinSizeRel/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -166,7 +166,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\MinSizeRel\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2005_x64\MinSizeRel\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|x64"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="1"
@@ -191,17 +191,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x64\RelWithDebInfo/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x64\RelWithDebInfo/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -219,153 +219,153 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x64\RelWithDebInfo\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2005_x64\RelWithDebInfo\UnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.h">
+				RelativePath="..\..\UnitTest++\AssertException.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CheckMacros.h">
+				RelativePath="..\..\UnitTest++\CheckMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.h">
+				RelativePath="..\..\UnitTest++\Checks.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.h">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Config.h">
+				RelativePath="..\..\UnitTest++\Config.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.h">
+				RelativePath="..\..\UnitTest++\CurrentTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.h">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.h">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExceptionMacros.h">
+				RelativePath="..\..\UnitTest++\ExceptionMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExecuteTest.h">
+				RelativePath="..\..\UnitTest++\ExecuteTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\HelperMacros.h">
+				RelativePath="..\..\UnitTest++\HelperMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.h">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.h">
+				RelativePath="..\..\UnitTest++\ReportAssert.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssertImpl.h">
+				RelativePath="..\..\UnitTest++\ReportAssertImpl.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.h">
+				RelativePath="..\..\UnitTest++\Test.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.h">
+				RelativePath="..\..\UnitTest++\TestDetails.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.h">
+				RelativePath="..\..\UnitTest++\TestList.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestMacros.h">
+				RelativePath="..\..\UnitTest++\TestMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.h">
+				RelativePath="..\..\UnitTest++\TestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.h">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.h">
+				RelativePath="..\..\UnitTest++\TestResults.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.h">
+				RelativePath="..\..\UnitTest++\TestRunner.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestSuite.h">
+				RelativePath="..\..\UnitTest++\TestSuite.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.h">
+				RelativePath="..\..\UnitTest++\TimeConstraint.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTest++.h">
+				RelativePath="..\..\UnitTest++\UnitTest++.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTestPP.h">
+				RelativePath="..\..\UnitTest++\UnitTestPP.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.h">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.cpp">
+				RelativePath="..\..\UnitTest++\AssertException.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.cpp">
+				RelativePath="..\..\UnitTest++\Checks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.cpp">
+				RelativePath="..\..\UnitTest++\CurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.cpp">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.cpp">
+				RelativePath="..\..\UnitTest++\ReportAssert.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.cpp">
+				RelativePath="..\..\UnitTest++\Test.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.cpp">
+				RelativePath="..\..\UnitTest++\TestDetails.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.cpp">
+				RelativePath="..\..\UnitTest++\TestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.cpp">
+				RelativePath="..\..\UnitTest++\TestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.cpp">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.cpp">
+				RelativePath="..\..\UnitTest++\TestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.cpp">
+				RelativePath="..\..\UnitTest++\TestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.cpp">
+				RelativePath="..\..\UnitTest++\TimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.cpp">
 			</File>
 		<Filter
 			Name="Win32"
 			Filter="">
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.cpp">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.cpp">
 			</File>
 		</Filter>
 	</Files>
diff --git a/vs_projects/vs2005_x86/TestUnitTest++.vcproj b/vs_projects/vs2005_x86/TestUnitTest++.vcproj
index 522d871..7d06e22 100644
--- a/vs_projects/vs2005_x86/TestUnitTest++.vcproj
+++ b/vs_projects/vs2005_x86/TestUnitTest++.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -34,17 +34,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Debug/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x86\Debug/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -65,14 +65,14 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib Debug\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Debug\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2005_x86\Debug\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Debug/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2005_x86\Debug/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Debug\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2005_x86\Debug\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -85,7 +85,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="2"
@@ -96,17 +96,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Release/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x86\Release/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -127,13 +127,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib Release\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Release\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2005_x86\Release\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Release/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2005_x86\Release/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Release\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2005_x86\Release\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|Win32"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="1"
@@ -157,17 +157,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x86\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x86\MinSizeRel/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -188,13 +188,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib MinSizeRel\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\MinSizeRel\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2005_x86\MinSizeRel\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2005_x86\MinSizeRel/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2005_x86\MinSizeRel\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2005_x86\MinSizeRel\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|Win32"
@@ -207,7 +207,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="1"
@@ -219,17 +219,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x86\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x86\RelWithDebInfo/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -250,79 +250,79 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib RelWithDebInfo\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\RelWithDebInfo\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2005_x86\RelWithDebInfo\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2005_x86\RelWithDebInfo/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2005_x86\RelWithDebInfo\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2005_x86\RelWithDebInfo\TestUnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\Main.cpp">
+				RelativePath="..\..\tests\Main.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestAssertHandler.cpp">
+				RelativePath="..\..\tests\TestAssertHandler.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCheckMacros.cpp">
+				RelativePath="..\..\tests\TestCheckMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestChecks.cpp">
+				RelativePath="..\..\tests\TestChecks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCompositeTestReporter.cpp">
+				RelativePath="..\..\tests\TestCompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCurrentTest.cpp">
+				RelativePath="..\..\tests\TestCurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestDeferredTestReporter.cpp">
+				RelativePath="..\..\tests\TestDeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestExceptions.cpp">
+				RelativePath="..\..\tests\TestExceptions.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestMemoryOutStream.cpp">
+				RelativePath="..\..\tests\TestMemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTest.cpp">
+				RelativePath="..\..\tests\TestTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestList.cpp">
+				RelativePath="..\..\tests\TestTestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestMacros.cpp">
+				RelativePath="..\..\tests\TestTestMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestResults.cpp">
+				RelativePath="..\..\tests\TestTestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestRunner.cpp">
+				RelativePath="..\..\tests\TestTestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestSuite.cpp">
+				RelativePath="..\..\tests\TestTestSuite.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraint.cpp">
+				RelativePath="..\..\tests\TestTimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraintMacro.cpp">
+				RelativePath="..\..\tests\TestTimeConstraintMacro.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestUnitTestPP.cpp">
+				RelativePath="..\..\tests\TestUnitTestPP.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestXmlTestReporter.cpp">
+				RelativePath="..\..\tests\TestXmlTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\RecordingReporter.h">
+				RelativePath="..\..\tests\RecordingReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\ScopedCurrentTest.h">
+				RelativePath="..\..\tests\ScopedCurrentTest.h">
 			</File>
 	</Files>
 	<Globals>
diff --git a/vs_projects/vs2005_x86/UnitTest++.vcproj b/vs_projects/vs2005_x86/UnitTest++.vcproj
index a7e5be7..3182eb8 100644
--- a/vs_projects/vs2005_x86/UnitTest++.vcproj
+++ b/vs_projects/vs2005_x86/UnitTest++.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -34,17 +34,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Debug/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x86\Debug/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -62,7 +62,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Debug\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2005_x86\Debug\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -75,7 +75,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="2"
@@ -86,17 +86,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Release/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x86\Release/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -114,7 +114,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\Release\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2005_x86\Release\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|Win32"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="1"
@@ -138,17 +138,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x86\MinSizeRel/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x86\MinSizeRel/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -166,7 +166,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\MinSizeRel\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2005_x86\MinSizeRel\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|Win32"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="1"
@@ -191,17 +191,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2005_x86\RelWithDebInfo/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2005_x86\RelWithDebInfo/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -219,153 +219,153 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2005_x86\RelWithDebInfo\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2005_x86\RelWithDebInfo\UnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.h">
+				RelativePath="..\..\UnitTest++\AssertException.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CheckMacros.h">
+				RelativePath="..\..\UnitTest++\CheckMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.h">
+				RelativePath="..\..\UnitTest++\Checks.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.h">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Config.h">
+				RelativePath="..\..\UnitTest++\Config.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.h">
+				RelativePath="..\..\UnitTest++\CurrentTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.h">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.h">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExceptionMacros.h">
+				RelativePath="..\..\UnitTest++\ExceptionMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExecuteTest.h">
+				RelativePath="..\..\UnitTest++\ExecuteTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\HelperMacros.h">
+				RelativePath="..\..\UnitTest++\HelperMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.h">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.h">
+				RelativePath="..\..\UnitTest++\ReportAssert.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssertImpl.h">
+				RelativePath="..\..\UnitTest++\ReportAssertImpl.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.h">
+				RelativePath="..\..\UnitTest++\Test.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.h">
+				RelativePath="..\..\UnitTest++\TestDetails.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.h">
+				RelativePath="..\..\UnitTest++\TestList.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestMacros.h">
+				RelativePath="..\..\UnitTest++\TestMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.h">
+				RelativePath="..\..\UnitTest++\TestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.h">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.h">
+				RelativePath="..\..\UnitTest++\TestResults.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.h">
+				RelativePath="..\..\UnitTest++\TestRunner.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestSuite.h">
+				RelativePath="..\..\UnitTest++\TestSuite.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.h">
+				RelativePath="..\..\UnitTest++\TimeConstraint.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTest++.h">
+				RelativePath="..\..\UnitTest++\UnitTest++.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTestPP.h">
+				RelativePath="..\..\UnitTest++\UnitTestPP.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.h">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.cpp">
+				RelativePath="..\..\UnitTest++\AssertException.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.cpp">
+				RelativePath="..\..\UnitTest++\Checks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.cpp">
+				RelativePath="..\..\UnitTest++\CurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.cpp">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.cpp">
+				RelativePath="..\..\UnitTest++\ReportAssert.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.cpp">
+				RelativePath="..\..\UnitTest++\Test.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.cpp">
+				RelativePath="..\..\UnitTest++\TestDetails.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.cpp">
+				RelativePath="..\..\UnitTest++\TestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.cpp">
+				RelativePath="..\..\UnitTest++\TestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.cpp">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.cpp">
+				RelativePath="..\..\UnitTest++\TestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.cpp">
+				RelativePath="..\..\UnitTest++\TestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.cpp">
+				RelativePath="..\..\UnitTest++\TimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.cpp">
 			</File>
 		<Filter
 			Name="Win32"
 			Filter="">
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.cpp">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.cpp">
 			</File>
 		</Filter>
 	</Files>
diff --git a/vs_projects/vs2008_x64/TestUnitTest++.vcproj b/vs_projects/vs2008_x64/TestUnitTest++.vcproj
index c124d92..a9421ba 100644
--- a/vs_projects/vs2008_x64/TestUnitTest++.vcproj
+++ b/vs_projects/vs2008_x64/TestUnitTest++.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -34,17 +34,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Debug/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x64\Debug/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -65,14 +65,14 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:x64 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib Debug\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Debug\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2008_x64\Debug\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Debug/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2008_x64\Debug/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Debug\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2008_x64\Debug\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
@@ -85,7 +85,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="2"
@@ -96,17 +96,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Release/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x64\Release/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -127,13 +127,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:x64"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib Release\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Release\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2008_x64\Release\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Release/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2008_x64\Release/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Release\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2008_x64\Release\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|x64"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="1"
@@ -157,17 +157,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x64\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x64\MinSizeRel/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -188,13 +188,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:x64"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib MinSizeRel\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\MinSizeRel\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2008_x64\MinSizeRel\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2008_x64\MinSizeRel/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2008_x64\MinSizeRel\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2008_x64\MinSizeRel\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|x64"
@@ -207,7 +207,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="1"
@@ -219,17 +219,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x64\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x64\RelWithDebInfo/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -250,79 +250,79 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:x64 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib RelWithDebInfo\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\RelWithDebInfo\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2008_x64\RelWithDebInfo\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2008_x64\RelWithDebInfo/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2008_x64\RelWithDebInfo\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2008_x64\RelWithDebInfo\TestUnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\Main.cpp">
+				RelativePath="..\..\tests\Main.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestAssertHandler.cpp">
+				RelativePath="..\..\tests\TestAssertHandler.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCheckMacros.cpp">
+				RelativePath="..\..\tests\TestCheckMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestChecks.cpp">
+				RelativePath="..\..\tests\TestChecks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCompositeTestReporter.cpp">
+				RelativePath="..\..\tests\TestCompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCurrentTest.cpp">
+				RelativePath="..\..\tests\TestCurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestDeferredTestReporter.cpp">
+				RelativePath="..\..\tests\TestDeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestExceptions.cpp">
+				RelativePath="..\..\tests\TestExceptions.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestMemoryOutStream.cpp">
+				RelativePath="..\..\tests\TestMemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTest.cpp">
+				RelativePath="..\..\tests\TestTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestList.cpp">
+				RelativePath="..\..\tests\TestTestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestMacros.cpp">
+				RelativePath="..\..\tests\TestTestMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestResults.cpp">
+				RelativePath="..\..\tests\TestTestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestRunner.cpp">
+				RelativePath="..\..\tests\TestTestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestSuite.cpp">
+				RelativePath="..\..\tests\TestTestSuite.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraint.cpp">
+				RelativePath="..\..\tests\TestTimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraintMacro.cpp">
+				RelativePath="..\..\tests\TestTimeConstraintMacro.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestUnitTestPP.cpp">
+				RelativePath="..\..\tests\TestUnitTestPP.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestXmlTestReporter.cpp">
+				RelativePath="..\..\tests\TestXmlTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\RecordingReporter.h">
+				RelativePath="..\..\tests\RecordingReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\ScopedCurrentTest.h">
+				RelativePath="..\..\tests\ScopedCurrentTest.h">
 			</File>
 	</Files>
 	<Globals>
diff --git a/vs_projects/vs2008_x64/UnitTest++.vcproj b/vs_projects/vs2008_x64/UnitTest++.vcproj
index e1ab1bd..5e1bf77 100644
--- a/vs_projects/vs2008_x64/UnitTest++.vcproj
+++ b/vs_projects/vs2008_x64/UnitTest++.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -34,17 +34,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Debug/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x64\Debug/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -62,7 +62,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Debug\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2008_x64\Debug\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
@@ -75,7 +75,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="2"
@@ -86,17 +86,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Release/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x64\Release/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -114,7 +114,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\Release\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2008_x64\Release\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|x64"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="1"
@@ -138,17 +138,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x64\MinSizeRel/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x64\MinSizeRel/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -166,7 +166,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\MinSizeRel\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2008_x64\MinSizeRel\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|x64"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="1"
@@ -191,17 +191,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x64\RelWithDebInfo/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x64\RelWithDebInfo/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="3"
 				GenerateStublessProxies="TRUE"
@@ -219,153 +219,153 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x64\RelWithDebInfo\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2008_x64\RelWithDebInfo\UnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.h">
+				RelativePath="..\..\UnitTest++\AssertException.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CheckMacros.h">
+				RelativePath="..\..\UnitTest++\CheckMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.h">
+				RelativePath="..\..\UnitTest++\Checks.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.h">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Config.h">
+				RelativePath="..\..\UnitTest++\Config.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.h">
+				RelativePath="..\..\UnitTest++\CurrentTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.h">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.h">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExceptionMacros.h">
+				RelativePath="..\..\UnitTest++\ExceptionMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExecuteTest.h">
+				RelativePath="..\..\UnitTest++\ExecuteTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\HelperMacros.h">
+				RelativePath="..\..\UnitTest++\HelperMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.h">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.h">
+				RelativePath="..\..\UnitTest++\ReportAssert.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssertImpl.h">
+				RelativePath="..\..\UnitTest++\ReportAssertImpl.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.h">
+				RelativePath="..\..\UnitTest++\Test.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.h">
+				RelativePath="..\..\UnitTest++\TestDetails.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.h">
+				RelativePath="..\..\UnitTest++\TestList.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestMacros.h">
+				RelativePath="..\..\UnitTest++\TestMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.h">
+				RelativePath="..\..\UnitTest++\TestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.h">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.h">
+				RelativePath="..\..\UnitTest++\TestResults.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.h">
+				RelativePath="..\..\UnitTest++\TestRunner.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestSuite.h">
+				RelativePath="..\..\UnitTest++\TestSuite.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.h">
+				RelativePath="..\..\UnitTest++\TimeConstraint.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTest++.h">
+				RelativePath="..\..\UnitTest++\UnitTest++.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTestPP.h">
+				RelativePath="..\..\UnitTest++\UnitTestPP.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.h">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.cpp">
+				RelativePath="..\..\UnitTest++\AssertException.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.cpp">
+				RelativePath="..\..\UnitTest++\Checks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.cpp">
+				RelativePath="..\..\UnitTest++\CurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.cpp">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.cpp">
+				RelativePath="..\..\UnitTest++\ReportAssert.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.cpp">
+				RelativePath="..\..\UnitTest++\Test.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.cpp">
+				RelativePath="..\..\UnitTest++\TestDetails.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.cpp">
+				RelativePath="..\..\UnitTest++\TestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.cpp">
+				RelativePath="..\..\UnitTest++\TestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.cpp">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.cpp">
+				RelativePath="..\..\UnitTest++\TestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.cpp">
+				RelativePath="..\..\UnitTest++\TestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.cpp">
+				RelativePath="..\..\UnitTest++\TimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.cpp">
 			</File>
 		<Filter
 			Name="Win32"
 			Filter="">
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.cpp">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.cpp">
 			</File>
 		</Filter>
 	</Files>
diff --git a/vs_projects/vs2008_x86/TestUnitTest++.vcproj b/vs_projects/vs2008_x86/TestUnitTest++.vcproj
index 9700001..6bdee7c 100644
--- a/vs_projects/vs2008_x86/TestUnitTest++.vcproj
+++ b/vs_projects/vs2008_x86/TestUnitTest++.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -34,17 +34,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Debug/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x86\Debug/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -65,14 +65,14 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib Debug\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Debug\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2008_x86\Debug\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Debug/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2008_x86\Debug/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Debug\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2008_x86\Debug\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -85,7 +85,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="2"
@@ -96,17 +96,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Release/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x86\Release/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -127,13 +127,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib Release\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Release\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2008_x86\Release\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Release/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2008_x86\Release/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Release\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2008_x86\Release\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|Win32"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="1"
@@ -157,17 +157,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x86\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x86\MinSizeRel/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -188,13 +188,13 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib MinSizeRel\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\MinSizeRel\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2008_x86\MinSizeRel\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\MinSizeRel/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2008_x86\MinSizeRel/TestUnitTest++.pdb"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2008_x86\MinSizeRel\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2008_x86\MinSizeRel\TestUnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|Win32"
@@ -207,7 +207,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="1"
@@ -219,17 +219,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x86\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x86\RelWithDebInfo/TestUnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -250,79 +250,79 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
 				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib RelWithDebInfo\UnitTest++.lib "
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\RelWithDebInfo\TestUnitTest++.exe"
+				OutputFile="..\..\vs_projects\vs2008_x86\RelWithDebInfo\TestUnitTest++.exe"
 				Version="0.0"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\RelWithDebInfo/TestUnitTest++.pdb"
+				ProgramDatabaseFile="..\..\vs_projects\vs2008_x86\RelWithDebInfo/TestUnitTest++.pdb"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				ImportLibrary="U:\unittest-cpp-pj\vs_projects\vs2008_x86\RelWithDebInfo\TestUnitTest++.lib"/>
+				ImportLibrary="..\..\vs_projects\vs2008_x86\RelWithDebInfo\TestUnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\Main.cpp">
+				RelativePath="..\..\tests\Main.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestAssertHandler.cpp">
+				RelativePath="..\..\tests\TestAssertHandler.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCheckMacros.cpp">
+				RelativePath="..\..\tests\TestCheckMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestChecks.cpp">
+				RelativePath="..\..\tests\TestChecks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCompositeTestReporter.cpp">
+				RelativePath="..\..\tests\TestCompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestCurrentTest.cpp">
+				RelativePath="..\..\tests\TestCurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestDeferredTestReporter.cpp">
+				RelativePath="..\..\tests\TestDeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestExceptions.cpp">
+				RelativePath="..\..\tests\TestExceptions.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestMemoryOutStream.cpp">
+				RelativePath="..\..\tests\TestMemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTest.cpp">
+				RelativePath="..\..\tests\TestTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestList.cpp">
+				RelativePath="..\..\tests\TestTestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestMacros.cpp">
+				RelativePath="..\..\tests\TestTestMacros.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestResults.cpp">
+				RelativePath="..\..\tests\TestTestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestRunner.cpp">
+				RelativePath="..\..\tests\TestTestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTestSuite.cpp">
+				RelativePath="..\..\tests\TestTestSuite.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraint.cpp">
+				RelativePath="..\..\tests\TestTimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestTimeConstraintMacro.cpp">
+				RelativePath="..\..\tests\TestTimeConstraintMacro.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestUnitTestPP.cpp">
+				RelativePath="..\..\tests\TestUnitTestPP.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\TestXmlTestReporter.cpp">
+				RelativePath="..\..\tests\TestXmlTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\RecordingReporter.h">
+				RelativePath="..\..\tests\RecordingReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\tests\ScopedCurrentTest.h">
+				RelativePath="..\..\tests\ScopedCurrentTest.h">
 			</File>
 	</Files>
 	<Globals>
diff --git a/vs_projects/vs2008_x86/UnitTest++.vcproj b/vs_projects/vs2008_x86/UnitTest++.vcproj
index 95ae6cf..3e2fe4a 100644
--- a/vs_projects/vs2008_x86/UnitTest++.vcproj
+++ b/vs_projects/vs2008_x86/UnitTest++.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -34,17 +34,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"
 				AssemblerListingLocation="Debug"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Debug/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x86\Debug/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -62,7 +62,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Debug\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2008_x86\Debug\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -75,7 +75,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="2"
@@ -86,17 +86,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"
 				AssemblerListingLocation="Release"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Release/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x86\Release/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -114,7 +114,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\Release\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2008_x86\Release\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="MinSizeRel|Win32"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				ExceptionHandling="1"
 				InlineFunctionExpansion="1"
@@ -138,17 +138,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				AssemblerListingLocation="MinSizeRel"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x86\MinSizeRel/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x86\MinSizeRel/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -166,7 +166,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\MinSizeRel\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2008_x86\MinSizeRel\UnitTest++.lib"/>
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|Win32"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				ExceptionHandling="1"
@@ -191,17 +191,17 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				AssemblerListingLocation="RelWithDebInfo"
 				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="U:\unittest-cpp-pj\vs_projects\vs2008_x86\RelWithDebInfo/UnitTest++.pdb"
+				ProgramDataBaseFileName="..\..\vs_projects\vs2008_x86\RelWithDebInfo/UnitTest++.pdb"
 />
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
-				AdditionalIncludeDirectories="U:\unittest-cpp-pj\.;"
+				AdditionalIncludeDirectories="..\..\.;"
 				MkTypLibCompatible="FALSE"
 				TargetEnvironment="1"
 				GenerateStublessProxies="TRUE"
@@ -219,153 +219,153 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="U:\unittest-cpp-pj\vs_projects\vs2008_x86\RelWithDebInfo\UnitTest++.lib"/>
+				OutputFile="..\..\vs_projects\vs2008_x86\RelWithDebInfo\UnitTest++.lib"/>
 		</Configuration>
 	</Configurations>
 	<Files>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.h">
+				RelativePath="..\..\UnitTest++\AssertException.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CheckMacros.h">
+				RelativePath="..\..\UnitTest++\CheckMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.h">
+				RelativePath="..\..\UnitTest++\Checks.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.h">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Config.h">
+				RelativePath="..\..\UnitTest++\Config.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.h">
+				RelativePath="..\..\UnitTest++\CurrentTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.h">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.h">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExceptionMacros.h">
+				RelativePath="..\..\UnitTest++\ExceptionMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ExecuteTest.h">
+				RelativePath="..\..\UnitTest++\ExecuteTest.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\HelperMacros.h">
+				RelativePath="..\..\UnitTest++\HelperMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.h">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.h">
+				RelativePath="..\..\UnitTest++\ReportAssert.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssertImpl.h">
+				RelativePath="..\..\UnitTest++\ReportAssertImpl.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.h">
+				RelativePath="..\..\UnitTest++\Test.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.h">
+				RelativePath="..\..\UnitTest++\TestDetails.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.h">
+				RelativePath="..\..\UnitTest++\TestList.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestMacros.h">
+				RelativePath="..\..\UnitTest++\TestMacros.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.h">
+				RelativePath="..\..\UnitTest++\TestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.h">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.h">
+				RelativePath="..\..\UnitTest++\TestResults.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.h">
+				RelativePath="..\..\UnitTest++\TestRunner.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestSuite.h">
+				RelativePath="..\..\UnitTest++\TestSuite.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.h">
+				RelativePath="..\..\UnitTest++\TimeConstraint.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTest++.h">
+				RelativePath="..\..\UnitTest++\UnitTest++.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\UnitTestPP.h">
+				RelativePath="..\..\UnitTest++\UnitTestPP.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.h">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\AssertException.cpp">
+				RelativePath="..\..\UnitTest++\AssertException.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Checks.cpp">
+				RelativePath="..\..\UnitTest++\Checks.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CompositeTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\CompositeTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\CurrentTest.cpp">
+				RelativePath="..\..\UnitTest++\CurrentTest.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\DeferredTestResult.cpp">
+				RelativePath="..\..\UnitTest++\DeferredTestResult.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\MemoryOutStream.cpp">
+				RelativePath="..\..\UnitTest++\MemoryOutStream.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\ReportAssert.cpp">
+				RelativePath="..\..\UnitTest++\ReportAssert.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Test.cpp">
+				RelativePath="..\..\UnitTest++\Test.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestDetails.cpp">
+				RelativePath="..\..\UnitTest++\TestDetails.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestList.cpp">
+				RelativePath="..\..\UnitTest++\TestList.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporter.cpp">
+				RelativePath="..\..\UnitTest++\TestReporter.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestReporterStdout.cpp">
+				RelativePath="..\..\UnitTest++\TestReporterStdout.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestResults.cpp">
+				RelativePath="..\..\UnitTest++\TestResults.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TestRunner.cpp">
+				RelativePath="..\..\UnitTest++\TestRunner.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\TimeConstraint.cpp">
+				RelativePath="..\..\UnitTest++\TimeConstraint.cpp">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\XmlTestReporter.cpp">
+				RelativePath="..\..\UnitTest++\XmlTestReporter.cpp">
 			</File>
 		<Filter
 			Name="Win32"
 			Filter="">
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.h">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.h">
 			</File>
 			<File
-				RelativePath="U:\unittest-cpp-pj\UnitTest++\Win32\TimeHelpers.cpp">
+				RelativePath="..\..\UnitTest++\Win32\TimeHelpers.cpp">
 			</File>
 		</Filter>
 	</Files>
diff --git a/vs_projects/vs2010_x64/TestUnitTest++.vcxproj b/vs_projects/vs2010_x64/TestUnitTest++.vcxproj
index 231b6ad..ca55cae 100644
--- a/vs_projects/vs2010_x64/TestUnitTest++.vcxproj
+++ b/vs_projects/vs2010_x64/TestUnitTest++.vcxproj
@@ -53,25 +53,25 @@
   <PropertyGroup Label="UserMacros" />
     <PropertyGroup>
       <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">U:\unittest-cpp-pj\vs_projects\vs2010_x64\Debug\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\vs_projects\vs2010_x64\Debug\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TestUnitTest++.dir\Debug\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">U:\unittest-cpp-pj\vs_projects\vs2010_x64\Release\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\vs_projects\vs2010_x64\Release\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TestUnitTest++.dir\Release\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">U:\unittest-cpp-pj\vs_projects\vs2010_x64\MinSizeRel\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">..\..\vs_projects\vs2010_x64\MinSizeRel\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">TestUnitTest++.dir\MinSizeRel\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">U:\unittest-cpp-pj\vs_projects\vs2010_x64\RelWithDebInfo\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">..\..\vs_projects\vs2010_x64\RelWithDebInfo\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">TestUnitTest++.dir\RelWithDebInfo\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">.exe</TargetExt>
diff --git a/vs_projects/vs2010_x64/UnitTest++.vcxproj b/vs_projects/vs2010_x64/UnitTest++.vcxproj
index b846709..029c9ef 100644
--- a/vs_projects/vs2010_x64/UnitTest++.vcxproj
+++ b/vs_projects/vs2010_x64/UnitTest++.vcxproj
@@ -53,19 +53,19 @@
   <PropertyGroup Label="UserMacros" />
     <PropertyGroup>
       <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">U:\unittest-cpp-pj\vs_projects\vs2010_x64\Debug\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\vs_projects\vs2010_x64\Debug\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnitTest++.dir\Debug\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">U:\unittest-cpp-pj\vs_projects\vs2010_x64\Release\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\vs_projects\vs2010_x64\Release\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnitTest++.dir\Release\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">U:\unittest-cpp-pj\vs_projects\vs2010_x64\MinSizeRel\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">..\..\vs_projects\vs2010_x64\MinSizeRel\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">UnitTest++.dir\MinSizeRel\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">U:\unittest-cpp-pj\vs_projects\vs2010_x64\RelWithDebInfo\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">..\..\vs_projects\vs2010_x64\RelWithDebInfo\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">UnitTest++.dir\RelWithDebInfo\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">.lib</TargetExt>
diff --git a/vs_projects/vs2010_x86/TestUnitTest++.vcxproj b/vs_projects/vs2010_x86/TestUnitTest++.vcxproj
index 7e58525..137b0a5 100644
--- a/vs_projects/vs2010_x86/TestUnitTest++.vcxproj
+++ b/vs_projects/vs2010_x86/TestUnitTest++.vcxproj
@@ -53,25 +53,25 @@
   <PropertyGroup Label="UserMacros" />
     <PropertyGroup>
       <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">U:\unittest-cpp-pj\vs_projects\vs2010_x86\Debug\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\vs_projects\vs2010_x86\Debug\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TestUnitTest++.dir\Debug\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">U:\unittest-cpp-pj\vs_projects\vs2010_x86\Release\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\vs_projects\vs2010_x86\Release\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TestUnitTest++.dir\Release\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">U:\unittest-cpp-pj\vs_projects\vs2010_x86\MinSizeRel\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">..\..\vs_projects\vs2010_x86\MinSizeRel\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">TestUnitTest++.dir\MinSizeRel\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">U:\unittest-cpp-pj\vs_projects\vs2010_x86\RelWithDebInfo\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">..\..\vs_projects\vs2010_x86\RelWithDebInfo\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">TestUnitTest++.dir\RelWithDebInfo\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.exe</TargetExt>
diff --git a/vs_projects/vs2010_x86/UnitTest++.vcxproj b/vs_projects/vs2010_x86/UnitTest++.vcxproj
index d767591..11f8996 100644
--- a/vs_projects/vs2010_x86/UnitTest++.vcxproj
+++ b/vs_projects/vs2010_x86/UnitTest++.vcxproj
@@ -53,19 +53,19 @@
   <PropertyGroup Label="UserMacros" />
     <PropertyGroup>
       <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">U:\unittest-cpp-pj\vs_projects\vs2010_x86\Debug\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\vs_projects\vs2010_x86\Debug\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnitTest++.dir\Debug\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">U:\unittest-cpp-pj\vs_projects\vs2010_x86\Release\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\vs_projects\vs2010_x86\Release\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnitTest++.dir\Release\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">U:\unittest-cpp-pj\vs_projects\vs2010_x86\MinSizeRel\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">..\..\vs_projects\vs2010_x86\MinSizeRel\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">UnitTest++.dir\MinSizeRel\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">U:\unittest-cpp-pj\vs_projects\vs2010_x86\RelWithDebInfo\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">..\..\vs_projects\vs2010_x86\RelWithDebInfo\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">UnitTest++.dir\RelWithDebInfo\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.lib</TargetExt>
diff --git a/vs_projects/vs2012_x64/TestUnitTest++.vcxproj b/vs_projects/vs2012_x64/TestUnitTest++.vcxproj
index 17aef9f..cf04ea0 100644
--- a/vs_projects/vs2012_x64/TestUnitTest++.vcxproj
+++ b/vs_projects/vs2012_x64/TestUnitTest++.vcxproj
@@ -57,25 +57,25 @@
   <PropertyGroup Label="UserMacros" />
     <PropertyGroup>
       <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">U:\unittest-cpp-pj\vs_projects\vs2012_x64\Debug\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\vs_projects\vs2012_x64\Debug\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TestUnitTest++.dir\Debug\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">U:\unittest-cpp-pj\vs_projects\vs2012_x64\Release\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\vs_projects\vs2012_x64\Release\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TestUnitTest++.dir\Release\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">U:\unittest-cpp-pj\vs_projects\vs2012_x64\MinSizeRel\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">..\..\vs_projects\vs2012_x64\MinSizeRel\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">TestUnitTest++.dir\MinSizeRel\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">.exe</TargetExt>
       <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkIncremental>
       <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">true</GenerateManifest>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">U:\unittest-cpp-pj\vs_projects\vs2012_x64\RelWithDebInfo\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">..\..\vs_projects\vs2012_x64\RelWithDebInfo\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">TestUnitTest++.dir\RelWithDebInfo\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">TestUnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">.exe</TargetExt>
diff --git a/vs_projects/vs2012_x64/UnitTest++.vcxproj b/vs_projects/vs2012_x64/UnitTest++.vcxproj
index 7ea763f..3285c87 100644
--- a/vs_projects/vs2012_x64/UnitTest++.vcxproj
+++ b/vs_projects/vs2012_x64/UnitTest++.vcxproj
@@ -57,19 +57,19 @@
   <PropertyGroup Label="UserMacros" />
     <PropertyGroup>
       <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">U:\unittest-cpp-pj\vs_projects\vs2012_x64\Debug\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\vs_projects\vs2012_x64\Debug\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnitTest++.dir\Debug\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">U:\unittest-cpp-pj\vs_projects\vs2012_x64\Release\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\vs_projects\vs2012_x64\Release\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnitTest++.dir\Release\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">U:\unittest-cpp-pj\vs_projects\vs2012_x64\MinSizeRel\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">..\..\vs_projects\vs2012_x64\MinSizeRel\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">UnitTest++.dir\MinSizeRel\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">U:\unittest-cpp-pj\vs_projects\vs2012_x64\RelWithDebInfo\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">..\..\vs_projects\vs2012_x64\RelWithDebInfo\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">UnitTest++.dir\RelWithDebInfo\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">.lib</TargetExt>
diff --git a/vs_projects/vs2012_x86/TestUnitTest++.vcxproj b/vs_projects/vs2012_x86/TestUnitTest++.vcxproj
index f12b1da..aa63b05 100644
--- a/vs_projects/vs2012_x86/TestUnitTest++.vcxproj
+++ b/vs_projects/vs2012_x86/TestUnitTest++.vcxproj
@@ -58,25 +58,25 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">U:\unittest-cpp-pj\vs_projects\vs2012_x86\Debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\vs_projects\vs2012_x86\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TestUnitTest++.dir\Debug\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TestUnitTest++</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">U:\unittest-cpp-pj\vs_projects\vs2012_x86\Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\vs_projects\vs2012_x86\Release\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TestUnitTest++.dir\Release\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TestUnitTest++</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">U:\unittest-cpp-pj\vs_projects\vs2012_x86\MinSizeRel\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">..\..\vs_projects\vs2012_x86\MinSizeRel\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">TestUnitTest++.dir\MinSizeRel\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">TestUnitTest++</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">U:\unittest-cpp-pj\vs_projects\vs2012_x86\RelWithDebInfo\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">..\..\vs_projects\vs2012_x86\RelWithDebInfo\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">TestUnitTest++.dir\RelWithDebInfo\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">TestUnitTest++</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.exe</TargetExt>
diff --git a/vs_projects/vs2012_x86/UnitTest++.vcxproj b/vs_projects/vs2012_x86/UnitTest++.vcxproj
index 471eaaa..aab2c24 100644
--- a/vs_projects/vs2012_x86/UnitTest++.vcxproj
+++ b/vs_projects/vs2012_x86/UnitTest++.vcxproj
@@ -57,19 +57,19 @@
   <PropertyGroup Label="UserMacros" />
     <PropertyGroup>
       <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">U:\unittest-cpp-pj\vs_projects\vs2012_x86\Debug\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\vs_projects\vs2012_x86\Debug\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnitTest++.dir\Debug\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">U:\unittest-cpp-pj\vs_projects\vs2012_x86\Release\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\vs_projects\vs2012_x86\Release\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnitTest++.dir\Release\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">U:\unittest-cpp-pj\vs_projects\vs2012_x86\MinSizeRel\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">..\..\vs_projects\vs2012_x86\MinSizeRel\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">UnitTest++.dir\MinSizeRel\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.lib</TargetExt>
-      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">U:\unittest-cpp-pj\vs_projects\vs2012_x86\RelWithDebInfo\</OutDir>
+      <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">..\..\vs_projects\vs2012_x86\RelWithDebInfo\</OutDir>
       <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">UnitTest++.dir\RelWithDebInfo\</IntDir>
       <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">UnitTest++</TargetName>
       <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.lib</TargetExt>