diff --git a/src/checkmemoryleak.h b/src/checkmemoryleak.h
index d0cbbe7e8..3215b14db 100644
--- a/src/checkmemoryleak.h
+++ b/src/checkmemoryleak.h
@@ -161,7 +161,7 @@ public:
 
     void check();
 
-#ifndef UNIT_TESTING
+#ifndef _MSC_VER
 private:
 #endif
 
diff --git a/src/tokenize.h b/src/tokenize.h
index 0e87f6a96..438fdd34b 100644
--- a/src/tokenize.h
+++ b/src/tokenize.h
@@ -112,7 +112,7 @@ public:
      */
     std::map<std::string, ClassInfo> _classInfoList;
 
-#ifndef UNIT_TESTING
+#ifndef _MSC_VER
 private:
 #endif
 
diff --git a/testrunner.vcproj b/testrunner.vcproj
index 18b9811b1..138e73dd3 100644
--- a/testrunner.vcproj
+++ b/testrunner.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="testrunner"
 	ProjectGUID="{ABA515EF-1C57-4980-8E40-2C937D212C9D}"
 	Keyword="Win32Proj"
@@ -39,7 +39,6 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="UNIT_TESTING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -111,7 +110,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="UNIT_TESTING"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"