diff --git a/stdlib/public/Platform/ucrt.modulemap b/stdlib/public/Platform/ucrt.modulemap
index f57d9e62b3131..796343a1ddc14 100644
--- a/stdlib/public/Platform/ucrt.modulemap
+++ b/stdlib/public/Platform/ucrt.modulemap
@@ -12,21 +12,29 @@
 
 // The following modules have to be standalone top-level modules to deal with
 // version 10.0.26100 of the Windows SDK.
-module _malloc [system] [no_undeclared_includes] {
+module _complex [system] [no_undeclared_includes] {
   use corecrt
-  header "malloc.h"
+  use std
+  header "complex.h"
   export *
 }
 
-module _complex [system] [no_undeclared_includes] {
+module _fenv [system] [no_undeclared_includes] {
+  use _float
   use corecrt
-  use std
-  header "complex.h"
+  header "fenv.h"
   export *
 }
 
-module _stddef [system] [no_undeclared_includes] {
-  header "stddef.h"
+module _float [system] [no_undeclared_includes] {
+  use corecrt
+  header "float.h"
+  export *
+}
+
+module _malloc [system] [no_undeclared_includes] {
+  use corecrt
+  header "malloc.h"
   export *
 }
 
@@ -37,11 +45,12 @@ module _stdlib [system] [no_undeclared_includes] {
 }
 
 module ucrt [system] {
-  export _malloc
 
   module C {
     export _complex
-    export _stddef
+    export _fenv
+    export _float
+    export _malloc
     export _stdlib
 
     module ctype {
@@ -50,7 +59,7 @@ module ucrt [system] {
     }
 
     module errno {
-      header "errno.h"
+      textual header "errno.h"
       export *
     }
 
@@ -74,6 +83,11 @@ module ucrt [system] {
       export *
     }
 
+    module malloc {
+      header "malloc.h"
+      export *
+    }
+
     module math {
       header "math.h"
       export *
@@ -84,6 +98,16 @@ module ucrt [system] {
       export *
     }
 
+    module stdalign {
+      header "stdalign.h"
+      export  *
+    }
+
+    module stddef {
+      textual header "stddef.h"
+      export *
+    }
+
     module stdio {
       header "stdio.h"
       export *
@@ -101,6 +125,11 @@ module ucrt [system] {
       export *
     }
 
+    module stdnoreturn {
+      textual header "stdnoreturn.h"
+      export *
+    }
+
     module string {
       header "string.h"
       export *
@@ -187,8 +216,14 @@ module corecrt [system] {
     export *
   }
 
+  module direct {
+    header "corecrt_wdirect.h"
+    export *
+  }
+
   module io {
     header "corecrt_io.h"
+    header "corecrt_wio.h"
     export *
   }
 
@@ -202,11 +237,36 @@ module corecrt [system] {
     export *
   }
 
+  module memory {
+    header "corecrt_memory.h"
+    export *
+  }
+
+  module memcpy {
+    header "corecrt_memcpy_s.h"
+    export *
+  }
+
+  module process {
+    header "corecrt_wprocess.h"
+    export *
+  }
+
+  module search {
+    header "corecrt_search.h"
+    export *
+  }
+
   module share {
     header "corecrt_share.h"
     export *
   }
 
+  module ctype {
+    header "corecrt_wctype.h"
+    export *
+  }
+
   module stdio {
     header "corecrt_wstdio.h"
     export *
@@ -227,4 +287,3 @@ module corecrt [system] {
     export *
   }
 }
-
diff --git a/stdlib/public/Platform/vcruntime.modulemap b/stdlib/public/Platform/vcruntime.modulemap
index 564c832dcc12b..0ee59dfc63e82 100644
--- a/stdlib/public/Platform/vcruntime.modulemap
+++ b/stdlib/public/Platform/vcruntime.modulemap
@@ -100,15 +100,45 @@ module vcruntime [system] {
 
   header "vcruntime.h"
 
+  module iso646 {
+    header "iso646.h"
+    export *
+  }
+
+  module limits {
+    header "limits.h"
+    export *
+  }
+
   module setjmp {
     header "setjmp.h"
     export *
   }
 
+  module stdarg {
+    header "stdarg.h"
+    export *
+  }
+
+  module stdbool {
+    header "stdbool.h"
+    export  *
+  }
+
   module stdint {
     header "stdint.h"
     export *
   }
+
+  module string {
+    header "vcruntime_string.h"
+    export *
+  }
+
+  module vadefs {
+    header "vadefs.h"
+    export *
+  }
 }
 
 module std_config [system] {