1 files changed, 14 insertions, 2 deletions
diff --git a/include/clang/module.modulemap b/include/clang/module.modulemap
index 7410c5cd05..29fa008448 100644
--- a/include/clang/module.modulemap
+++ b/include/clang/module.modulemap
@@ -98,13 +98,25 @@ module Clang_Rewrite { requires cplusplus umbrella "Rewrite" module * { export *
 module Clang_Sema { requires cplusplus umbrella "Sema" module * { export * } }
 module Clang_Serialization { requires cplusplus umbrella "Serialization" module * { export * } }
 
-module Clang_StaticAnalyzer {
+module Clang_StaticAnalyzer_Core {
   requires cplusplus
-  umbrella "StaticAnalyzer"
+  umbrella "StaticAnalyzer/Core"
 
   textual header "StaticAnalyzer/Core/Analyses.def"
 
   module * { export * }
 }
 
+module Clang_StaticAnalyzer_Checkers {
+  requires cplusplus
+  umbrella "StaticAnalyzer/Checkers"
+  module * { export * }
+}
+
+module Clang_StaticAnalyzer_Frontend {
+  requires cplusplus
+  umbrella "StaticAnalyzer/Frontend"
+  module * { export * }
+}
+
 module Clang_Tooling { requires cplusplus umbrella "Tooling" module * { export * } }