diff --git a/lib/cppcheck.vcxproj.filters b/lib/cppcheck.vcxproj.filters
index 14b53ec26..a7e37721c 100644
--- a/lib/cppcheck.vcxproj.filters
+++ b/lib/cppcheck.vcxproj.filters
@@ -152,6 +152,9 @@
     <ClCompile Include="pathmatch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="analyzerinfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="checkbufferoverrun.h">
@@ -304,6 +307,9 @@
     <ClInclude Include="pathmatch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="analyzerinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc" />
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 099f855c2..bf78eaa33 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -454,7 +454,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                         }
 
                         // Function template
-                        else if (tok2->str() == ">" && tok2->link() && Token::Match(tok2->link()->previous(), "template <"))
+                        else if (tok2->link() && tok2->str() == ">" && Token::simpleMatch(tok2->link()->previous(), "template <"))
                             break;
 
                         tok1 = tok2;