diff --git a/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp
index 1ca9d4fb79d5..3ceb604bdd29 100644
--- a/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp
+++ b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp
@@ -60,7 +60,7 @@ class IncludeDirectivesPPCallback : public clang::PPCallbacks {
 public:
   IncludeDirectivesPPCallback(IncludeDirectives *Self)
       : Self(Self), Guard(nullptr) {}
-  ~IncludeDirectivesPPCallback() override = default;
+  ~IncludeDirectivesPPCallback() override {}
 
 private:
   void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
diff --git a/clang-tools-extra/clang-modernize/Core/Transform.cpp b/clang-tools-extra/clang-modernize/Core/Transform.cpp
index 9e58b7a0d7f0..baae33296874 100644
--- a/clang-tools-extra/clang-modernize/Core/Transform.cpp
+++ b/clang-tools-extra/clang-modernize/Core/Transform.cpp
@@ -82,7 +82,7 @@ Transform::Transform(llvm::StringRef Name, const TransformOptions &Options)
   Reset();
 }
 
-Transform::~Transform() = default;
+Transform::~Transform() {}
 
 bool Transform::isFileModifiable(const SourceManager &SM,
                                  SourceLocation Loc) const {
@@ -150,7 +150,7 @@ Version Version::getFromString(llvm::StringRef VersionStr) {
   return V;
 }
 
-TransformFactory::~TransformFactory() = default;
+TransformFactory::~TransformFactory() {}
 
 namespace {
 bool versionSupported(Version Required, Version AvailableSince) {
diff --git a/clang-tools-extra/clang-query/Query.cpp b/clang-tools-extra/clang-query/Query.cpp
index 594c74294314..74eb6ea44a85 100644
--- a/clang-tools-extra/clang-query/Query.cpp
+++ b/clang-tools-extra/clang-query/Query.cpp
@@ -20,7 +20,7 @@ using namespace clang::ast_matchers::dynamic;
 namespace clang {
 namespace query {
 
-Query::~Query() = default;
+Query::~Query() {}
 
 bool InvalidQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
   OS << ErrStr << "\n";
diff --git a/clang-tools-extra/clang-tidy/ClangTidyModule.h b/clang-tools-extra/clang-tidy/ClangTidyModule.h
index ac478f772353..58e833c0e877 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyModule.h
+++ b/clang-tools-extra/clang-tidy/ClangTidyModule.h
@@ -82,7 +82,7 @@ private:
 /// them a prefixed name.
 class ClangTidyModule {
 public:
-  virtual ~ClangTidyModule() = default;
+  virtual ~ClangTidyModule() {}
 
   /// \brief Implement this function in order to register all \c CheckFactories
   /// belonging to this module.
diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.h b/clang-tools-extra/clang-tidy/ClangTidyOptions.h
index c92660cff476..a92a405e0caa 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyOptions.h
+++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.h
@@ -88,7 +88,7 @@ struct ClangTidyOptions {
 /// \brief Abstract interface for retrieving various ClangTidy options.
 class ClangTidyOptionsProvider {
 public:
-  virtual ~ClangTidyOptionsProvider() = default;
+  virtual ~ClangTidyOptionsProvider() {}
 
   /// \brief Returns global options, which are independent of the file.
   virtual const ClangTidyGlobalOptions &getGlobalOptions() = 0;
diff --git a/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp b/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp
index f093aa975437..8f4bee6ad906 100644
--- a/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp
+++ b/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp
@@ -38,7 +38,7 @@ IncludeInserter::IncludeInserter(const SourceManager &SourceMgr,
                                  IncludeSorter::IncludeStyle Style)
     : SourceMgr(SourceMgr), LangOpts(LangOpts), Style(Style) {}
 
-IncludeInserter::~IncludeInserter() = default;
+IncludeInserter::~IncludeInserter() {}
 
 std::unique_ptr<PPCallbacks> IncludeInserter::CreatePPCallbacks() {
   return llvm::make_unique<IncludeInserterCallback>(this);
diff --git a/clang-tools-extra/modularize/CoverageChecker.cpp b/clang-tools-extra/modularize/CoverageChecker.cpp
index a0a979e5f385..b3c4227b6238 100644
--- a/clang-tools-extra/modularize/CoverageChecker.cpp
+++ b/clang-tools-extra/modularize/CoverageChecker.cpp
@@ -83,7 +83,7 @@ namespace sys = llvm::sys;
 class CoverageCheckerCallbacks : public PPCallbacks {
 public:
   CoverageCheckerCallbacks(CoverageChecker &Checker) : Checker(Checker) {}
-  ~CoverageCheckerCallbacks() override = default;
+  ~CoverageCheckerCallbacks() override {}
 
   // Include directive callback.
   void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
diff --git a/clang-tools-extra/modularize/PreprocessorTracker.cpp b/clang-tools-extra/modularize/PreprocessorTracker.cpp
index d7640480dee9..551bb3cea5bb 100644
--- a/clang-tools-extra/modularize/PreprocessorTracker.cpp
+++ b/clang-tools-extra/modularize/PreprocessorTracker.cpp
@@ -746,7 +746,7 @@ public:
   PreprocessorCallbacks(PreprocessorTrackerImpl &ppTracker,
                         clang::Preprocessor &PP, llvm::StringRef rootHeaderFile)
       : PPTracker(ppTracker), PP(PP), RootHeaderFile(rootHeaderFile) {}
-  ~PreprocessorCallbacks() override = default;
+  ~PreprocessorCallbacks() override {}
 
   // Overridden handlers.
   void InclusionDirective(clang::SourceLocation HashLoc,
@@ -812,7 +812,7 @@ public:
     }
   }
 
-  ~PreprocessorTrackerImpl() override = default;
+  ~PreprocessorTrackerImpl() override {}
 
   // Handle entering a preprocessing session.
   void handlePreprocessorEntry(clang::Preprocessor &PP,
@@ -1288,7 +1288,7 @@ private:
 // PreprocessorTracker functions.
 
 // PreprocessorTracker desctructor.
-PreprocessorTracker::~PreprocessorTracker() = default;
+PreprocessorTracker::~PreprocessorTracker() {}
 
 // Create instance of PreprocessorTracker.
 PreprocessorTracker *PreprocessorTracker::create(
diff --git a/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp b/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
index caa819eeb2ba..e0d23dd8341f 100644
--- a/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
+++ b/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
@@ -96,7 +96,7 @@ PPCallbacksTracker::PPCallbacksTracker(llvm::SmallSet<std::string, 4> &Ignore,
                                        clang::Preprocessor &PP)
     : CallbackCalls(CallbackCalls), Ignore(Ignore), PP(PP) {}
 
-PPCallbacksTracker::~PPCallbacksTracker() = default;
+PPCallbacksTracker::~PPCallbacksTracker() {}
 
 // Callback functions.
 
diff --git a/clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp b/clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp
index 2a5196b7cfbb..bad804353f14 100644
--- a/clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp
+++ b/clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp
@@ -98,7 +98,7 @@ class CXXSystemIncludeInserterCheck : public IncludeInserterCheckBase {
 public:
   CXXSystemIncludeInserterCheck(StringRef CheckName, ClangTidyContext *Context)
       : IncludeInserterCheckBase(CheckName, Context) {}
-  virtual ~CXXSystemIncludeInserterCheck() = default;
+  virtual ~CXXSystemIncludeInserterCheck() {}
 
   std::vector<StringRef> HeadersToInclude() const override { return {"set"}; }
   bool IsAngledInclude() const override { return true; }