diff --git a/clang-tools-extra/modularize/PreprocessorTracker.cpp b/clang-tools-extra/modularize/PreprocessorTracker.cpp
index b80bff9150e63..59517059d2a9e 100644
--- a/clang-tools-extra/modularize/PreprocessorTracker.cpp
+++ b/clang-tools-extra/modularize/PreprocessorTracker.cpp
@@ -987,11 +987,7 @@ class PreprocessorTrackerImpl : public PreprocessorTracker {
 
   // Check for presence of header handle in the header stack.
   bool isHeaderHandleInStack(HeaderHandle H) const {
-    for (auto I = HeaderStack.begin(), E = HeaderStack.end(); I != E; ++I) {
-      if (*I == H)
-        return true;
-    }
-    return false;
+    return llvm::is_contained(HeaderStack, H);
   }
 
   // Get the handle of a header inclusion path entry.