diff --git a/vndk/tools/header-checker/src/dumper/frontend_action.cpp b/vndk/tools/header-checker/src/dumper/frontend_action.cpp
index 6b773267b..b4d6ebfa9 100644
--- a/vndk/tools/header-checker/src/dumper/frontend_action.cpp
+++ b/vndk/tools/header-checker/src/dumper/frontend_action.cpp
@@ -24,7 +24,7 @@
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Lex/Preprocessor.h>
 
-#include <llvm/ADT/STLExtras.h>
+#include <utility>
 
 
 namespace header_checker {
@@ -39,7 +39,7 @@ std::unique_ptr<clang::ASTConsumer>
 HeaderCheckerFrontendAction::CreateASTConsumer(clang::CompilerInstance &ci,
                                                llvm::StringRef header_file) {
   // Create AST consumers.
-  return llvm::make_unique<HeaderASTConsumer>(&ci, options_);
+  return std::make_unique<HeaderASTConsumer>(&ci, options_);
 }
 
 bool HeaderCheckerFrontendAction::BeginInvocation(clang::CompilerInstance &ci) {
diff --git a/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp b/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp
index 307b9160d..06f60ade8 100644
--- a/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp
+++ b/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp
@@ -18,6 +18,8 @@
 
 #include <clang/Frontend/FrontendActions.h>
 
+#include <utility>
+
 
 namespace header_checker {
 namespace dumper {
@@ -27,8 +29,9 @@ HeaderCheckerFrontendActionFactory::HeaderCheckerFrontendActionFactory(
     HeaderCheckerOptions &options)
     : options_(options) {}
 
-clang::FrontendAction *HeaderCheckerFrontendActionFactory::create() {
-  return new HeaderCheckerFrontendAction(options_);
+std::unique_ptr<clang::FrontendAction>
+HeaderCheckerFrontendActionFactory::create() {
+  return std::make_unique<HeaderCheckerFrontendAction>(options_);
 }
 
 
diff --git a/vndk/tools/header-checker/src/dumper/frontend_action_factory.h b/vndk/tools/header-checker/src/dumper/frontend_action_factory.h
index 0a7d4094c..61ce4f30d 100644
--- a/vndk/tools/header-checker/src/dumper/frontend_action_factory.h
+++ b/vndk/tools/header-checker/src/dumper/frontend_action_factory.h
@@ -35,7 +35,7 @@ class HeaderCheckerFrontendActionFactory
  public:
   HeaderCheckerFrontendActionFactory(HeaderCheckerOptions &options);
 
-  clang::FrontendAction *create() override;
+  std::unique_ptr<clang::FrontendAction> create() override;
 };
 
 
diff --git a/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp b/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
index 451c139f1..9320a5480 100644
--- a/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
+++ b/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
@@ -21,6 +21,8 @@
 #include <llvm/Object/ELFTypes.h>
 #include <llvm/Object/SymbolSize.h>
 
+#include <utility>
+
 
 namespace header_checker {
 namespace repr {
@@ -112,7 +114,7 @@ ELFSoFileParser<T>::ELFSoFileParser(const llvm::object::ELFObjectFile<T> *obj) {
 template <typename T>
 static std::unique_ptr<SoFileParser> CreateELFSoFileParser(
     const llvm::object::ELFObjectFile<T> *elfo) {
-  return llvm::make_unique<ELFSoFileParser<T>>(elfo);
+  return std::make_unique<ELFSoFileParser<T>>(elfo);
 }