diff --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
index 1790a7242e5b..eb9a698a3390 100644
--- a/llvm/include/llvm/module.modulemap
+++ b/llvm/include/llvm/module.modulemap
@@ -108,11 +108,21 @@ module LLVM_MC {
   umbrella "MC"
   module * { export * }
 
+  // FIXME: Excluded due to mislayering.
+  exclude header "MC/MCObjectSymbolizer.h"
+
   // Exclude this; it's fundamentally non-modular.
   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_MC_MCObjectSymbolizer { header "MC/MCObjectSymbolizer.h" export * }
+}
+
 module LLVM_Option { requires cplusplus umbrella "Option" module * { export * } }
 module LLVM_TableGen { requires cplusplus umbrella "TableGen" module * { export * } }