diff --git a/cli/cppcheck.vcproj b/cli/cppcheck.vcproj
index 99cd421f6..0e5b59cea 100755
--- a/cli/cppcheck.vcproj
+++ b/cli/cppcheck.vcproj
@@ -190,196 +190,28 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\lib\checkautovariables.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkbufferoverrun.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkclass.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkdangerousfunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkexceptionsafety.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkheaders.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkmemoryleak.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkother.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkstl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkunusedfunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\cppcheck.cpp"
-				>
-			</File>
 			<File
 				RelativePath="cppcheckexecutor.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\errorlogger.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\executionpath.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\filelister.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\filelister_win32.cpp"
-				>
-			</File>
 			<File
 				RelativePath="main.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\mathlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\preprocessor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\settings.cpp"
-				>
-			</File>
 			<File
 				RelativePath="threadexecutor.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\token.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\tokenize.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath="..\lib\check.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkautovariables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkbufferoverrun.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkclass.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkdangerousfunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkexceptionsafety.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkheaders.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkmemoryleak.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkother.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkstl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkunusedfunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\classinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\cppcheck.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\errorlogger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\executionpath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\filelister.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\filelister_win32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\mathlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\preprocessor.h"
-				>
-			</File>
 			<File
 				RelativePath="resource.h"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\settings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\token.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\tokenize.h"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath="cppcheck.rc"
diff --git a/cppcheck.sln b/cppcheck.sln
index b5c8ad9a6..51c399873 100644
--- a/cppcheck.sln
+++ b/cppcheck.sln
@@ -1,8 +1,16 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcproj", "{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F} = {ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{BA98E531-D8B3-39CB-8171-064854404B81}"
+	ProjectSection(ProjectDependencies) = postProject
+		{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F} = {ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib", "lib\lib.vcproj", "{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,6 +26,10 @@ 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/lib/lib.vcproj b/lib/lib.vcproj
new file mode 100644
index 000000000..3313eb8ac
--- /dev/null
+++ b/lib/lib.vcproj
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="lib"
+	ProjectGUID="{ACE2ABB0-1027-44DF-8E14-8B4DAF88590F}"
+	RootNamespace="lib"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\Build\$(ConfigurationName)"
+			IntermediateDirectory="..\BuildTmp\$(TargetName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\Build\$(ConfigurationName)"
+			IntermediateDirectory="..\BuildTmp\$(TargetName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="false"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="4"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,WIN32"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\checkautovariables.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkbufferoverrun.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkclass.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkdangerousfunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkexceptionsafety.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkheaders.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkmemoryleak.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkother.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkstl.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\checkunusedfunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cppcheck.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\errorlogger.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\executionpath.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\filelister.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\filelister_win32.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\mathlib.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\preprocessor.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\settings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\token.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\tokenize.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\check.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkautovariables.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkbufferoverrun.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkclass.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkdangerousfunctions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkexceptionsafety.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkheaders.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkmemoryleak.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkother.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkstl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\checkunusedfunctions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\classinfo.h"
+				>
+			</File>
+			<File
+				RelativePath=".\cppcheck.h"
+				>
+			</File>
+			<File
+				RelativePath=".\errorlogger.h"
+				>
+			</File>
+			<File
+				RelativePath=".\executionpath.h"
+				>
+			</File>
+			<File
+				RelativePath=".\filelister.h"
+				>
+			</File>
+			<File
+				RelativePath=".\filelister_win32.h"
+				>
+			</File>
+			<File
+				RelativePath=".\mathlib.h"
+				>
+			</File>
+			<File
+				RelativePath=".\preprocessor.h"
+				>
+			</File>
+			<File
+				RelativePath=".\settings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\token.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tokenize.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/test/test.vcproj b/test/test.vcproj
index e23113c84..1476caae0 100755
--- a/test/test.vcproj
+++ b/test/test.vcproj
@@ -206,78 +206,6 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\lib\checkautovariables.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkbufferoverrun.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkclass.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkdangerousfunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkexceptionsafety.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkheaders.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkmemoryleak.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkother.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkstl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkunusedfunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\cppcheck.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\errorlogger.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\executionpath.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\filelister.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\filelister_win32.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\mathlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\preprocessor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\settings.cpp"
-				>
-			</File>
 			<File
 				RelativePath="testautovariables.cpp"
 				>
@@ -378,112 +306,16 @@
 				RelativePath="testunusedvar.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\token.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\tokenize.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath="..\lib\check.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkautovariables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkbufferoverrun.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkclass.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkdangerousfunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkexceptionsafety.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkheaders.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkmemoryleak.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkother.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkstl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\checkunusedfunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\classinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\cppcheck.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\errorlogger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\executionpath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\filelister.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\filelister_win32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\mathlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\preprocessor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\settings.h"
-				>
-			</File>
 			<File
 				RelativePath="testsuite.h"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\token.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lib\tokenize.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>