diff --git a/testrunner.vcproj b/testrunner.vcproj
index e5baeb4ac..bcc905124 100644
--- a/testrunner.vcproj
+++ b/testrunner.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
+				PreprocessorDefinitions="UNIT_TESTING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -110,7 +110,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
+				PreprocessorDefinitions="UNIT_TESTING"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -174,6 +174,10 @@
 				RelativePath=".\CheckClass.h"
 				>
 			</File>
+			<File
+				RelativePath=".\checkfunctionusage.h"
+				>
+			</File>
 			<File
 				RelativePath=".\CheckHeaders.h"
 				>
@@ -186,10 +190,6 @@
 				RelativePath=".\CheckOther.h"
 				>
 			</File>
-			<File
-				RelativePath=".\CommonCheck.h"
-				>
-			</File>
 			<File
 				RelativePath=".\cppcheck.h"
 				>
@@ -210,6 +210,10 @@
 				RelativePath=".\testsuite.h"
 				>
 			</File>
+			<File
+				RelativePath=".\token.h"
+				>
+			</File>
 			<File
 				RelativePath=".\tokenize.h"
 				>
@@ -234,6 +238,10 @@
 				RelativePath=".\CheckClass.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\checkfunctionusage.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\CheckHeaders.cpp"
 				>
@@ -246,10 +254,6 @@
 				RelativePath=".\CheckOther.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\CommonCheck.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\cppcheck.cpp"
 				>
@@ -274,6 +278,10 @@
 				RelativePath=".\testcharvar.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\testclass.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\testconstructors.cpp"
 				>
@@ -282,6 +290,14 @@
 				RelativePath=".\testdivision.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\testfilelister.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\testfunctionusage.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\testincompletestatement.cpp"
 				>
@@ -290,26 +306,54 @@
 				RelativePath=".\testmemleak.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\testmemleakmp.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\testother.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\testpreprocessor.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\testredundantif.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\testrunner.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\testsimplifytokens.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\testsuite.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\testtoken.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\testtokenize.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\testunusedprivfunc.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\testunusedvar.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\token.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\tokenize.cpp"
 				>