1 files changed, 21 insertions, 6 deletions
diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap
index 1790a7242e5b..61f65510c4ea 100644
--- a/include/llvm/module.modulemap
+++ b/include/llvm/module.modulemap
@@ -75,8 +75,9 @@ module LLVM_IR {
   exclude header "IR/PassManager.h"
   exclude header "IR/LegacyPassManager.h"
 
-  // Exclude this; it's intended for (repeated) textual inclusion.
-  exclude header "IR/Instruction.def"
+  // These are intended for (repeated) textual inclusion.
+  textual header "IR/Instruction.def"
+  textual header "IR/Metadata.def"
 }
 
 module LLVM_LegacyPassManager {
@@ -112,7 +113,12 @@ module LLVM_MC {
   exclude header "MC/MCTargetOptionsCommandFlags.h"
 }
 
-module LLVM_Object { requires cplusplus umbrella "Object" module * { export * } }
+module LLVM_Object {
+  requires cplusplus
+  umbrella "Object"
+  module * { export * }
+}
+
 module LLVM_Option { requires cplusplus umbrella "Option" module * { export * } }
 module LLVM_TableGen { requires cplusplus umbrella "TableGen" module * { export * } }
 
@@ -148,9 +154,6 @@ module LLVM_Utils {
     exclude header "Support/AIXDataTypesFix.h"
 
     // Exclude this; it's fundamentally non-modular.
-    exclude header "Support/Debug.h"
-
-    // Exclude this; it's fundamentally non-modular.
     exclude header "Support/PluginLoader.h"
 
     // Exclude this; it's a weirdly-factored part of llvm-gcov and conflicts
@@ -159,6 +162,18 @@ module LLVM_Utils {
 
     // FIXME: Mislayered?
     exclude header "Support/TargetRegistry.h"
+
+    // These are intended for textual inclusion.
+    textual header "Support/ELFRelocs/AArch64.def"
+    textual header "Support/ELFRelocs/ARM.def"
+    textual header "Support/ELFRelocs/Hexagon.def"
+    textual header "Support/ELFRelocs/i386.def"
+    textual header "Support/ELFRelocs/Mips.def"
+    textual header "Support/ELFRelocs/PowerPC64.def"
+    textual header "Support/ELFRelocs/PowerPC.def"
+    textual header "Support/ELFRelocs/Sparc.def"
+    textual header "Support/ELFRelocs/SystemZ.def"
+    textual header "Support/ELFRelocs/x86_64.def"
   }
 }