diff --git a/cli/cppcheck.vcxproj b/cli/cppcheck.vcxproj
index 4ed9f66c9..70dc830ab 100644
--- a/cli/cppcheck.vcxproj
+++ b/cli/cppcheck.vcxproj
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">
     <ClCompile>
-      <AdditionalIncludeDirectories>".";"..\lib";"..\externals\tinyxml";..\..\Qt\VS4.7.3\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>".";"..\lib";"..\externals\tinyxml";..\..\QtSDK\Desktop\Qt\4.7.4\mingw\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>temp\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">
     <ClCompile>
-      <AdditionalIncludeDirectories>".";"..\lib";"..\externals\tinyxml";..\..\Qt\VS4.7.3\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>".";"..\lib";"..\externals\tinyxml";..\..\QtSDK\Desktop\Qt\4.7.4\mingw\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>temp\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -122,6 +122,7 @@
     <ClCompile Include="..\lib\checkbufferoverrun.cpp" />
     <ClCompile Include="..\lib\checkclass.cpp" />
     <ClCompile Include="..\lib\checkexceptionsafety.cpp" />
+    <ClCompile Include="..\lib\checkinternal.cpp" />
     <ClCompile Include="..\lib\checkmemoryleak.cpp" />
     <ClCompile Include="..\lib\checknonreentrantfunctions.cpp" />
     <ClCompile Include="..\lib\checknullpointer.cpp" />
@@ -146,6 +147,7 @@
     <ClCompile Include="..\lib\settings.cpp" />
     <ClCompile Include="..\lib\suppressions.cpp" />
     <ClCompile Include="..\lib\symboldatabase.cpp" />
+    <ClCompile Include="..\lib\templatesimplifier.cpp" />
     <ClCompile Include="threadexecutor.cpp" />
     <ClCompile Include="..\lib\timer.cpp" />
     <ClCompile Include="..\externals\tinyxml\tinystr.cpp" />
@@ -164,6 +166,7 @@
     <ClInclude Include="..\lib\checkbufferoverrun.h" />
     <ClInclude Include="..\lib\checkclass.h" />
     <ClInclude Include="..\lib\checkexceptionsafety.h" />
+    <ClInclude Include="..\lib\checkinternal.h" />
     <ClInclude Include="..\lib\checkmemoryleak.h" />
     <ClInclude Include="..\lib\checknonreentrantfunctions.h" />
     <ClInclude Include="..\lib\checknullpointer.h" />
@@ -188,6 +191,7 @@
     <ClInclude Include="..\lib\settings.h" />
     <ClInclude Include="..\lib\suppressions.h" />
     <ClInclude Include="..\lib\symboldatabase.h" />
+    <ClInclude Include="..\lib\templatesimplifier.h" />
     <ClInclude Include="threadexecutor.h" />
     <ClInclude Include="..\lib\timer.h" />
     <ClInclude Include="..\externals\tinyxml\tinystr.h" />
diff --git a/cli/cppcheck.vcxproj.filters b/cli/cppcheck.vcxproj.filters
index b0dd04311..4328daa75 100644
--- a/cli/cppcheck.vcxproj.filters
+++ b/cli/cppcheck.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="..\lib\checkexceptionsafety.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\checkinternal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib\checkmemoryleak.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -108,6 +111,9 @@
     <ClCompile Include="..\lib\symboldatabase.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\templatesimplifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="threadexecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -158,6 +164,9 @@
     <ClInclude Include="..\lib\checkexceptionsafety.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\checkinternal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\lib\checkmemoryleak.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -230,6 +239,9 @@
     <ClInclude Include="..\lib\symboldatabase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\templatesimplifier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="threadexecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj
index 22548ec29..366da8303 100644
--- a/test/testrunner.vcxproj
+++ b/test/testrunner.vcxproj
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">
     <ClCompile>
-      <AdditionalIncludeDirectories>".";"..\cli";"..\lib";"..\externals\tinyxml";..\..\Qt\VS4.7.3\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>".";"..\cli";"..\lib";"..\externals\tinyxml";..\..\QtSDK\Desktop\Qt\4.7.4\mingw\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>temp\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">
     <ClCompile>
-      <AdditionalIncludeDirectories>".";"..\cli";"..\lib";"..\externals\tinyxml";..\..\Qt\VS4.7.3\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>".";"..\cli";"..\lib";"..\externals\tinyxml";..\..\QtSDK\Desktop\Qt\4.7.4\mingw\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>temp\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -122,6 +122,7 @@
     <ClCompile Include="..\lib\checkbufferoverrun.cpp" />
     <ClCompile Include="..\lib\checkclass.cpp" />
     <ClCompile Include="..\lib\checkexceptionsafety.cpp" />
+    <ClCompile Include="..\lib\checkinternal.cpp" />
     <ClCompile Include="..\lib\checkmemoryleak.cpp" />
     <ClCompile Include="..\lib\checknonreentrantfunctions.cpp" />
     <ClCompile Include="..\lib\checknullpointer.cpp" />
@@ -146,6 +147,7 @@
     <ClCompile Include="..\lib\settings.cpp" />
     <ClCompile Include="..\lib\suppressions.cpp" />
     <ClCompile Include="..\lib\symboldatabase.cpp" />
+    <ClCompile Include="..\lib\templatesimplifier.cpp" />
     <ClCompile Include="test64bit.cpp" />
     <ClCompile Include="testassignif.cpp" />
     <ClCompile Include="testautovariables.cpp" />
@@ -203,6 +205,7 @@
     <ClInclude Include="..\lib\checkbufferoverrun.h" />
     <ClInclude Include="..\lib\checkclass.h" />
     <ClInclude Include="..\lib\checkexceptionsafety.h" />
+    <ClInclude Include="..\lib\checkinternal.h" />
     <ClInclude Include="..\lib\checkmemoryleak.h" />
     <ClInclude Include="..\lib\checknonreentrantfunctions.h" />
     <ClInclude Include="..\lib\checknullpointer.h" />
@@ -228,6 +231,7 @@
     <ClInclude Include="..\lib\settings.h" />
     <ClInclude Include="..\lib\suppressions.h" />
     <ClInclude Include="..\lib\symboldatabase.h" />
+    <ClInclude Include="..\lib\templatesimplifier.h" />
     <ClInclude Include="testsuite.h" />
     <ClInclude Include="..\cli\threadexecutor.h" />
     <ClInclude Include="..\lib\timer.h" />
diff --git a/test/testrunner.vcxproj.filters b/test/testrunner.vcxproj.filters
index 8af430b31..cd1223084 100644
--- a/test/testrunner.vcxproj.filters
+++ b/test/testrunner.vcxproj.filters
@@ -32,6 +32,9 @@
     <ClCompile Include="..\lib\checkexceptionsafety.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\checkinternal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib\checkmemoryleak.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -104,6 +107,9 @@
     <ClCompile Include="..\lib\symboldatabase.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\templatesimplifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="test64bit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -271,6 +277,9 @@
     <ClInclude Include="..\lib\checkexceptionsafety.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\checkinternal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\lib\checkmemoryleak.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -346,6 +355,9 @@
     <ClInclude Include="..\lib\symboldatabase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\templatesimplifier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="testsuite.h">
       <Filter>Header Files</Filter>
     </ClInclude>