diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index d3b8ef297..e6d141b5a 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -129,6 +129,7 @@
     <ClInclude Include="checkunusedfunctions.h" />
     <ClInclude Include="checkunusedvar.h" />
     <ClInclude Include="checkvaarg.h" />
+    <ClInclude Include="clangastdump.h" />
     <ClInclude Include="config.h" />
     <ClInclude Include="cppcheck.h" />
     <ClInclude Include="ctu.h" />
@@ -556,4 +557,4 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/cppcheck.vcxproj.filters b/lib/cppcheck.vcxproj.filters
index f41796ad1..931e16ca1 100644
--- a/lib/cppcheck.vcxproj.filters
+++ b/lib/cppcheck.vcxproj.filters
@@ -167,6 +167,9 @@
     <ClCompile Include="programmemory.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="clangastdump.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="checkbufferoverrun.h">
@@ -325,6 +328,9 @@
     <ClInclude Include="ctu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="clangastdump.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc" />
@@ -332,4 +338,4 @@
   <ItemGroup>
     <Natvis Include="cppcheck.natvis" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 82b0cb073..85866344f 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -1751,7 +1751,7 @@ void Variable::evaluate(const Settings* settings)
     if (!settings)
         return;
 
-    const Library * const lib = settings ? &settings->library : nullptr;
+    const Library * const lib = &settings->library;
 
     if (mNameToken)
         setFlag(fIsArray, arrayDimensions(settings));
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
index 4338ee49b..5707cf5e9 100644
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@@ -716,7 +716,7 @@ public:
     enum Type { eConstructor, eCopyConstructor, eMoveConstructor, eOperatorEqual, eDestructor, eFunction, eLambda };
 
     Function(const Tokenizer *mTokenizer, const Token *tok, const Scope *scope, const Token *tokDef, const Token *tokArgDef);
-    Function(const Token *tokenDef);
+    explicit Function(const Token *tokenDef);
 
     const std::string &name() const {
         return tokenDef->str();