diff --git a/cli/cppcheck.vcproj b/cli/cppcheck.vcproj
index b2e1efe80..cd313c031 100755
--- a/cli/cppcheck.vcproj
+++ b/cli/cppcheck.vcproj
@@ -179,6 +179,8 @@
 				RelativePath="..\lib\preprocessor.cpp" />
 			<File
 				RelativePath="..\lib\settings.cpp" />
+			<File
+				RelativePath="..\lib\suppressions.cpp" />
 			<File
 				RelativePath="..\lib\symboldatabase.cpp" />
 			<File
@@ -260,6 +262,8 @@
 				RelativePath="resource.h" />
 			<File
 				RelativePath="..\lib\settings.h" />
+			<File
+				RelativePath="..\lib\suppressions.h" />
 			<File
 				RelativePath="..\lib\symboldatabase.h" />
 			<File
diff --git a/cli/cppcheck.vcxproj b/cli/cppcheck.vcxproj
index 070719ea0..580a15cd7 100644
--- a/cli/cppcheck.vcxproj
+++ b/cli/cppcheck.vcxproj
@@ -147,6 +147,7 @@
     <ClCompile Include="pathmatch.cpp" />
     <ClCompile Include="..\lib\preprocessor.cpp" />
     <ClCompile Include="..\lib\settings.cpp" />
+    <ClCompile Include="..\lib\suppressions.cpp" />
     <ClCompile Include="..\lib\symboldatabase.cpp" />
     <ClCompile Include="threadexecutor.cpp" />
     <ClCompile Include="..\lib\timer.cpp" />
@@ -187,6 +188,7 @@
     <ClInclude Include="..\lib\preprocessor.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="..\lib\settings.h" />
+    <ClInclude Include="..\lib\suppressions.h" />
     <ClInclude Include="..\lib\symboldatabase.h" />
     <ClInclude Include="threadexecutor.h" />
     <ClInclude Include="..\lib\timer.h" />
diff --git a/cli/cppcheck.vcxproj.filters b/cli/cppcheck.vcxproj.filters
index 3f90c7e93..6895b7c8c 100644
--- a/cli/cppcheck.vcxproj.filters
+++ b/cli/cppcheck.vcxproj.filters
@@ -99,6 +99,9 @@
     <ClCompile Include="..\lib\settings.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\suppressions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib\symboldatabase.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -215,6 +218,9 @@
     <ClInclude Include="..\lib\settings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\suppressions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\lib\symboldatabase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/test/testrunner.vcproj b/test/testrunner.vcproj
index d1b411f77..4fcbf7f87 100644
--- a/test/testrunner.vcproj
+++ b/test/testrunner.vcproj
@@ -28,7 +28,7 @@
 				GeneratePreprocessedFile="0"
 				ObjectFile="temp\"
 				Optimization ="4"
-				PreprocessorDefinitions="UNICODE,WIN32,QT_LARGEFILE_SUPPORT,_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="UNICODE,WIN32,QT_LARGEFILE_SUPPORT,HAVE_RULES,_CRT_SECURE_NO_WARNINGS"
 				ProgramDataBaseFileName=".\"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
@@ -61,7 +61,7 @@
 				Name="VCPreLinkEventTool" />
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="UNICODE,WIN32,QT_LARGEFILE_SUPPORT,_CRT_SECURE_NO_WARNINGS,_DEBUG" />
+				PreprocessorDefinitions="UNICODE,WIN32,QT_LARGEFILE_SUPPORT,HAVE_RULES,_CRT_SECURE_NO_WARNINGS,_DEBUG" />
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -81,7 +81,7 @@
 				GeneratePreprocessedFile="0"
 				ObjectFile="temp\"
 				Optimization ="2"
-				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,_CRT_SECURE_NO_WARNINGS,NDEBUG"
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,HAVE_RULES,_CRT_SECURE_NO_WARNINGS,NDEBUG"
 				ProgramDataBaseFileName=".\"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
