diff --git a/cli/cppcheck.vcproj b/cli/cppcheck.vcproj
index f111906bd..992568b33 100755
--- a/cli/cppcheck.vcproj
+++ b/cli/cppcheck.vcproj
@@ -212,10 +212,6 @@
 				RelativePath="..\lib\checkexceptionsafety.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\checkheaders.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\lib\checkmemoryleak.cpp"
 				>
@@ -314,10 +310,6 @@
 				RelativePath="..\lib\checkexceptionsafety.h"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\checkheaders.h"
-				>
-			</File>
 			<File
 				RelativePath="..\lib\checkmemoryleak.h"
 				>
diff --git a/cli/cppcheck.vcxproj b/cli/cppcheck.vcxproj
index 2fa24c98d..56e584f90 100644
--- a/cli/cppcheck.vcxproj
+++ b/cli/cppcheck.vcxproj
@@ -104,6 +104,7 @@
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnablePREfast>false</EnablePREfast>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -127,7 +128,6 @@
     <ClCompile Include="..\lib\checkclass.cpp" />
     <ClCompile Include="..\lib\checkdangerousfunctions.cpp" />
     <ClCompile Include="..\lib\checkexceptionsafety.cpp" />
-    <ClCompile Include="..\lib\checkheaders.cpp" />
     <ClCompile Include="..\lib\checkmemoryleak.cpp" />
     <ClCompile Include="..\lib\checkother.cpp" />
     <ClCompile Include="..\lib\checkstl.cpp" />
@@ -153,7 +153,6 @@
     <ClInclude Include="..\lib\checkclass.h" />
     <ClInclude Include="..\lib\checkdangerousfunctions.h" />
     <ClInclude Include="..\lib\checkexceptionsafety.h" />
-    <ClInclude Include="..\lib\checkheaders.h" />
     <ClInclude Include="..\lib\checkmemoryleak.h" />
     <ClInclude Include="..\lib\checkother.h" />
     <ClInclude Include="..\lib\checkstl.h" />
diff --git a/cli/cppcheck.vcxproj.filters b/cli/cppcheck.vcxproj.filters
index 64a15b97b..4186da93f 100644
--- a/cli/cppcheck.vcxproj.filters
+++ b/cli/cppcheck.vcxproj.filters
@@ -38,9 +38,6 @@
     <ClCompile Include="..\lib\checkexceptionsafety.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib\checkheaders.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib\checkmemoryleak.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -106,9 +103,6 @@
     <ClInclude Include="..\lib\checkexceptionsafety.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib\checkheaders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\lib\checkmemoryleak.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/lib/lib.vcproj b/lib/lib.vcproj
index d64b910e9..99ebb5bc3 100644
--- a/lib/lib.vcproj
+++ b/lib/lib.vcproj
@@ -174,10 +174,6 @@
 				RelativePath=".\checkexceptionsafety.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\checkheaders.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\checkmemoryleak.cpp"
 				>
@@ -264,10 +260,6 @@
 				RelativePath=".\checkexceptionsafety.h"
 				>
 			</File>
-			<File
-				RelativePath=".\checkheaders.h"
-				>
-			</File>
 			<File
 				RelativePath=".\checkmemoryleak.h"
 				>
diff --git a/lib/lib.vcxproj b/lib/lib.vcxproj
index 8f44eaacf..f8199ca22 100644
--- a/lib/lib.vcxproj
+++ b/lib/lib.vcxproj
@@ -90,7 +90,6 @@
     <ClCompile Include="checkclass.cpp" />
     <ClCompile Include="checkdangerousfunctions.cpp" />
     <ClCompile Include="checkexceptionsafety.cpp" />
-    <ClCompile Include="checkheaders.cpp" />
     <ClCompile Include="checkmemoryleak.cpp" />
     <ClCompile Include="checkother.cpp" />
     <ClCompile Include="checkstl.cpp" />
@@ -113,7 +112,6 @@
     <ClInclude Include="checkclass.h" />
     <ClInclude Include="checkdangerousfunctions.h" />
     <ClInclude Include="checkexceptionsafety.h" />
-    <ClInclude Include="checkheaders.h" />
     <ClInclude Include="checkmemoryleak.h" />
     <ClInclude Include="checkother.h" />
     <ClInclude Include="checkstl.h" />
diff --git a/lib/lib.vcxproj.filters b/lib/lib.vcxproj.filters
index 50ffdde0c..87a34e6fc 100644
--- a/lib/lib.vcxproj.filters
+++ b/lib/lib.vcxproj.filters
@@ -26,9 +26,6 @@
     <ClCompile Include="checkexceptionsafety.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="checkheaders.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="checkmemoryleak.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -91,9 +88,6 @@
     <ClInclude Include="checkexceptionsafety.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="checkheaders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="checkmemoryleak.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/test/test.vcproj b/test/test.vcproj
index 147aeb61d..3f5ab9314 100755
--- a/test/test.vcproj
+++ b/test/test.vcproj
@@ -210,10 +210,6 @@
 				RelativePath="..\lib\checkexceptionsafety.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\checkheaders.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\lib\checkmemoryleak.cpp"
 				>
@@ -416,10 +412,6 @@
 				RelativePath="..\lib\checkexceptionsafety.h"
 				>
 			</File>
-			<File
-				RelativePath="..\lib\checkheaders.h"
-				>
-			</File>
 			<File
 				RelativePath="..\lib\checkmemoryleak.h"
 				>
diff --git a/test/test.vcxproj b/test/test.vcxproj
index 86099e31e..17acd9a0f 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -125,7 +125,6 @@
     <ClCompile Include="..\lib\checkclass.cpp" />
     <ClCompile Include="..\lib\checkdangerousfunctions.cpp" />
     <ClCompile Include="..\lib\checkexceptionsafety.cpp" />
-    <ClCompile Include="..\lib\checkheaders.cpp" />
     <ClCompile Include="..\lib\checkmemoryleak.cpp" />
     <ClCompile Include="..\lib\checkother.cpp" />
     <ClCompile Include="..\lib\checkstl.cpp" />
@@ -173,7 +172,6 @@
     <ClInclude Include="..\lib\checkclass.h" />
     <ClInclude Include="..\lib\checkdangerousfunctions.h" />
     <ClInclude Include="..\lib\checkexceptionsafety.h" />
-    <ClInclude Include="..\lib\checkheaders.h" />
     <ClInclude Include="..\lib\checkmemoryleak.h" />
     <ClInclude Include="..\lib\checkother.h" />
     <ClInclude Include="..\lib\checkstl.h" />
diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters
index 03e90e4f7..82b116418 100644
--- a/test/test.vcxproj.filters
+++ b/test/test.vcxproj.filters
@@ -104,9 +104,6 @@
     <ClCompile Include="..\lib\checkexceptionsafety.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib\checkheaders.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib\checkmemoryleak.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -172,9 +169,6 @@
     <ClInclude Include="..\lib\checkexceptionsafety.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib\checkheaders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\lib\checkmemoryleak.h">
       <Filter>Header Files</Filter>
     </ClInclude>