diff --git a/plugins/cpp/model/include/model/cppfriendship.h b/plugins/cpp/model/include/model/cppfriendship.h
index 87bf5d0ad..b60392e5e 100644
--- a/plugins/cpp/model/include/model/cppfriendship.h
+++ b/plugins/cpp/model/include/model/cppfriendship.h
@@ -2,6 +2,8 @@
 #define CC_MODEL_CPPFRIENDSHIP_H
 
 #include <memory>
+#include <cstdint>
+#include <string>
 
 namespace cc
 {
diff --git a/plugins/cpp/model/include/model/cpprelation.h b/plugins/cpp/model/include/model/cpprelation.h
index f2af1670c..b8cf9eac1 100644
--- a/plugins/cpp/model/include/model/cpprelation.h
+++ b/plugins/cpp/model/include/model/cpprelation.h
@@ -2,6 +2,8 @@
 #define CC_MODEL_CPPRELATION_H
 
 #include <memory>
+#include <cstdint>
+#include <string>
 
 namespace cc
 {
diff --git a/plugins/cpp/parser/include/cppparser/filelocutil.h b/plugins/cpp/parser/include/cppparser/filelocutil.h
index ccfa96883..221f696c0 100644
--- a/plugins/cpp/parser/include/cppparser/filelocutil.h
+++ b/plugins/cpp/parser/include/cppparser/filelocutil.h
@@ -95,7 +95,7 @@ class FileLocUtil
     if (!fileEntry)
       return std::string();
 
-    return fileEntry->getName();
+    return std::string(fileEntry->getName());
   }
 
 private:
diff --git a/plugins/cpp/parser/src/clangastvisitor.h b/plugins/cpp/parser/src/clangastvisitor.h
index 699d6334f..0321f66ef 100644
--- a/plugins/cpp/parser/src/clangastvisitor.h
+++ b/plugins/cpp/parser/src/clangastvisitor.h
@@ -10,6 +10,7 @@
 #include <clang/Basic/SourceManager.h>
 #include <clang/AST/Decl.h>
 #include <clang/AST/RecursiveASTVisitor.h>
+#include <clang/AST/ParentMapContext.h>
 #include <llvm/Support/raw_ostream.h>
 
 #include <model/cppastnode.h>
@@ -1385,7 +1386,7 @@ class ClangASTVisitor : public clang::RecursiveASTVisitor<ClangASTVisitor>
   {
     while (expr_)
     {
-      clang::ASTContext::DynTypedNodeList parents
+      clang::DynTypedNodeList parents
         = _astContext.getParents(*expr_);
 
       const clang::ast_type_traits::DynTypedNode& parent = parents[0];
diff --git a/plugins/cpp_reparse/service/src/asthtml.cpp b/plugins/cpp_reparse/service/src/asthtml.cpp
index 51f88cddc..268fc4a40 100644
--- a/plugins/cpp_reparse/service/src/asthtml.cpp
+++ b/plugins/cpp_reparse/service/src/asthtml.cpp
@@ -192,13 +192,14 @@ class ASTSubtreeHTMLPrinter
   {
     if (_locator.matchNodeAgainstLocation(s_))
     {
-      s_->dump(*_out, _context.getSourceManager());
+      s_->dump(*_out, _context);
       return true;
     }
     return Base::TraverseStmt(s_);
   }
 
 private:
+
   std::unique_ptr<raw_ostream> _out;
   ASTContext& _context;
   cc::service::reparse::ASTNodeLocator _locator;
@@ -221,7 +222,7 @@ std::unique_ptr<clang::ASTConsumer> ASTHTMLActionFactory::newASTConsumer()
   assert(_stream && "Must not call newASTConsumer twice as the underlying "
     "stream has been moved out.");
   return clang::CreateASTDumper(std::move(_stream), "",
-                                true, true, false, clang::ADOF_Default);
+                                true, true, false, false, clang::ADOF_Default);
 }
 
 std::unique_ptr<clang::ASTConsumer>
diff --git a/webserver/src/threadedmongoose.h b/webserver/src/threadedmongoose.h
index 7260ea249..810b55fcd 100644
--- a/webserver/src/threadedmongoose.h
+++ b/webserver/src/threadedmongoose.h
@@ -8,6 +8,7 @@
 #include <thread>
 #include <vector>
 #include <signal.h>
+#include <stdexcept>
 
 #include <webserver/mongoose.h>