diff --git a/plugins/cpp/parser/include/cppparser/filelocutil.h b/plugins/cpp/parser/include/cppparser/filelocutil.h
index 221f696c0..04e0734cd 100644
--- a/plugins/cpp/parser/include/cppparser/filelocutil.h
+++ b/plugins/cpp/parser/include/cppparser/filelocutil.h
@@ -91,7 +91,7 @@ class FileLocUtil
     if (fid.isInvalid())
       return std::string();
 
-    const clang::FileEntry* fileEntry = _clangSrcMan.getFileEntryForID(fid);
+    const clang::OptionalFileEntryRef fileEntry = _clangSrcMan.getFileEntryRefForID(fid);
     if (!fileEntry)
       return std::string();
 
diff --git a/plugins/cpp/parser/src/clangastvisitor.h b/plugins/cpp/parser/src/clangastvisitor.h
index cfcaf8604..10683fd65 100644
--- a/plugins/cpp/parser/src/clangastvisitor.h
+++ b/plugins/cpp/parser/src/clangastvisitor.h
@@ -1735,7 +1735,7 @@ class ClangASTVisitor : public clang::RecursiveASTVisitor<ClangASTVisitor>
       clang::DynTypedNodeList parents
         = _astContext.getParents(*expr_);
 
-      const clang::ast_type_traits::DynTypedNode& parent = parents[0];
+      const clang::DynTypedNode& parent = parents[0];
 
       if (const clang::BinaryOperator* op = parent.get<clang::BinaryOperator>())
       {
diff --git a/plugins/cpp/parser/src/ppincludecallback.cpp b/plugins/cpp/parser/src/ppincludecallback.cpp
index b163732fe..3aeb2a9ca 100644
--- a/plugins/cpp/parser/src/ppincludecallback.cpp
+++ b/plugins/cpp/parser/src/ppincludecallback.cpp
@@ -61,10 +61,11 @@ void PPIncludeCallback::InclusionDirective(
   clang::StringRef fileName_,
   bool,
   clang::CharSourceRange filenameRange_,
-  const clang::FileEntry*,
+  clang::OptionalFileEntryRef,
   clang::StringRef searchPath_,
   clang::StringRef,
   const clang::Module*,
+  bool,
   clang::SrcMgr::CharacteristicKind)
 {
   if (searchPath_.empty())
diff --git a/plugins/cpp/parser/src/ppincludecallback.h b/plugins/cpp/parser/src/ppincludecallback.h
index df3a96676..abaf55871 100644
--- a/plugins/cpp/parser/src/ppincludecallback.h
+++ b/plugins/cpp/parser/src/ppincludecallback.h
@@ -38,10 +38,11 @@ class PPIncludeCallback : public clang::PPCallbacks
     clang::StringRef FileName,
     bool IsAngled,
     clang::CharSourceRange FilenameRange,
-    const clang::FileEntry *File,
+    clang::OptionalFileEntryRef File,
     clang::StringRef SearchPath,
     clang::StringRef RelativePath,
     const clang::Module *Imported,
+    bool ModuleImported,
     clang::SrcMgr::CharacteristicKind FileType) override;
 
 private: