diff --git a/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp
index 7f14e0731681..8b96f1a1f86b 100644
--- a/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp
+++ b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp
@@ -363,7 +363,7 @@ Replacement IncludeDirectives::addAngledInclude(const clang::FileEntry *File,
     return Replacement();
 
   unsigned Offset, NLFlags;
-  llvm::tie(Offset, NLFlags) = angledIncludeInsertionOffset(FID);
+  std::tie(Offset, NLFlags) = angledIncludeInsertionOffset(FID);
 
   StringRef EOL = guessEOL(Sources, FID);
   llvm::SmallString<32> InsertionText;
diff --git a/clang-tools-extra/clang-modernize/Core/Transform.cpp b/clang-tools-extra/clang-modernize/Core/Transform.cpp
index 2943f5cfece2..8b513954efc5 100644
--- a/clang-tools-extra/clang-modernize/Core/Transform.cpp
+++ b/clang-tools-extra/clang-modernize/Core/Transform.cpp
@@ -134,10 +134,10 @@ Version Version::getFromString(llvm::StringRef VersionStr) {
   llvm::StringRef MajorStr, MinorStr;
   Version V;
 
-  llvm::tie(MajorStr, MinorStr) = VersionStr.split('.');
+  std::tie(MajorStr, MinorStr) = VersionStr.split('.');
   if (!MinorStr.empty()) {
     llvm::StringRef Ignore;
-    llvm::tie(MinorStr, Ignore) = MinorStr.split('.');
+    std::tie(MinorStr, Ignore) = MinorStr.split('.');
     if (MinorStr.getAsInteger(10, V.Minor))
       return Version();
   }
diff --git a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp
index 881501ee5542..a2b100e52cba 100644
--- a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp
+++ b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp
@@ -213,7 +213,7 @@ static CompilerVersions handleSupportedCompilers(const char *ProgName,
                                                         E = Compilers.end();
        I != E; ++I) {
     llvm::StringRef Compiler, VersionStr;
-    llvm::tie(Compiler, VersionStr) = I->split('-');
+    std::tie(Compiler, VersionStr) = I->split('-');
     Version *V = llvm::StringSwitch<Version *>(Compiler)
         .Case("clang", &RequiredVersions.Clang)
         .Case("gcc", &RequiredVersions.Gcc).Case("icc", &RequiredVersions.Icc)