diff --git a/cppcheck.sln b/cppcheck.sln
index 6dbea948d..b5c8ad9a6 100644
--- a/cppcheck.sln
+++ b/cppcheck.sln
@@ -1,11 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcproj", "{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{BA98E531-D8B3-39CB-8171-064854404B81}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib", "lib\lib.vcproj", "{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -20,10 +18,6 @@ Global
 		{BA98E531-D8B3-39CB-8171-064854404B81}.Debug|Win32.Build.0 = Debug|Win32
 		{BA98E531-D8B3-39CB-8171-064854404B81}.Release|Win32.ActiveCfg = Release|Win32
 		{BA98E531-D8B3-39CB-8171-064854404B81}.Release|Win32.Build.0 = Release|Win32
-		{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}.Debug|Win32.Build.0 = Debug|Win32
-		{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}.Release|Win32.ActiveCfg = Release|Win32
-		{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/test/test.vcproj b/test/test.vcproj
index c3f4a000c..b427b4fd4 100755
--- a/test/test.vcproj
+++ b/test/test.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="test"
 	ProjectGUID="{BA98E531-D8B3-39CB-8171-064854404B81}"
 	Keyword="Qt4VSv1.0"
@@ -210,6 +210,10 @@
 				RelativePath="..\lib\checkmemoryleak.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\lib\checkobsoletefunctions.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\lib\checkother.cpp"
 				>
@@ -242,6 +246,10 @@
 				RelativePath="..\lib\filelister.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\lib\filelister_unix.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\lib\filelister_win32.cpp"
 				>
@@ -263,19 +271,19 @@
 				>
 			</File>
 			<File
-				RelativePath="testautovariables.cpp"
+				RelativePath=".\testautovariables.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testbufferoverrun.cpp"
+				RelativePath=".\testbufferoverrun.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testcharvar.cpp"
+				RelativePath=".\testcharvar.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testclass.cpp"
+				RelativePath=".\testclass.cpp"
 				>
 			</File>
 			<File
@@ -283,83 +291,95 @@
 				>
 			</File>
 			<File
-				RelativePath="testconstructors.cpp"
+				RelativePath=".\testconstructors.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testcppcheck.cpp"
+				RelativePath=".\testcppcheck.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testdivision.cpp"
+				RelativePath=".\testdivision.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testexceptionsafety.cpp"
+				RelativePath=".\testexceptionsafety.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testfilelister.cpp"
+				RelativePath=".\testfilelister.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testincompletestatement.cpp"
+				RelativePath=".\testincompletestatement.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testmathlib.cpp"
+				RelativePath=".\testmathlib.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testmemleak.cpp"
+				RelativePath=".\testmemleak.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testother.cpp"
+				RelativePath=".\testobsoletefunctions.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testpreprocessor.cpp"
+				RelativePath=".\testother.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testredundantif.cpp"
+				RelativePath=".\testpreprocessor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testrunner.cpp"
+				RelativePath=".\testrunner.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testsimplifytokens.cpp"
+				RelativePath=".\testsettings.cpp"
 				>
 			</File>
 			<File
-				RelativePath="teststl.cpp"
+				RelativePath=".\testsimplifytokens.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testsuite.cpp"
+				RelativePath=".\teststl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testtoken.cpp"
+				RelativePath=".\testsuite.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testtokenize.cpp"
+				RelativePath=".\testthreadexecutor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testunusedfunctions.cpp"
+				RelativePath=".\testtoken.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testunusedprivfunc.cpp"
+				RelativePath=".\testtokenize.cpp"
 				>
 			</File>
 			<File
-				RelativePath="testunusedvar.cpp"
+				RelativePath=".\testunusedfunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\testunusedprivfunc.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\testunusedvar.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cli\threadexecutor.cpp"
 				>
 			</File>
 			<File
@@ -420,6 +440,10 @@
 				RelativePath="..\lib\checkmemoryleak.h"
 				>
 			</File>
+			<File
+				RelativePath="..\lib\checkobsoletefunctions.h"
+				>
+			</File>
 			<File
 				RelativePath="..\lib\checkother.h"
 				>
@@ -456,6 +480,10 @@
 				RelativePath="..\lib\filelister.h"
 				>
 			</File>
+			<File
+				RelativePath="..\lib\filelister_unix.h"
+				>
+			</File>
 			<File
 				RelativePath="..\lib\filelister_win32.h"
 				>
@@ -477,7 +505,11 @@
 				>
 			</File>
 			<File
-				RelativePath="testsuite.h"
+				RelativePath=".\testsuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\cli\threadexecutor.h"
 				>
 			</File>
 			<File