diff --git a/clang-tools-extra/modularize/CoverageChecker.cpp b/clang-tools-extra/modularize/CoverageChecker.cpp
index d80d78c64c6e..9386d86c8b4c 100644
--- a/clang-tools-extra/modularize/CoverageChecker.cpp
+++ b/clang-tools-extra/modularize/CoverageChecker.cpp
@@ -227,7 +227,7 @@ bool CoverageChecker::collectModuleHeaders(const Module &Mod) {
     ModuleMapHeadersSet.insert(
         ModularizeUtilities::getCanonicalPath(Header.Entry.getName()));
 
-  for (auto *Submodule : Mod.submodules())
+  for (Module *Submodule : Mod.submodules())
     collectModuleHeaders(*Submodule);
 
   return true;
diff --git a/clang-tools-extra/modularize/ModularizeUtilities.cpp b/clang-tools-extra/modularize/ModularizeUtilities.cpp
index 1353904f1fe0..607b0382a2e9 100644
--- a/clang-tools-extra/modularize/ModularizeUtilities.cpp
+++ b/clang-tools-extra/modularize/ModularizeUtilities.cpp
@@ -342,7 +342,7 @@ bool ModularizeUtilities::collectModuleHeaders(const clang::Module &Mod) {
   DependentsVector UmbrellaDependents;
 
   // Recursively do submodules.
-  for (auto *Submodule : Mod.submodules())
+  for (Module *Submodule : Mod.submodules())
     collectModuleHeaders(*Submodule);
 
   if (std::optional<clang::Module::Header> UmbrellaHeader =