diff --git a/llvm/include/llvm/ADT/GenericUniformityImpl.h b/llvm/include/llvm/ADT/GenericUniformityImpl.h
index 2fa5058cf0c8d..2cbaabe272e34 100644
--- a/llvm/include/llvm/ADT/GenericUniformityImpl.h
+++ b/llvm/include/llvm/ADT/GenericUniformityImpl.h
@@ -40,10 +40,13 @@
 
 #include "llvm/ADT/GenericUniformityInfo.h"
 
+#include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SparseBitVector.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include <set>
+
 #define DEBUG_TYPE "uniformity"
 
 using namespace llvm;
diff --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
index 1867dea570dba..07ac1cf87d95c 100644
--- a/llvm/include/llvm/module.modulemap
+++ b/llvm/include/llvm/module.modulemap
@@ -412,15 +412,23 @@ module LLVM_Utils {
     // Exclude these; they are fundamentally non-modular.
     exclude header "Support/PluginLoader.h"
     exclude header "Support/Solaris/sys/regset.h"
+    textual header "Support/TargetOpcodes.def"
+
+  }
+
+  module TargetParser {
+    requires cplusplus
+
+    umbrella "TargetParser"
+    module * { export * }
 
     // These are intended for textual inclusion.
-    textual header "Support/AArch64TargetParser.def"
-    textual header "Support/ARMTargetParser.def"
-    textual header "Support/CSKYTargetParser.def"
-    textual header "Support/RISCVTargetParser.def"
-    textual header "Support/TargetOpcodes.def"
-    textual header "Support/X86TargetParser.def"
-    textual header "Support/LoongArchTargetParser.def"
+    textual header "TargetParser/AArch64TargetParser.def"
+    textual header "TargetParser/ARMTargetParser.def"
+    textual header "TargetParser/CSKYTargetParser.def"
+    textual header "TargetParser/RISCVTargetParser.def"
+    textual header "TargetParser/X86TargetParser.def"
+    textual header "TargetParser/LoongArchTargetParser.def"
   }
 
   // This part of the module is usable from both C and C++ code.