@@ -115,7 +115,7 @@
 				Name="VCPreLinkEventTool" />
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,_CRT_SECURE_NO_WARNINGS" />
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,HAVE_RULES,_CRT_SECURE_NO_WARNINGS" />
 		</Configuration>
 	</Configurations>
 	<Files>
@@ -179,6 +179,8 @@
 				RelativePath="..\lib\preprocessor.cpp" />
 			<File
 				RelativePath="..\lib\settings.cpp" />
+			<File
+				RelativePath="..\lib\suppressions.cpp" />
 			<File
 				RelativePath="..\lib\symboldatabase.cpp" />
 			<File
@@ -233,8 +235,6 @@
 				RelativePath="testpreprocessor.cpp" />
 			<File
 				RelativePath="testrunner.cpp" />
-			<File
-				RelativePath="testsettings.cpp" />
 			<File
 				RelativePath="testsimplifytokens.cpp" />
 			<File
@@ -340,6 +340,8 @@
 				RelativePath="redirect.h" />
 			<File
 				RelativePath="..\lib\settings.h" />
+			<File
+				RelativePath="..\lib\suppressions.h" />
 			<File
 				RelativePath="..\lib\symboldatabase.h" />
 			<File
diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj
index d0b29b642..7475640d5 100644
--- a/test/testrunner.vcxproj
+++ b/test/testrunner.vcxproj
@@ -60,7 +60,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ObjectFileName>temp\</ObjectFileName>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <ProgramDataBaseFileName>.\</ProgramDataBaseFileName>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -80,7 +80,7 @@
     </Link>
     <Midl />
     <ResourceCompile>
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">
@@ -94,7 +94,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ObjectFileName>temp\</ObjectFileName>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>QT_NO_DEBUG;NDEBUG;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QT_NO_DEBUG;NDEBUG;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <ProgramDataBaseFileName>.\</ProgramDataBaseFileName>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -115,7 +115,7 @@
     </Link>
     <Midl />
     <ResourceCompile>
-      <PreprocessorDefinitions>QT_NO_DEBUG;NDEBUG;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QT_NO_DEBUG;NDEBUG;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -147,6 +147,7 @@
     <ClCompile Include="..\cli\pathmatch.cpp" />
     <ClCompile Include="..\lib\preprocessor.cpp" />
     <ClCompile Include="..\lib\settings.cpp" />
+    <ClCompile Include="..\lib\suppressions.cpp" />
     <ClCompile Include="..\lib\symboldatabase.cpp" />
     <ClCompile Include="test64bit.cpp" />
     <ClCompile Include="testassignif.cpp" />
@@ -174,7 +175,6 @@
     <ClCompile Include="testpostfixoperator.cpp" />
     <ClCompile Include="testpreprocessor.cpp" />
     <ClCompile Include="testrunner.cpp" />
-    <ClCompile Include="testsettings.cpp" />
     <ClCompile Include="testsimplifytokens.cpp" />
     <ClCompile Include="teststl.cpp" />
     <ClCompile Include="testsuite.cpp" />
@@ -227,6 +227,7 @@
     <ClInclude Include="..\lib\preprocessor.h" />
     <ClInclude Include="redirect.h" />
     <ClInclude Include="..\lib\settings.h" />
+    <ClInclude Include="..\lib\suppressions.h" />
     <ClInclude Include="..\lib\symboldatabase.h" />
     <ClInclude Include="testsuite.h" />
     <ClInclude Include="..\cli\threadexecutor.h" />
diff --git a/test/testrunner.vcxproj.filters b/test/testrunner.vcxproj.filters
index 9ae07e9dc..221738fd0 100644
--- a/test/testrunner.vcxproj.filters
+++ b/test/testrunner.vcxproj.filters
@@ -95,6 +95,9 @@
     <ClCompile Include="..\lib\settings.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\suppressions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib\symboldatabase.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -176,9 +179,6 @@
     <ClCompile Include="testrunner.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="testsettings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="testsimplifytokens.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -331,6 +331,9 @@
     <ClInclude Include="..\lib\settings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\suppressions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\lib\symboldatabase.h">
       <Filter>Header Files</Filter>
     </ClInclude>