diff --git a/cli/cppcheck.vcproj b/cli/cppcheck.vcproj
index 0e5b59cea..234723690 100755
--- a/cli/cppcheck.vcproj
+++ b/cli/cppcheck.vcproj
@@ -44,13 +44,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
 				Optimization="0"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="..\lib"
 				PreprocessorDefinitions="_DEBUG;WIN32"
-				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="false"
 				AssemblerListingLocation="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\"
@@ -75,6 +74,7 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=""
 				SubSystem="1"
+				LinkTimeCodeGeneration="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -127,13 +127,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
 				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\lib"
 				PreprocessorDefinitions="NDEBUG,WIN32"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="false"
 				AssemblerListingLocation="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\"
@@ -152,11 +151,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
 				AdditionalDependencies="shlwapi.lib"
 				OutputFile="$(OutDir)\cppcheck.exe"
 				LinkIncremental="1"
 				ProgramDatabaseFile=""
 				SubSystem="1"
+				LinkTimeCodeGeneration="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/lib/lib.vcproj b/lib/lib.vcproj
index 3313eb8ac..1aaa14770 100644
--- a/lib/lib.vcproj
+++ b/lib/lib.vcproj
@@ -42,12 +42,13 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
+				TreatWChar_tAsBuiltInType="false"
+				AssemblerListingLocation="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -69,6 +70,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
+				OutputFile="$(IntDir)/$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -103,13 +105,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				EnableIntrinsicFunctions="false"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
 				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
 				AssemblerListingLocation="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
@@ -136,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
+				OutputFile="$(IntDir)/$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
diff --git a/test/test.vcproj b/test/test.vcproj
index 1476caae0..d0b046f14 100755
--- a/test/test.vcproj
+++ b/test/test.vcproj
@@ -43,22 +43,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\lib"
 				PreprocessorDefinitions="_DEBUG,WIN32,UNIT_TESTING"
-				GeneratePreprocessedFile="0"
-				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="false"
-				RuntimeTypeInfo="true"
 				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\"
-				XMLDocumentationFileName="$(IntDir)\"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -76,11 +69,10 @@
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="shlwapi.lib"
 				OutputFile="$(OutDir)\test.exe"
-				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=""
 				SubSystem="1"
-				LinkTimeCodeGeneration="0"
+				LinkTimeCodeGeneration="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -133,23 +125,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
+				AdditionalOptions="123456"
 				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\lib"
 				PreprocessorDefinitions="NDEBUG,WIN32,UNIT_TESTING"
-				GeneratePreprocessedFile="0"
-				ExceptionHandling="1"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="false"
-				RuntimeTypeInfo="true"
 				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\"
-				XMLDocumentationFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
+				WarningLevel="4"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -168,8 +154,6 @@
 				AdditionalDependencies="shlwapi.lib"
 				OutputFile="$(OutDir)\test.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="false"
 				ProgramDatabaseFile=""
 				SubSystem="1"
 				LinkTimeCodeGeneration="1"