diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap.in
--- a/libcxx/include/module.modulemap.in
+++ b/libcxx/include/module.modulemap.in
@@ -34,7 +34,6 @@
     }
     module inttypes_h {
       header "inttypes.h"
-      export stdint_h
       export *
     }
     // <iso646.h> provided by compiler.
@@ -77,10 +76,6 @@
     module stdint_h {
       header "stdint.h"
       export *
-      // FIXME: This module only exists on OS X and for some reason the
-      // wildcard above doesn't export it. Removing this breaks the tests
-      // for C compatibility headers in C++17 mode with modules enabled.
-      export Darwin.C.stdint
     }
     module stdio_h {
       // <stdio.h>'s __need_* macros require textual inclusion.
@@ -118,13 +113,10 @@
   // allow their use in extern "C" contexts.
   module complex_h {
     header "complex.h"
-    export ccomplex
     export *
   }
   module tgmath_h {
     header "tgmath.h"
-    export ccomplex
-    export cmath
     export *
   }
 
@@ -136,7 +128,6 @@
     }
     module ccomplex {
       header "ccomplex"
-      export complex
       export *
     }
     module cctype {
@@ -157,7 +148,6 @@
     }
     module cinttypes {
       header "cinttypes"
-      export cstdint
       export *
     }
     module ciso646 {
@@ -200,7 +190,6 @@
     }
     module cstdint {
       header "cstdint"
-      export depr.stdint_h
       export *
     }
     module cstdio {
@@ -217,8 +206,6 @@
     }
     module ctgmath {
       header "ctgmath"
-      export ccomplex
-      export cmath
       export *
     }
     module ctime {
@@ -232,7 +219,6 @@
     module cwchar {
       @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
       header "cwchar"
-      export depr.stdio_h
       export *
     }
     module cwctype {
@@ -244,7 +230,6 @@
 
   module algorithm {
     header "algorithm"
-    export initializer_list
     export *
 
     module __algorithm {
@@ -710,7 +695,6 @@
   }
   module array {
     header "array"
-    export initializer_list
     export *
 
     module array_fwd { private header "__fwd/array.h" }
@@ -770,8 +754,6 @@
   }
   module bitset {
     header "bitset"
-    export string
-    export iosfwd
     export *
   }
   // No submodule for cassert. It fundamentally needs repeated, textual inclusion.
@@ -922,7 +904,6 @@
   }
   module deque {
     header "deque"
-    export initializer_list
     export *
   }
   module exception {
@@ -1031,7 +1012,6 @@
   }
   module forward_list {
     header "forward_list"
-    export initializer_list
     export *
   }
   module fstream {
@@ -1042,8 +1022,6 @@
   }
   module functional {
     header "functional"
-    // the contents of __type_traits/unwrap_ref.h should be available from functional too.
-    export type_traits.unwrap_ref
     export *
 
     module __functional {
@@ -1108,7 +1086,6 @@
   module ios {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "ios"
-    export iosfwd
     export *
 
     module __ios {
@@ -1130,10 +1107,6 @@
   module iostream {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "iostream"
-    export ios
-    export streambuf
-    export istream
-    export ostream
     export *
   }
   module istream {
@@ -1230,7 +1203,6 @@
   }
   module list {
     header "list"
-    export initializer_list
     export *
   }
   module locale {
@@ -1246,13 +1218,10 @@
   }
   module map {
     header "map"
-    export initializer_list
     export *
   }
   module mdspan {
     header "mdspan"
-    export array
-    export span
     export *
 
     module __mdspan {
@@ -1384,12 +1353,10 @@
   }
   module queue {
     header "queue"
-    export initializer_list
     export *
   }
   module random {
     header "random"
-    export initializer_list
     export *
 
     module __random {
@@ -1443,9 +1410,6 @@
   }
   module ranges {
     header "ranges"
-    export compare
-    export initializer_list
-    export iterator
     export *
 
     module __ranges {
@@ -1525,7 +1489,6 @@
   module regex {
     @requires_LIBCXX_ENABLE_LOCALIZATION@
     header "regex"
-    export initializer_list
     export *
   }
   module scoped_allocator {
@@ -1539,7 +1502,6 @@
   }
   module set {
     header "set"
-    export initializer_list
     export *
   }
   module shared_mutex {
@@ -1565,7 +1527,6 @@
   }
   module stack {
     header "stack"
-    export initializer_list
     export *
   }
   module stdexcept {
@@ -1593,8 +1554,6 @@
   }
   module string {
     header "string"
-    export initializer_list
-    export string_view
     module __string {
       module char_traits           { private header "__string/char_traits.h" }
       module constexpr_c_functions {
@@ -1608,7 +1567,6 @@
   }
   module string_view {
     header "string_view"
-    export initializer_list
     export *
     module string_view_fwd { private header "__fwd/string_view.h" }
   }
@@ -1710,6 +1668,7 @@
     module integral_constant                         { private header "__type_traits/integral_constant.h" }
     module invoke                                    {
       private header "__type_traits/invoke.h"
+      export apply_cv
       export conditional
       export decay
       export is_base_of
@@ -1889,17 +1848,14 @@
   }
   module unordered_map {
     header "unordered_map"
-    export initializer_list
     export *
   }
   module unordered_set {
     header "unordered_set"
-    export initializer_list
     export *
   }
   module utility {
     header "utility"
-    export initializer_list
     export *
 
     module __utility {
@@ -1954,7 +1910,6 @@
   }
   module valarray {
     header "valarray"
-    export initializer_list
     export *
   }
   module variant {
@@ -1967,7 +1922,6 @@
   }
   module vector {
     header "vector"
-    export initializer_list
     export *
   }
   module version {
@@ -1997,7 +1951,6 @@
   // This one needs to appear after __tree to work around issues with modules in Objective-C++ mode.
   module coroutine {
     header "coroutine"
-    export compare
     export *
 
     module __coroutine {