1 files changed, 6 insertions, 4 deletions
diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap
index 1790a72..46f6e40 100644
--- a/include/llvm/module.modulemap
+++ b/include/llvm/module.modulemap
@@ -112,7 +112,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 +153,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