diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index e372a8058..9603abccf 100644
--- a/vndk/tools/header-checker/android/envsetup.sh
+++ b/vndk/tools/header-checker/android/envsetup.sh
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 export LLVM_BUILD_HOST_TOOLS=true
-export LLVM_PREBUILTS_VERSION=clang-r370808
-export LLVM_RELEASE_VERSION=10.0.1
+export LLVM_PREBUILTS_VERSION=clang-r377782
+export LLVM_RELEASE_VERSION=10.0.3
diff --git a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
index 03b00b221..2cf94bc8d 100644
--- a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
+++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
@@ -18,7 +18,6 @@
 #include "utils/header_abi_util.h"
 
 #include <clang/AST/QualTypeNames.h>
-#include <clang/Index/CodegenNameGenerator.h>
 
 #include <regex>
 #include <string>
diff --git a/vndk/tools/header-checker/src/dumper/ast_processing.cpp b/vndk/tools/header-checker/src/dumper/ast_processing.cpp
index e5ff16228..43df29dd2 100644
--- a/vndk/tools/header-checker/src/dumper/ast_processing.cpp
+++ b/vndk/tools/header-checker/src/dumper/ast_processing.cpp
@@ -19,7 +19,6 @@
 
 #include <clang/Lex/Token.h>
 #include <clang/AST/QualTypeNames.h>
-#include <clang/Index/CodegenNameGenerator.h>
 
 #include <fstream>
 #include <iostream>
@@ -135,7 +134,7 @@ bool HeaderASTVisitor::VisitFunctionDecl(const clang::FunctionDecl *decl) {
   auto function_wrapper = function_decl_wrapper.GetFunctionDecl();
   // Destructors and Constructors can have more than 1 symbol generated from the
   // same Decl.
-  clang::index::CodegenNameGenerator cg(*ast_contextp_);
+  clang::ASTNameGenerator cg(*ast_contextp_);
   std::vector<std::string> manglings = cg.getAllManglings(decl);
   if (!manglings.empty()) {
     return AddMangledFunctions(function_wrapper.get(), module_, manglings);
diff --git a/vndk/tools/header-checker/src/dumper/fake_decl_source.cpp b/vndk/tools/header-checker/src/dumper/fake_decl_source.cpp
index 4930a39c9..57cd1e389 100644
--- a/vndk/tools/header-checker/src/dumper/fake_decl_source.cpp
+++ b/vndk/tools/header-checker/src/dumper/fake_decl_source.cpp
@@ -57,8 +57,7 @@ FakeDeclSource::CreateClassTemplateDecl(clang::CXXRecordDecl *cxx_record_decl,
   clang::ClassTemplateDecl *class_template_decl =
       clang::ClassTemplateDecl::Create(
           ast, decl_context, clang::SourceLocation(),
-          cxx_record_decl->getDeclName(), parm_list, cxx_record_decl,
-          /* AssociatedConstraints */ nullptr);
+          cxx_record_decl->getDeclName(), parm_list, cxx_record_decl);
 
   cxx_record_decl->setDescribedClassTemplate(class_template_decl);
   class_template_decl->setInvalidDecl(true);