diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst
--- a/libcxx/docs/ReleaseNotes.rst
+++ b/libcxx/docs/ReleaseNotes.rst
@@ -117,6 +117,8 @@
 - The headers ``<experimental/algorithm>`` and ``<experimental/functional>`` have been removed, since all the contents
   have been implemented in namespace ``std`` for at least two releases.
 
+- The ``std`` clang module has been broken up into separate top level modules per public header.
+
 - The formatter specialization ``template<size_t N> struct formatter<const charT[N], charT>``
   has been removed. Since libc++'s format library was marked experimental there
   is no backwards compatibility option. This specialization has been removed
diff --git a/libcxx/include/__stop_token/intrusive_shared_ptr.h b/libcxx/include/__stop_token/intrusive_shared_ptr.h
--- a/libcxx/include/__stop_token/intrusive_shared_ptr.h
+++ b/libcxx/include/__stop_token/intrusive_shared_ptr.h
@@ -12,6 +12,7 @@
 
 #include <__atomic/memory_order.h>
 #include <__config>
+#include <__stop_token/stop_state.h>
 #include <__type_traits/is_reference.h>
 #include <__utility/move.h>
 #include <__utility/swap.h>
diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -30,6 +30,16 @@
 #elif !defined(_LIBCPP_HAS_NO_THREADS)
 
 #if defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
+// Some platforms require <bits/atomic_wide_counter.h> in order for
+// PTHREAD_COND_INITIALIZER to be expanded. Normally that would come
+// in via <pthread.h>, but it's a non-modular header on those platforms,
+// so libc++'s <math.h> usually absorbs atomic_wide_counter.h into the
+// module with <math.h> and makes atomic_wide_counter.h invisible.
+// Include <math.h> here to work around that.
+# include <math.h>
+// <time.h> has a similar issue where timer_create looks like it's
+// redeclared in <pthread.h> unless it's explicitly included first.
+# include <time.h>
 # include <pthread.h>
 # include <sched.h>
 #elif defined(_LIBCPP_HAS_THREAD_API_C11)
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
@@ -1,2072 +1,2069 @@
-// define the module for __config outside of the top level 'std' module
-// since __config may be included from C headers which may create an
-// include cycle.
-module std_config [system] [extern_c] {
-  textual header "__config"
+// Main C++ standard library interfaces
+module std_algorithm [system] {
+  header "algorithm"
+  export *
+}
+module std_any [system] {
+  header "any"
+  export *
+}
+module std_array [system] {
+  header "array"
+  export *
+}
+module std_atomic [system] {
+  header "atomic"
+  export *
+}
+module std_barrier [system] {
+  @requires_LIBCXX_ENABLE_THREADS@
+  header "barrier"
+  export *
+}
+module std_bit [system] {
+  header "bit"
+  export *
+}
+module std_bitset [system] {
+  header "bitset"
+  export *
+}
+module std_charconv [system] {
+  header "charconv"
+  export *
+}
+module std_chrono [system] {
+  header "chrono"
+  export *
+}
+module std_codecvt [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "codecvt"
+  export *
+}
+module std_compare [system] {
+  header "compare"
+  export *
+}
+module std_complex [system] {
+  header "complex"
+  export *
+}
+module std_concepts [system] {
+  header "concepts"
+  export *
+}
+module std_condition_variable [system] {
+  header "condition_variable"
+  export *
+}
+module std_coroutine [system] {
+  header "coroutine"
+  export *
+}
+module std_deque [system] {
+  header "deque"
+  export *
+}
+module std_exception [system] {
+  header "exception"
+  export *
+}
+module std_execution [system] {
+  header "execution"
+  export *
+}
+module std_expected [system] {
+  header "expected"
+  export *
+}
+module std_filesystem [system] {
+  @requires_LIBCXX_ENABLE_FILESYSTEM@
+  header "filesystem"
+  export *
+}
+module std_format [system] {
+  header "format"
+  export *
+}
+module std_forward_list [system] {
+  header "forward_list"
+  export *
+}
+module std_fstream [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  @requires_LIBCXX_ENABLE_FILESYSTEM@
+  header "fstream"
+  export *
+}
+module std_functional [system] {
+  header "functional"
+  export *
+}
+module std_future [system] {
+  @requires_LIBCXX_ENABLE_THREADS@
+  header "future"
+  export *
+}
+module std_initializer_list [system] {
+  header "initializer_list"
+  export *
+}
+module std_iomanip [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "iomanip"
+  export *
+}
+module std_ios [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "ios"
+  export *
+}
+module std_iosfwd [system] {
+  header "iosfwd"
+  export *
+}
+module std_iostream [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "iostream"
+  export *
+}
+module std_istream [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "istream"
+  export *
+}
+module std_iterator [system] {
+  header "iterator"
+  export *
+}
+module std_latch [system] {
+  @requires_LIBCXX_ENABLE_THREADS@
+  header "latch"
+  export *
+}
+module std_limits [system] {
+  header "limits"
+  export *
+}
+module std_list [system] {
+  header "list"
+  export *
+}
+module std_locale [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "locale"
+  export *
+}
+module std_map [system] {
+  header "map"
+  export *
+}
+module std_mdspan [system] {
+  header "mdspan"
+  export *
+}
+module std_memory [system] {
+  header "memory"
+  export *
+}
+module std_memory_resource [system] {
+  header "memory_resource"
+  export *
+}
+module std_mutex [system] {
+  @requires_LIBCXX_ENABLE_THREADS@
+  header "mutex"
+  export *
+}
+module std_new [system] {
+  header "new"
+  export *
+}
+module std_numbers [system] {
+  header "numbers"
+  export *
+}
+module std_numeric [system] {
+  header "numeric"
+  export *
+}
+module std_optional [system] {
+  header "optional"
+  export *
+}
+module std_ostream [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "ostream"
+  export *
+}
+module std_print [system] {
+  header "print"
+  export *
+}
+module std_queue [system] {
+  header "queue"
+  export *
+}
+module std_random [system] {
+  header "random"
+  export *
+}
+module std_ranges [system] {
+  header "ranges"
+  export *
+}
+module std_ratio [system] {
+  header "ratio"
+  export *
+}
+module std_regex [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "regex"
+  export *
+}
+module std_scoped_allocator [system] {
+  header "scoped_allocator"
+  export *
+}
+module std_semaphore [system] {
+  @requires_LIBCXX_ENABLE_THREADS@
+  header "semaphore"
+  export *
+}
+module std_set [system] {
+  header "set"
+  export *
+}
+module std_shared_mutex [system] {
+  @requires_LIBCXX_ENABLE_THREADS@
+  header "shared_mutex"
+  export std_version
+}
+module std_source_location [system] {
+  header "source_location"
+  export *
+}
+module std_span [system] {
+  header "span"
+  export std_private_ranges_enable_borrowed_range
+  export std_version
+  export std_private_span_span_fwd
+}
+module std_sstream [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "sstream"
+  export *
+}
+module std_stack [system] {
+  header "stack"
+  export *
+}
+module std_stdexcept [system] {
+  header "stdexcept"
+  export *
+}
+module std_stop_token {
+  @requires_LIBCXX_ENABLE_THREADS@
+  header "stop_token"
+  export *
+}
+module std_streambuf [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "streambuf"
+  export *
+}
+module std_string [system] {
+  header "string"
+  export *
+}
+module std_string_view [system] {
+  header "string_view"
+  export *
+}
+module std_strstream [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "strstream"
+  export *
+}
+module std_system_error [system] {
+  header "system_error"
+  export *
+}
+module std_thread [system] {
+  @requires_LIBCXX_ENABLE_THREADS@
+  header "thread"
+  export *
+}
+module std_tuple [system] {
+  header "tuple"
+  export *
+}
+module std_type_traits [system] {
+  header "type_traits"
+  export *
+}
+module std_typeindex [system] {
+  header "typeindex"
+  export *
+}
+module std_typeinfo [system] {
+  header "typeinfo"
+  export *
+}
+module std_unordered_map [system] {
+  header "unordered_map"
+  export *
+}
+module std_unordered_set [system] {
+  header "unordered_set"
+  export *
+}
+module std_utility [system] {
+  header "utility"
+  export *
+}
+module std_valarray [system] {
+  header "valarray"
+  export *
+}
+module std_variant [system] {
+  header "variant"
+  export *
+}
+module std_vector [system] {
+  header "vector"
+  export *
+}
+module std_version [system] {
+  header "version"
   export *
 }
 
-module std [system] {
-  // FIXME: The standard does not require that each of these submodules
-  // re-exports its imported modules. We should provide an alternative form of
-  // export that issues a warning if a name from the submodule is used, and
-  // use that to provide a 'strict mode' for libc++.
+// C standard library interface wrappers
+module std_cassert [system] {
+  // <cassert>'s use of NDEBUG requires textual inclusion.
+  textual header "cassert"
+}
+module std_ccomplex [system] {
+  header "ccomplex"
+  export *
+}
+module std_cctype [system] {
+  header "cctype"
+  export *
+}
+module std_cerrno [system] {
+  header "cerrno"
+  export *
+}
+module std_cfenv [system] {
+  header "cfenv"
+  export *
+}
+module std_cfloat [system] {
+  header "cfloat"
+  export *
+}
+module std_cinttypes [system] {
+  header "cinttypes"
+  export *
+}
+module std_ciso646 [system] {
+  header "ciso646"
+  export *
+}
+module std_climits [system] {
+  header "climits"
+  export *
+}
+module std_clocale [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "clocale"
+  export *
+}
+module std_cmath [system] {
+  header "cmath"
+  export *
+}
+module std_csetjmp [system] {
+  header "csetjmp"
+  export *
+}
+module std_csignal [system] {
+  header "csignal"
+  export *
+}
+// FIXME: <cstdalign> is missing.
+module std_cstdarg [system] {
+  header "cstdarg"
+  export *
+}
+module std_cstdbool [system] {
+  header "cstdbool"
+  export *
+}
+module std_cstddef [system] {
+  header "cstddef"
+  export *
+}
+module std_cstdint [system] {
+  header "cstdint"
+  export *
+}
+module std_cstdio [system] {
+  header "cstdio"
+  export *
+}
+module std_cstdlib [system] {
+  header "cstdlib"
+  export *
+}
+module std_cstring [system] {
+  header "cstring"
+  export *
+}
+module std_ctgmath [system] {
+  header "ctgmath"
+  export *
+}
+module std_ctime [system] {
+  header "ctime"
+  export *
+}
+module std_cuchar [system] {
+  header "cuchar"
+  export *
+}
+module std_cwchar [system] {
+  @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
+  header "cwchar"
+  export *
+}
+module std_cwctype [system] {
+  @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
+  header "cwctype"
+  export *
+}
 
-  // Deprecated C-compatibility headers. These can all be included from within
-  // an 'extern "C"' context.
-  module depr [extern_c] {
-    // <assert.h> provided by C library.
-    module ctype_h {
-      header "ctype.h"
-      export *
-    }
-    module errno_h {
-      header "errno.h"
-      export *
-    }
-    module fenv_h {
-      header "fenv.h"
-      export *
-    }
-    module float_t {
-      header "float.h"
-      export *
-    }
-    module inttypes_h {
-      header "inttypes.h"
-      export *
-    }
-    // <iso646.h> provided by compiler.
-    module limits_h {
-      header "limits.h"
-      export *
-    }
-    module locale_h {
-      @requires_LIBCXX_ENABLE_LOCALIZATION@
-      header "locale.h"
-      export *
-    }
-    module math_h {
-      header "math.h"
-      export *
-    }
-    module setjmp_h {
-      header "setjmp.h"
-      export *
-    }
-    module stdatomic_h {
-      @requires_LIBCXX_ENABLE_THREADS@
-      requires cplusplus23
-      header "stdatomic.h"
-      export *
-    }
-    // FIXME: <stdalign.h> is missing.
-    // <signal.h> provided by C library.
-    // <stdarg.h> provided by compiler.
-    module stdbool_h {
-      // <stdbool.h>'s __bool_true_false_are_defined macro requires textual inclusion.
-      textual header "stdbool.h"
-      export *
-    }
-    module stddef_h {
-      // <stddef.h>'s __need_* macros require textual inclusion.
-      textual header "stddef.h"
-      export *
-    }
-    module stdint_h {
-      header "stdint.h"
-      export *
-    }
-    module stdio_h {
-      // <stdio.h>'s __need_* macros require textual inclusion.
-      textual header "stdio.h"
-      export *
-    }
-    module stdlib_h {
-      // <stdlib.h>'s __need_* macros require textual inclusion.
-      textual header "stdlib.h"
-      export *
-    }
-    module string_h {
-      header "string.h"
-      export *
-    }
-    module uchar_h {
-      header "uchar.h"
-      export *
-    }
-    // <time.h> provided by C library.
-    module wchar_h {
-      @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
-      // <wchar.h>'s __need_* macros require textual inclusion.
-      textual header "wchar.h"
-      export *
-    }
-    module wctype_h {
-      @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
-      header "wctype.h"
-      export *
-    }
-  }
+// C standard library interfaces augmented/replaced in C++
+// <assert.h> provided by C library.
+module std_complex_h [system] {
+  header "complex.h"
+  export *
+}
+module std_ctype_h [system] {
+  header "ctype.h"
+  export *
+}
+module std_errno_h [system] {
+  header "errno.h"
+  export *
+}
+module std_fenv_h [system] {
+  header "fenv.h"
+  export *
+}
+module std_float_h [system] {
+  header "float.h"
+  export *
+}
+module std_inttypes_h [system] {
+  header "inttypes.h"
+  export *
+}
+// <iso646.h> provided by compiler.
+module std_limits_h [system] {
+  header "limits.h"
+  export *
+}
+module std_locale_h [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "locale.h"
+  export *
+}
+module std_math_h [system] {
+  header "math.h"
+  export *
+}
+module std_setjmp_h [system] {
+  header "setjmp.h"
+  export *
+}
+// <signal.h> provided by C library.
+// FIXME: <stdalign.h> is missing.
+// <stdarg.h> provided by compiler.
+module std_stdatomic_h [system] {
+  @requires_LIBCXX_ENABLE_THREADS@
+  requires cplusplus23
+  header "stdatomic.h"
+  export *
+}
+module std_stdbool_h [system] {
+  // <stdbool.h>'s __bool_true_false_are_defined macro requires textual inclusion.
+  textual header "stdbool.h"
+  export *
+}
+module std_stddef_h [system] {
+  // <stddef.h>'s __need_* macros require textual inclusion.
+  textual header "stddef.h"
+  export *
+}
+module std_stdint_h [system] {
+  header "stdint.h"
+  export *
+}
+module std_stdio_h [system] {
+  // <stdio.h>'s __need_* macros require textual inclusion.
+  textual header "stdio.h"
+  export *
+}
+module std_stdlib_h [system] {
+  // <stdlib.h>'s __need_* macros require textual inclusion.
+  textual header "stdlib.h"
+  export *
+}
+module std_string_h [system] {
+  header "string.h"
+  export *
+}
+module std_tgmath_h [system] {
+  header "tgmath.h"
+  export *
+}
+module std_uchar_h [system] {
+  header "uchar.h"
+  export *
+}
+// <time.h> provided by C library.
+module std_wchar_h [system] {
+  @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
+  // <wchar.h>'s __need_* macros require textual inclusion.
+  textual header "wchar.h"
+  export *
+}
+module std_wctype_h [system] {
+  @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
+  header "wctype.h"
+  export *
+}
 
-  // <complex.h> and <tgmath.h> are not C headers in any real sense, do not
-  // allow their use in extern "C" contexts.
-  module complex_h {
-    header "complex.h"
+// Experimental C++ standard library interfaces
+module std_experimental [system] {
+  requires cplusplus11
+
+  module deque {
+    header "experimental/deque"
     export *
   }
-  module tgmath_h {
-    header "tgmath.h"
+  module forward_list {
+    header "experimental/forward_list"
     export *
   }
-
-  // C compatibility headers.
-  module compat {
-    module cassert {
-      // <cassert>'s use of NDEBUG requires textual inclusion.
-      textual header "cassert"
-    }
-    module ccomplex {
-      header "ccomplex"
-      export *
-    }
-    module cctype {
-      header "cctype"
-      export *
-    }
-    module cerrno {
-      header "cerrno"
-      export *
-    }
-    module cfenv {
-      header "cfenv"
-      export *
-    }
-    module cfloat {
-      header "cfloat"
-      export *
-    }
-    module cinttypes {
-      header "cinttypes"
-      export *
-    }
-    module ciso646 {
-      header "ciso646"
-      export *
-    }
-    module climits {
-      header "climits"
-      export *
-    }
-    module clocale {
-      @requires_LIBCXX_ENABLE_LOCALIZATION@
-      header "clocale"
-      export *
-    }
-    module cmath {
-      header "cmath"
-      export *
-    }
-    module csetjmp {
-      header "csetjmp"
-      export *
-    }
-    module csignal {
-      header "csignal"
-      export *
-    }
-    // FIXME: <cstdalign> is missing.
-    module cstdarg {
-      header "cstdarg"
-      export *
-    }
-    module cstdbool {
-      header "cstdbool"
-      export *
-    }
-    module cstddef {
-      header "cstddef"
-      export *
-    }
-    module cstdint {
-      header "cstdint"
-      export *
-    }
-    module cstdio {
-      header "cstdio"
-      export *
-    }
-    module cstdlib {
-      header "cstdlib"
-      export *
-    }
-    module cstring {
-      header "cstring"
-      export *
-    }
-    module ctgmath {
-      header "ctgmath"
-      export *
-    }
-    module ctime {
-      header "ctime"
-      export *
-    }
-    module cuchar {
-      header "cuchar"
-      export *
-    }
-    module cwchar {
-      @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
-      header "cwchar"
-      export *
-    }
-    module cwctype {
-      @requires_LIBCXX_ENABLE_WIDE_CHARACTERS@
-      header "cwctype"
-      export *
-    }
-  }
-
-  module algorithm {
-    header "algorithm"
+  module iterator {
+    header "experimental/iterator"
     export *
-
-    module __algorithm {
-      module adjacent_find                   { private header "__algorithm/adjacent_find.h" }
-      module all_of                          { private header "__algorithm/all_of.h" }
-      module any_of                          { private header "__algorithm/any_of.h" }
-      module binary_search                   { private header "__algorithm/binary_search.h" }
-      module clamp                           { private header "__algorithm/clamp.h" }
-      module comp                            { private header "__algorithm/comp.h" }
-      module comp_ref_type                   { private header "__algorithm/comp_ref_type.h" }
-      module copy                            {
-        private header "__algorithm/copy.h"
-        export algorithm.__algorithm.copy_move_common
-      }
-      module copy_backward                   { private header "__algorithm/copy_backward.h" }
-      module copy_if                         { private header "__algorithm/copy_if.h" }
-      module copy_move_common                {
-        private header "__algorithm/copy_move_common.h"
-        export type_traits.is_trivially_copyable
-      }
-      module copy_n                          { private header "__algorithm/copy_n.h" }
-      module count                           { private header "__algorithm/count.h" }
-      module count_if                        { private header "__algorithm/count_if.h" }
-      module equal                           { private header "__algorithm/equal.h" }
-      module equal_range                     { private header "__algorithm/equal_range.h" }
-      module fill                            { private header "__algorithm/fill.h" }
-      module fill_n                          { private header "__algorithm/fill_n.h" }
-      module find                            {
-        private header "__algorithm/find.h"
-        export algorithm.__algorithm.unwrap_iter
-      }
-      module find_end                        { private header "__algorithm/find_end.h" }
-      module find_first_of                   { private header "__algorithm/find_first_of.h" }
-      module find_if                         { private header "__algorithm/find_if.h" }
-      module find_if_not                     { private header "__algorithm/find_if_not.h" }
-      module for_each                        { private header "__algorithm/for_each.h" }
-      module for_each_n                      { private header "__algorithm/for_each_n.h" }
-      module for_each_segment                { private header "__algorithm/for_each_segment.h" }
-      module generate                        { private header "__algorithm/generate.h" }
-      module generate_n                      { private header "__algorithm/generate_n.h" }
-      module half_positive                   { private header "__algorithm/half_positive.h" }
-      module in_found_result                 { private header "__algorithm/in_found_result.h" }
-      module in_fun_result                   { private header "__algorithm/in_fun_result.h" }
-      module in_in_out_result                { private header "__algorithm/in_in_out_result.h" }
-      module in_in_result                    { private header "__algorithm/in_in_result.h" }
-      module in_out_out_result               { private header "__algorithm/in_out_out_result.h" }
-      module in_out_result                   { private header "__algorithm/in_out_result.h" }
-      module includes                        { private header "__algorithm/includes.h" }
-      module inplace_merge                   { private header "__algorithm/inplace_merge.h" }
-      module is_heap                         { private header "__algorithm/is_heap.h" }
-      module is_heap_until                   { private header "__algorithm/is_heap_until.h" }
-      module is_partitioned                  { private header "__algorithm/is_partitioned.h" }
-      module is_permutation                  { private header "__algorithm/is_permutation.h" }
-      module is_sorted                       { private header "__algorithm/is_sorted.h" }
-      module is_sorted_until                 { private header "__algorithm/is_sorted_until.h" }
-      module iter_swap                       { private header "__algorithm/iter_swap.h" }
-      module iterator_operations             {
-        private header "__algorithm/iterator_operations.h"
-        export *
-      }
-      module lexicographical_compare         { private header "__algorithm/lexicographical_compare.h" }
-      module lexicographical_compare_three_way {
-        private header "__algorithm/lexicographical_compare_three_way.h"
-      }
-      module lower_bound                     { private header "__algorithm/lower_bound.h" }
-      module make_heap                       { private header "__algorithm/make_heap.h" }
-      module make_projected                  { private header "__algorithm/make_projected.h" }
-      module max                             { private header "__algorithm/max.h" }
-      module max_element                     { private header "__algorithm/max_element.h" }
-      module merge                           { private header "__algorithm/merge.h" }
-      module min                             { private header "__algorithm/min.h" }
-      module min_element                     { private header "__algorithm/min_element.h" }
-      module min_max_result                  { private header "__algorithm/min_max_result.h" }
-      module minmax                          {
-        private header "__algorithm/minmax.h"
-        export *
-      }
-      module minmax_element                  { private header "__algorithm/minmax_element.h" }
-      module mismatch                        { private header "__algorithm/mismatch.h" }
-      module move                            { private header "__algorithm/move.h" }
-      module move_backward                   { private header "__algorithm/move_backward.h" }
-      module next_permutation                { private header "__algorithm/next_permutation.h" }
-      module none_of                         { private header "__algorithm/none_of.h" }
-      module nth_element                     { private header "__algorithm/nth_element.h" }
-      module partial_sort                    { private header "__algorithm/partial_sort.h" }
-      module partial_sort_copy               { private header "__algorithm/partial_sort_copy.h" }
-      module partition                       { private header "__algorithm/partition.h" }
-      module partition_copy                  { private header "__algorithm/partition_copy.h" }
-      module partition_point                 { private header "__algorithm/partition_point.h" }
-      module pop_heap                        { private header "__algorithm/pop_heap.h" }
-      module prev_permutation                { private header "__algorithm/prev_permutation.h" }
-      module pstl_any_all_none_of            { private header "__algorithm/pstl_any_all_none_of.h" }
-      module pstl_backend                    {
-        private header "__algorithm/pstl_backend.h"
-        export *
-      }
-      module pstl_backends_cpu_backend       {
-        private header "__algorithm/pstl_backends/cpu_backend.h"
-        export *
-      }
-      module pstl_backends_cpu_backends_any_of {
-        private header "__algorithm/pstl_backends/cpu_backends/any_of.h"
-      }
-      module pstl_backends_cpu_backends_backend {
-        private header "__algorithm/pstl_backends/cpu_backends/backend.h"
-        export *
-      }
-      module pstl_backends_cpu_backends_fill { private header "__algorithm/pstl_backends/cpu_backends/fill.h" }
-      module pstl_backends_cpu_backends_find_if {
-        private header "__algorithm/pstl_backends/cpu_backends/find_if.h"
-      }
-      module pstl_backends_cpu_backends_for_each {
-        private header "__algorithm/pstl_backends/cpu_backends/for_each.h"
-      }
-      module pstl_backends_cpu_backends_libdispatch {
-        private header "__algorithm/pstl_backends/cpu_backends/libdispatch.h"
-      }
-      module pstl_backends_cpu_backends_merge {
-        private header "__algorithm/pstl_backends/cpu_backends/merge.h"
-      }
-      module pstl_backends_cpu_backends_serial {
-        private textual header "__algorithm/pstl_backends/cpu_backends/serial.h"
-      }
-      module pstl_backends_cpu_backends_stable_sort {
-        private header "__algorithm/pstl_backends/cpu_backends/stable_sort.h"
-      }
-      module pstl_backends_cpu_backends_thread {
-        private textual header "__algorithm/pstl_backends/cpu_backends/thread.h"
-      }
-      module pstl_backends_cpu_backends_transform {
-        private header "__algorithm/pstl_backends/cpu_backends/transform.h"
-      }
-      module pstl_backends_cpu_backends_transform_reduce {
-        private header "__algorithm/pstl_backends/cpu_backends/transform_reduce.h"
-      }
-      module pstl_copy                       { private header "__algorithm/pstl_copy.h" }
-      module pstl_count                      { private header "__algorithm/pstl_count.h" }
-      module pstl_fill                       { private header "__algorithm/pstl_fill.h" }
-      module pstl_find                       {
-        private header "__algorithm/pstl_find.h"
-        export *
-      }
-      module pstl_for_each                   {
-        private header "__algorithm/pstl_for_each.h"
-        export algorithm.__algorithm.pstl_backend
-        export iterator.__iterator.iterator_traits
-      }
-      module pstl_frontend_dispatch          {
-        private header "__algorithm/pstl_frontend_dispatch.h"
-        export utility.__utility.forward
-      }
-      module pstl_generate                   { private header "__algorithm/pstl_generate.h" }
-      module pstl_is_partitioned             { private header "__algorithm/pstl_is_partitioned.h" }
-      module pstl_merge                      { private header "__algorithm/pstl_merge.h" }
-      module pstl_replace                    { private header "__algorithm/pstl_replace.h" }
-      module pstl_stable_sort                {
-        private header "__algorithm/pstl_stable_sort.h"
-        export functional.__functional.operations
-      }
-      module pstl_transform                  { private header "__algorithm/pstl_transform.h" }
-      module push_heap                       { private header "__algorithm/push_heap.h" }
-      module ranges_adjacent_find            { private header "__algorithm/ranges_adjacent_find.h" }
-      module ranges_all_of                   { private header "__algorithm/ranges_all_of.h" }
-      module ranges_any_of                   { private header "__algorithm/ranges_any_of.h" }
-      module ranges_binary_search {
-        private header "__algorithm/ranges_binary_search.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_clamp {
-        private header "__algorithm/ranges_clamp.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_copy {
-        private header "__algorithm/ranges_copy.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_copy_backward {
-        private header "__algorithm/ranges_copy_backward.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_copy_if {
-        private header "__algorithm/ranges_copy_if.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_copy_n {
-        private header "__algorithm/ranges_copy_n.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_count                    { private header "__algorithm/ranges_count.h" }
-      module ranges_count_if                 { private header "__algorithm/ranges_count_if.h" }
-      module ranges_equal                    { private header "__algorithm/ranges_equal.h" }
-      module ranges_equal_range {
-        private header "__algorithm/ranges_equal_range.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_fill                     { private header "__algorithm/ranges_fill.h" }
-      module ranges_fill_n                   { private header "__algorithm/ranges_fill_n.h" }
-      module ranges_find                     { private header "__algorithm/ranges_find.h" }
-      module ranges_find_end                 { private header "__algorithm/ranges_find_end.h" }
-      module ranges_find_first_of            { private header "__algorithm/ranges_find_first_of.h" }
-      module ranges_find_if                  { private header "__algorithm/ranges_find_if.h" }
-      module ranges_find_if_not              { private header "__algorithm/ranges_find_if_not.h" }
-      module ranges_for_each {
-        private header "__algorithm/ranges_for_each.h"
-        export algorithm.__algorithm.in_fun_result
-      }
-      module ranges_for_each_n {
-        private header "__algorithm/ranges_for_each_n.h"
-        export algorithm.__algorithm.in_fun_result
-      }
-      module ranges_generate                 { private header "__algorithm/ranges_generate.h" }
-      module ranges_generate_n               { private header "__algorithm/ranges_generate_n.h" }
-      module ranges_includes {
-        private header "__algorithm/ranges_includes.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_inplace_merge {
-        private header "__algorithm/ranges_inplace_merge.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_is_heap {
-        private header "__algorithm/ranges_is_heap.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_is_heap_until {
-        private header "__algorithm/ranges_is_heap_until.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_is_partitioned           { private header "__algorithm/ranges_is_partitioned.h" }
-      module ranges_is_permutation           { private header "__algorithm/ranges_is_permutation.h" }
-      module ranges_is_sorted {
-        private header "__algorithm/ranges_is_sorted.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_is_sorted_until {
-        private header "__algorithm/ranges_is_sorted_until.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_iterator_concept         { private header "__algorithm/ranges_iterator_concept.h" }
-      module ranges_lexicographical_compare {
-        private header "__algorithm/ranges_lexicographical_compare.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_lower_bound {
-        private header "__algorithm/ranges_lower_bound.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_make_heap {
-        private header "__algorithm/ranges_make_heap.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_max {
-        private header "__algorithm/ranges_max.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_max_element {
-        private header "__algorithm/ranges_max_element.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_merge {
-        private header "__algorithm/ranges_merge.h"
-        export algorithm.__algorithm.in_in_out_result
-      }
-      module ranges_min {
-        private header "__algorithm/ranges_min.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_min_element {
-        private header "__algorithm/ranges_min_element.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_minmax {
-        private header "__algorithm/ranges_minmax.h"
-        export functional.__functional.ranges_operations
-        export algorithm.__algorithm.min_max_result
-      }
-      module ranges_minmax_element {
-        private header "__algorithm/ranges_minmax_element.h"
-        export functional.__functional.ranges_operations
-        export algorithm.__algorithm.min_max_result
-      }
-      module ranges_mismatch {
-        private header "__algorithm/ranges_mismatch.h"
-        export algorithm.__algorithm.in_in_result
-      }
-      module ranges_move {
-        private header "__algorithm/ranges_move.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_move_backward {
-        private header "__algorithm/ranges_move_backward.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_next_permutation {
-        private header "__algorithm/ranges_next_permutation.h"
-        export algorithm.__algorithm.in_found_result
-        export functional.__functional.ranges_operations
-      }
-      module ranges_none_of                  { private header "__algorithm/ranges_none_of.h" }
-      module ranges_nth_element {
-        private header "__algorithm/ranges_nth_element.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_partial_sort {
-        private header "__algorithm/ranges_partial_sort.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_partial_sort_copy {
-        private header "__algorithm/ranges_partial_sort_copy.h"
-        export algorithm.__algorithm.in_out_result
-        export functional.__functional.ranges_operations
-      }
-      module ranges_partition                { private header "__algorithm/ranges_partition.h" }
-      module ranges_partition_copy           { private header "__algorithm/ranges_partition_copy.h" }
-      module ranges_partition_point          { private header "__algorithm/ranges_partition_point.h" }
-      module ranges_pop_heap {
-        private header "__algorithm/ranges_pop_heap.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_prev_permutation {
-        private header "__algorithm/ranges_prev_permutation.h"
-        export algorithm.__algorithm.in_found_result
-        export functional.__functional.ranges_operations
-      }
-      module ranges_push_heap {
-        private header "__algorithm/ranges_push_heap.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_remove                   { private header "__algorithm/ranges_remove.h" }
-      module ranges_remove_copy {
-        private header "__algorithm/ranges_remove_copy.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_remove_copy_if {
-        private header "__algorithm/ranges_remove_copy_if.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_remove_if                { private header "__algorithm/ranges_remove_if.h" }
-      module ranges_replace                  { private header "__algorithm/ranges_replace.h" }
-      module ranges_replace_copy {
-        private header "__algorithm/ranges_replace_copy.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_replace_copy_if {
-        private header "__algorithm/ranges_replace_copy_if.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_replace_if               { private header "__algorithm/ranges_replace_if.h" }
-      module ranges_reverse                  { private header "__algorithm/ranges_reverse.h" }
-      module ranges_reverse_copy {
-        private header "__algorithm/ranges_reverse_copy.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_rotate                   { private header "__algorithm/ranges_rotate.h" }
-      module ranges_rotate_copy {
-        private header "__algorithm/ranges_rotate_copy.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_sample                   { private header "__algorithm/ranges_sample.h" }
-      module ranges_search                   { private header "__algorithm/ranges_search.h" }
-      module ranges_search_n                 { private header "__algorithm/ranges_search_n.h" }
-      module ranges_set_difference {
-        private header "__algorithm/ranges_set_difference.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_set_intersection {
-        private header "__algorithm/ranges_set_intersection.h"
-        export algorithm.__algorithm.in_in_out_result
-      }
-      module ranges_set_symmetric_difference {
-        private header "__algorithm/ranges_set_symmetric_difference.h"
-        export algorithm.__algorithm.in_in_out_result
-        export functional.__functional.ranges_operations
-      }
-      module ranges_set_union {
-        private header "__algorithm/ranges_set_union.h"
-        export algorithm.__algorithm.in_in_out_result
-        export functional.__functional.ranges_operations
-      }
-      module ranges_shuffle                  { private header "__algorithm/ranges_shuffle.h" }
-      module ranges_sort {
-        private header "__algorithm/ranges_sort.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_sort_heap {
-        private header "__algorithm/ranges_sort_heap.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_stable_partition         { private header "__algorithm/ranges_stable_partition.h" }
-      module ranges_stable_sort {
-        private header "__algorithm/ranges_stable_sort.h"
-        export functional.__functional.ranges_operations
-      }
-      module ranges_starts_with         { private header "__algorithm/ranges_starts_with.h" }
-      module ranges_swap_ranges {
-        private header "__algorithm/ranges_swap_ranges.h"
-        export algorithm.__algorithm.in_in_result
-      }
-      module ranges_transform {
-        private header "__algorithm/ranges_transform.h"
-        export algorithm.__algorithm.in_in_out_result
-        export algorithm.__algorithm.in_out_result
-      }
-      module uniform_random_bit_generator_adaptor {
-        private header "__algorithm/uniform_random_bit_generator_adaptor.h"
-      }
-      module ranges_unique                   { private header "__algorithm/ranges_unique.h" }
-      module ranges_unique_copy {
-        private header "__algorithm/ranges_unique_copy.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module ranges_upper_bound {
-        private header "__algorithm/ranges_upper_bound.h"
-        export functional.__functional.ranges_operations
-      }
-      module remove                          { private header "__algorithm/remove.h" }
-      module remove_copy                     { private header "__algorithm/remove_copy.h" }
-      module remove_copy_if                  { private header "__algorithm/remove_copy_if.h" }
-      module remove_if                       { private header "__algorithm/remove_if.h" }
-      module replace                         { private header "__algorithm/replace.h" }
-      module replace_copy                    { private header "__algorithm/replace_copy.h" }
-      module replace_copy_if                 { private header "__algorithm/replace_copy_if.h" }
-      module replace_if                      { private header "__algorithm/replace_if.h" }
-      module reverse                         { private header "__algorithm/reverse.h" }
-      module reverse_copy                    { private header "__algorithm/reverse_copy.h" }
-      module rotate                          { private header "__algorithm/rotate.h" }
-      module rotate_copy                     { private header "__algorithm/rotate_copy.h" }
-      module sample                          { private header "__algorithm/sample.h" }
-      module search                          { private header "__algorithm/search.h" }
-      module search_n                        { private header "__algorithm/search_n.h" }
-      module set_difference                  { private header "__algorithm/set_difference.h" }
-      module set_intersection                { private header "__algorithm/set_intersection.h" }
-      module set_symmetric_difference        { private header "__algorithm/set_symmetric_difference.h" }
-      module set_union                       { private header "__algorithm/set_union.h" }
-      module shift_left                      { private header "__algorithm/shift_left.h" }
-      module shift_right                     { private header "__algorithm/shift_right.h" }
-      module shuffle                         { private header "__algorithm/shuffle.h" }
-      module sift_down                       { private header "__algorithm/sift_down.h" }
-      module sort                            {
-        private header "__algorithm/sort.h"
-        export __debug_utils.strict_weak_ordering_check
-      }
-      module sort_heap                       { private header "__algorithm/sort_heap.h" }
-      module stable_partition                { private header "__algorithm/stable_partition.h" }
-      module stable_sort                     { private header "__algorithm/stable_sort.h" }
-      module swap_ranges                     {
-        private header "__algorithm/swap_ranges.h"
-        export algorithm.__algorithm.iterator_operations
-      }
-      module three_way_comp_ref_type         { private header "__algorithm/three_way_comp_ref_type.h" }
-      module transform                       { private header "__algorithm/transform.h" }
-      module unique                          { private header "__algorithm/unique.h" }
-      module unique_copy                     { private header "__algorithm/unique_copy.h" }
-      module unwrap_iter                     {
-        private header "__algorithm/unwrap_iter.h"
-        export iterator.__iterator.iterator_traits
-      }
-      module unwrap_range {
-        private header "__algorithm/unwrap_range.h"
-        export utility.__utility.pair
-      }
-      module upper_bound                     { private header "__algorithm/upper_bound.h" }
-    }
   }
-  module any {
-    header "any"
+  module list {
+    header "experimental/list"
     export *
   }
-  module array {
-    header "array"
+  module map {
+    header "experimental/map"
     export *
-
-    module array_fwd { private header "__fwd/array.h" }
   }
-  module atomic {
-    header "atomic"
+  module memory_resource {
+    header "experimental/memory_resource"
     export *
-
-    module __atomic {
-      module aliases             {
-        private header "__atomic/aliases.h"
-        export atomic
-      }
-      module atomic              {
-        private header "__atomic/atomic.h"
-
-        export atomic_base
-      }
-      module atomic_base         { private header "__atomic/atomic_base.h" }
-      module atomic_flag         { private header "__atomic/atomic_flag.h" }
-      module atomic_init         { private header "__atomic/atomic_init.h" }
-      module atomic_lock_free    { private header "__atomic/atomic_lock_free.h" }
-      module atomic_sync         { private header "__atomic/atomic_sync.h" }
-      module check_memory_order  { private header "__atomic/check_memory_order.h" }
-      module contention_t        { private header "__atomic/contention_t.h" }
-      module cxx_atomic_impl     { private header "__atomic/cxx_atomic_impl.h" }
-      module fence               { private header "__atomic/fence.h" }
-      module is_always_lock_free { private header "__atomic/is_always_lock_free.h" }
-      module kill_dependency     { private header "__atomic/kill_dependency.h" }
-      module memory_order        { private header "__atomic/memory_order.h" }
-    }
   }
-  module barrier {
-    @requires_LIBCXX_ENABLE_THREADS@
-    header "barrier"
+  module propagate_const {
+    header "experimental/propagate_const"
     export *
   }
-  module bit {
-    header "bit"
+  module regex {
+    @requires_LIBCXX_ENABLE_LOCALIZATION@
+    header "experimental/regex"
     export *
-
-    module __bit {
-      module bit_cast       { private header "__bit/bit_cast.h" }
-      module bit_ceil       { private header "__bit/bit_ceil.h" }
-      module bit_floor      { private header "__bit/bit_floor.h" }
-      module bit_log2       { private header "__bit/bit_log2.h" }
-      module bit_width      { private header "__bit/bit_width.h" }
-      module blsr           { private header "__bit/blsr.h" }
-      module byteswap       { private header "__bit/byteswap.h" }
-      module countl         { private header "__bit/countl.h" }
-      module countr         { private header "__bit/countr.h" }
-      module endian         { private header "__bit/endian.h" }
-      module has_single_bit { private header "__bit/has_single_bit.h" }
-      module popcount       { private header "__bit/popcount.h" }
-      module rotate         { private header "__bit/rotate.h" }
-    }
   }
-  module bitset {
-    header "bitset"
+  module simd {
+    header "experimental/simd"
     export *
   }
-  // No submodule for cassert. It fundamentally needs repeated, textual inclusion.
-  module charconv {
-    header "charconv"
+  module set {
+    header "experimental/set"
     export *
-
-    module __charconv {
-      module chars_format            { private header "__charconv/chars_format.h" }
-      module from_chars_integral     { private header "__charconv/from_chars_integral.h" }
-      module from_chars_result       { private header "__charconv/from_chars_result.h" }
-      module tables                  { private header "__charconv/tables.h" }
-      module to_chars                { private header "__charconv/to_chars.h" }
-      module to_chars_base_10        { private header "__charconv/to_chars_base_10.h" }
-      module to_chars_floating_point { private header "__charconv/to_chars_floating_point.h" }
-      module to_chars_integral       { private header "__charconv/to_chars_integral.h" }
-      module to_chars_result         { private header "__charconv/to_chars_result.h" }
-      module traits                  { private header "__charconv/traits.h" }
-    }
-
   }
-  module chrono {
-    header "chrono"
+  module string {
+    header "experimental/string"
     export *
-
-    module __chrono {
-      module calendar               { private header "__chrono/calendar.h" }
-      module concepts               { private header "__chrono/concepts.h" }
-      module convert_to_timespec    { private header "__chrono/convert_to_timespec.h" }
-      module convert_to_tm          { private header "__chrono/convert_to_tm.h" }
-      module day                    { private header "__chrono/day.h" }
-      module duration               { private header "__chrono/duration.h" }
-      module file_clock             { private header "__chrono/file_clock.h" }
-      module formatter              {
-        @requires_LIBCXX_ENABLE_LOCALIZATION@
-        private header "__chrono/formatter.h"
-      }
-      module hh_mm_ss               { private header "__chrono/hh_mm_ss.h" }
-      module high_resolution_clock  {
-        private header "__chrono/high_resolution_clock.h"
-        export steady_clock
-        export system_clock
-      }
-      module literals               { private header "__chrono/literals.h" }
-      module month                  { private header "__chrono/month.h" }
-      module month_weekday          { private header "__chrono/month_weekday.h" }
-      module monthday               { private header "__chrono/monthday.h" }
-      module ostream                {
-        @requires_LIBCXX_ENABLE_LOCALIZATION@
-        private header "__chrono/ostream.h"
-      }
-      module parser_std_format_spec {
-        @requires_LIBCXX_ENABLE_LOCALIZATION@
-        private header "__chrono/parser_std_format_spec.h"
-      }
-      module statically_widen       { private header "__chrono/statically_widen.h" }
-      module steady_clock           {
-        private header "__chrono/steady_clock.h"
-        export time_point
-      }
-      module system_clock           {
-        private header "__chrono/system_clock.h"
-        export time_point
-      }
-      module time_point             { private header "__chrono/time_point.h" }
-      module weekday                { private header "__chrono/weekday.h" }
-      module year                   { private header "__chrono/year.h" }
-      module year_month             { private header "__chrono/year_month.h" }
-      module year_month_day         { private header "__chrono/year_month_day.h" }
-      module year_month_weekday     { private header "__chrono/year_month_weekday.h" }
-    }
   }
-  module codecvt {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "codecvt"
+  module type_traits {
+    header "experimental/type_traits"
     export *
   }
-  module compare {
-    header "compare"
+  module unordered_map {
+    header "experimental/unordered_map"
     export *
-
-    module __compare {
-      module common_comparison_category     { private header "__compare/common_comparison_category.h" }
-      module compare_partial_order_fallback { private header "__compare/compare_partial_order_fallback.h" }
-      module compare_strong_order_fallback  { private header "__compare/compare_strong_order_fallback.h" }
-      module compare_three_way              { private header "__compare/compare_three_way.h" }
-      module compare_three_way_result       { private header "__compare/compare_three_way_result.h" }
-      module compare_weak_order_fallback    { private header "__compare/compare_weak_order_fallback.h" }
-      module is_eq                          { private header "__compare/is_eq.h" }
-      module ordering                       { private header "__compare/ordering.h" }
-      module partial_order                  { private header "__compare/partial_order.h" }
-      module strong_order                   { private header "__compare/strong_order.h" }
-      module synth_three_way                { private header "__compare/synth_three_way.h" }
-      module three_way_comparable           { private header "__compare/three_way_comparable.h" }
-      module weak_order                     { private header "__compare/weak_order.h" }
-    }
   }
-  module complex {
-    header "complex"
+  module unordered_set {
+    header "experimental/unordered_set"
     export *
   }
-  module concepts {
-    header "concepts"
+  module utility {
+    header "experimental/utility"
     export *
-
-    module __concepts {
-      module arithmetic                 { private header "__concepts/arithmetic.h" }
-      module assignable                 { private header "__concepts/assignable.h" }
-      module boolean_testable           { private header "__concepts/boolean_testable.h" }
-      module class_or_enum              { private header "__concepts/class_or_enum.h" }
-      module common_reference_with      { private header "__concepts/common_reference_with.h" }
-      module common_with                { private header "__concepts/common_with.h" }
-      module constructible              {
-        private header "__concepts/constructible.h"
-        export concepts.__concepts.destructible
-      }
-      module convertible_to             { private header "__concepts/convertible_to.h" }
-      module copyable                   { private header "__concepts/copyable.h" }
-      module derived_from               { private header "__concepts/derived_from.h" }
-      module destructible               {
-        private header "__concepts/destructible.h"
-        export type_traits.is_nothrow_destructible
-      }
-      module different_from             { private header "__concepts/different_from.h" }
-      module equality_comparable {
-        private header "__concepts/equality_comparable.h"
-        export type_traits.common_reference
-      }
-      module invocable                  { private header "__concepts/invocable.h" }
-      module movable                    {
-        private header "__concepts/movable.h"
-        export type_traits.is_object
-      }
-      module predicate                  { private header "__concepts/predicate.h" }
-      module regular                    { private header "__concepts/regular.h" }
-      module relation                   { private header "__concepts/relation.h" }
-      module same_as {
-        private header "__concepts/same_as.h"
-        export type_traits.is_same
-      }
-      module semiregular                { private header "__concepts/semiregular.h" }
-      module swappable                  { private header "__concepts/swappable.h" }
-      module totally_ordered            { private header "__concepts/totally_ordered.h" }
-    }
   }
-  module condition_variable {
-    header "condition_variable"
+  module vector {
+    header "experimental/vector"
     export *
-
-    module __condition_variable {
-      module condition_variable { private header "__condition_variable/condition_variable.h" }
-    }
   }
-  module deque {
-    header "deque"
+  module __config {
+    private textual header "experimental/__config"
     export *
   }
-  module exception {
-    header "exception"
+  // FIXME these should be private
+  module __memory {
+    header "experimental/__memory"
     export *
+  }
+}
+
+// Implementation detail headers that are private to libc++. These modules
+// must not be directly imported.
+module std_private_assert            [system] {
+  header "__assert"
+  export *
+}
+module std_private_availability      [system] {
+  header "__availability"
+  export *
+}
+module std_private_bit_reference     [system] {
+  header "__bit_reference"
+  export *
+}
+module std_private_config            [system] {
+  textual header "__config"
+  export *
+}
+module std_private_hash_table        [system] {
+  header "__hash_table"
+  export *
+}
+module std_private_locale            [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "__locale"
+  export *
+}
+module std_private_mbstate_t         [system] {
+  header "__mbstate_t.h"
+  export *
+}
+module std_private_node_handle       [system] {
+  header "__node_handle"
+  export *
+}
+module std_private_split_buffer      [system] {
+  header "__split_buffer"
+  export *
+}
+module std_private_std_mbstate_t     [system] {
+  header "__std_mbstate_t.h"
+  export *
+}
+module std_private_threading_support [system] {
+  header "__threading_support"
+  export *
+}
+module std_private_tree              [system] {
+  header "__tree"
+  export *
+}
+module std_private_undef_macros      [system] {
+  textual header "__undef_macros"
+  export *
+}
+module std_private_verbose_abort     [system] {
+  header "__verbose_abort"
+  export *
+}
+
+module std_private_algorithm_adjacent_find                               [system] { header "__algorithm/adjacent_find.h" }
+module std_private_algorithm_all_of                                      [system] { header "__algorithm/all_of.h" }
+module std_private_algorithm_any_of                                      [system] { header "__algorithm/any_of.h" }
+module std_private_algorithm_binary_search                               [system] { header "__algorithm/binary_search.h" }
+module std_private_algorithm_clamp                                       [system] { header "__algorithm/clamp.h" }
+module std_private_algorithm_comp                                        [system] { header "__algorithm/comp.h" }
+module std_private_algorithm_comp_ref_type                               [system] { header "__algorithm/comp_ref_type.h" }
+module std_private_algorithm_copy                                        [system] {
+  header "__algorithm/copy.h"
+  export std_private_algorithm_copy_move_common
+}
+module std_private_algorithm_copy_backward                               [system] { header "__algorithm/copy_backward.h" }
+module std_private_algorithm_copy_if                                     [system] { header "__algorithm/copy_if.h" }
+module std_private_algorithm_copy_move_common                            [system] {
+  header "__algorithm/copy_move_common.h"
+  export std_private_type_traits_is_trivially_copyable
+}
+module std_private_algorithm_copy_n                                      [system] { header "__algorithm/copy_n.h" }
+module std_private_algorithm_count                                       [system] { header "__algorithm/count.h" }
+module std_private_algorithm_count_if                                    [system] { header "__algorithm/count_if.h" }
+module std_private_algorithm_equal                                       [system] { header "__algorithm/equal.h" }
+module std_private_algorithm_equal_range                                 [system] { header "__algorithm/equal_range.h" }
+module std_private_algorithm_fill                                        [system] { header "__algorithm/fill.h" }
+module std_private_algorithm_fill_n                                      [system] { header "__algorithm/fill_n.h" }
+module std_private_algorithm_find                                        [system] {
+  header "__algorithm/find.h"
+  export std_private_algorithm_unwrap_iter
+}
+module std_private_algorithm_find_end                                    [system] { header "__algorithm/find_end.h" }
+module std_private_algorithm_find_first_of                               [system] { header "__algorithm/find_first_of.h" }
+module std_private_algorithm_find_if                                     [system] { header "__algorithm/find_if.h" }
+module std_private_algorithm_find_if_not                                 [system] { header "__algorithm/find_if_not.h" }
+module std_private_algorithm_for_each                                    [system] { header "__algorithm/for_each.h" }
+module std_private_algorithm_for_each_n                                  [system] { header "__algorithm/for_each_n.h" }
+module std_private_algorithm_for_each_segment                            [system] { header "__algorithm/for_each_segment.h" }
+module std_private_algorithm_generate                                    [system] { header "__algorithm/generate.h" }
+module std_private_algorithm_generate_n                                  [system] { header "__algorithm/generate_n.h" }
+module std_private_algorithm_half_positive                               [system] { header "__algorithm/half_positive.h" }
+module std_private_algorithm_in_found_result                             [system] { header "__algorithm/in_found_result.h" }
+module std_private_algorithm_in_fun_result                               [system] { header "__algorithm/in_fun_result.h" }
+module std_private_algorithm_in_in_out_result                            [system] { header "__algorithm/in_in_out_result.h" }
+module std_private_algorithm_in_in_result                                [system] { header "__algorithm/in_in_result.h" }
+module std_private_algorithm_in_out_out_result                           [system] { header "__algorithm/in_out_out_result.h" }
+module std_private_algorithm_in_out_result                               [system] { header "__algorithm/in_out_result.h" }
+module std_private_algorithm_includes                                    [system] { header "__algorithm/includes.h" }
+module std_private_algorithm_inplace_merge                               [system] { header "__algorithm/inplace_merge.h" }
+module std_private_algorithm_is_heap                                     [system] { header "__algorithm/is_heap.h" }
+module std_private_algorithm_is_heap_until                               [system] { header "__algorithm/is_heap_until.h" }
+module std_private_algorithm_is_partitioned                              [system] { header "__algorithm/is_partitioned.h" }
+module std_private_algorithm_is_permutation                              [system] { header "__algorithm/is_permutation.h" }
+module std_private_algorithm_is_sorted                                   [system] { header "__algorithm/is_sorted.h" }
+module std_private_algorithm_is_sorted_until                             [system] { header "__algorithm/is_sorted_until.h" }
+module std_private_algorithm_iter_swap                                   [system] { header "__algorithm/iter_swap.h" }
+module std_private_algorithm_iterator_operations                         [system] {
+  header "__algorithm/iterator_operations.h"
+  export *
+}
+module std_private_algorithm_lexicographical_compare                     [system] { header "__algorithm/lexicographical_compare.h" }
+module std_private_algorithm_lexicographical_compare_three_way           [system] { header "__algorithm/lexicographical_compare_three_way.h" }
+module std_private_algorithm_lower_bound                                 [system] { header "__algorithm/lower_bound.h" }
+module std_private_algorithm_make_heap                                   [system] { header "__algorithm/make_heap.h" }
+module std_private_algorithm_make_projected                              [system] { header "__algorithm/make_projected.h" }
+module std_private_algorithm_max                                         [system] { header "__algorithm/max.h" }
+module std_private_algorithm_max_element                                 [system] { header "__algorithm/max_element.h" }
+module std_private_algorithm_merge                                       [system] { header "__algorithm/merge.h" }
+module std_private_algorithm_min                                         [system] { header "__algorithm/min.h" }
+module std_private_algorithm_min_element                                 [system] { header "__algorithm/min_element.h" }
+module std_private_algorithm_min_max_result                              [system] { header "__algorithm/min_max_result.h" }
+module std_private_algorithm_minmax                                      [system] {
+  header "__algorithm/minmax.h"
+  export *
+}
+module std_private_algorithm_minmax_element                              [system] { header "__algorithm/minmax_element.h" }
+module std_private_algorithm_mismatch                                    [system] { header "__algorithm/mismatch.h" }
+module std_private_algorithm_move                                        [system] { header "__algorithm/move.h" }
+module std_private_algorithm_move_backward                               [system] { header "__algorithm/move_backward.h" }
+module std_private_algorithm_next_permutation                            [system] { header "__algorithm/next_permutation.h" }
+module std_private_algorithm_none_of                                     [system] { header "__algorithm/none_of.h" }
+module std_private_algorithm_nth_element                                 [system] { header "__algorithm/nth_element.h" }
+module std_private_algorithm_partial_sort                                [system] { header "__algorithm/partial_sort.h" }
+module std_private_algorithm_partial_sort_copy                           [system] { header "__algorithm/partial_sort_copy.h" }
+module std_private_algorithm_partition                                   [system] { header "__algorithm/partition.h" }
+module std_private_algorithm_partition_copy                              [system] { header "__algorithm/partition_copy.h" }
+module std_private_algorithm_partition_point                             [system] { header "__algorithm/partition_point.h" }
+module std_private_algorithm_pop_heap                                    [system] { header "__algorithm/pop_heap.h" }
+module std_private_algorithm_prev_permutation                            [system] { header "__algorithm/prev_permutation.h" }
+module std_private_algorithm_pstl_any_all_none_of                        [system] { header "__algorithm/pstl_any_all_none_of.h" }
+module std_private_algorithm_pstl_backend                                [system] {
+  header "__algorithm/pstl_backend.h"
+  export *
+}
+module std_private_algorithm_pstl_backends_cpu_backend                   [system] {
+  header "__algorithm/pstl_backends/cpu_backend.h"
+  export *
+}
+module std_private_algorithm_pstl_backends_cpu_backends_any_of           [system] { header "__algorithm/pstl_backends/cpu_backends/any_of.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_backend          [system] {
+  header "__algorithm/pstl_backends/cpu_backends/backend.h"
+  export *
+}
+module std_private_algorithm_pstl_backends_cpu_backends_fill             [system] { header "__algorithm/pstl_backends/cpu_backends/fill.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_find_if          [system] { header "__algorithm/pstl_backends/cpu_backends/find_if.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_for_each         [system] { header "__algorithm/pstl_backends/cpu_backends/for_each.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_libdispatch      [system] { header "__algorithm/pstl_backends/cpu_backends/libdispatch.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_merge            [system] { header "__algorithm/pstl_backends/cpu_backends/merge.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_serial           [system] { textual header "__algorithm/pstl_backends/cpu_backends/serial.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_stable_sort      [system] { header "__algorithm/pstl_backends/cpu_backends/stable_sort.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_thread           [system] { textual header "__algorithm/pstl_backends/cpu_backends/thread.h" }
+module std_private_algorithm_pstl_backends_cpu_backends_transform        [system] {
+  header "__algorithm/pstl_backends/cpu_backends/transform.h"
+  export std_private_algorithm_transform
+}
+module std_private_algorithm_pstl_backends_cpu_backends_transform_reduce [system] { header "__algorithm/pstl_backends/cpu_backends/transform_reduce.h" }
+module std_private_algorithm_pstl_copy                                   [system] { header "__algorithm/pstl_copy.h" }
+module std_private_algorithm_pstl_count                                  [system] { header "__algorithm/pstl_count.h" }
+module std_private_algorithm_pstl_fill                                   [system] { header "__algorithm/pstl_fill.h" }
+module std_private_algorithm_pstl_find                                   [system] {
+  header "__algorithm/pstl_find.h"
+  export *
+}
+module std_private_algorithm_pstl_for_each                               [system] {
+  header "__algorithm/pstl_for_each.h"
+  export *
+}
+module std_private_algorithm_pstl_frontend_dispatch                      [system] {
+  header "__algorithm/pstl_frontend_dispatch.h"
+  export std_private_utility_forward
+}
+module std_private_algorithm_pstl_generate                               [system] { header "__algorithm/pstl_generate.h" }
+module std_private_algorithm_pstl_is_partitioned                         [system] { header "__algorithm/pstl_is_partitioned.h" }
+module std_private_algorithm_pstl_merge                                  [system] { header "__algorithm/pstl_merge.h" }
+module std_private_algorithm_pstl_replace                                [system] { header "__algorithm/pstl_replace.h" }
+module std_private_algorithm_pstl_stable_sort                            [system] {
+  header "__algorithm/pstl_stable_sort.h"
+  export std_private_functional_operations
+}
+module std_private_algorithm_pstl_transform                              [system] { header "__algorithm/pstl_transform.h" }
+module std_private_algorithm_push_heap                                   [system] { header "__algorithm/push_heap.h" }
+module std_private_algorithm_ranges_adjacent_find                        [system] { header "__algorithm/ranges_adjacent_find.h" }
+module std_private_algorithm_ranges_all_of                               [system] { header "__algorithm/ranges_all_of.h" }
+module std_private_algorithm_ranges_any_of                               [system] { header "__algorithm/ranges_any_of.h" }
+module std_private_algorithm_ranges_binary_search                        [system] {
+  header "__algorithm/ranges_binary_search.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_clamp                                [system] {
+  header "__algorithm/ranges_clamp.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_copy                                 [system] {
+  header "__algorithm/ranges_copy.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_copy_backward                        [system] {
+  header "__algorithm/ranges_copy_backward.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_copy_if                              [system] {
+  header "__algorithm/ranges_copy_if.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_copy_n                               [system] {
+  header "__algorithm/ranges_copy_n.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_count                                [system] { header "__algorithm/ranges_count.h" }
+module std_private_algorithm_ranges_count_if                             [system] { header "__algorithm/ranges_count_if.h" }
+module std_private_algorithm_ranges_equal                                [system] { header "__algorithm/ranges_equal.h" }
+module std_private_algorithm_ranges_equal_range                          [system] {
+  header "__algorithm/ranges_equal_range.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_fill                                 [system] { header "__algorithm/ranges_fill.h" }
+module std_private_algorithm_ranges_fill_n                               [system] { header "__algorithm/ranges_fill_n.h" }
+module std_private_algorithm_ranges_find                                 [system] { header "__algorithm/ranges_find.h" }
+module std_private_algorithm_ranges_find_end                             [system] { header "__algorithm/ranges_find_end.h" }
+module std_private_algorithm_ranges_find_first_of                        [system] { header "__algorithm/ranges_find_first_of.h" }
+module std_private_algorithm_ranges_find_if                              [system] { header "__algorithm/ranges_find_if.h" }
+module std_private_algorithm_ranges_find_if_not                          [system] { header "__algorithm/ranges_find_if_not.h" }
+module std_private_algorithm_ranges_for_each                             [system] {
+  header "__algorithm/ranges_for_each.h"
+  export std_private_algorithm_in_fun_result
+}
+module std_private_algorithm_ranges_for_each_n                           [system] {
+  header "__algorithm/ranges_for_each_n.h"
+  export std_private_algorithm_in_fun_result
+}
+module std_private_algorithm_ranges_generate                             [system] { header "__algorithm/ranges_generate.h" }
+module std_private_algorithm_ranges_generate_n                           [system] { header "__algorithm/ranges_generate_n.h" }
+module std_private_algorithm_ranges_includes                             [system] {
+  header "__algorithm/ranges_includes.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_inplace_merge                        [system] {
+  header "__algorithm/ranges_inplace_merge.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_is_heap                              [system] {
+  header "__algorithm/ranges_is_heap.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_is_heap_until                        [system] {
+  header "__algorithm/ranges_is_heap_until.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_is_partitioned                       [system] { header "__algorithm/ranges_is_partitioned.h" }
+module std_private_algorithm_ranges_is_permutation                       [system] { header "__algorithm/ranges_is_permutation.h" }
+module std_private_algorithm_ranges_is_sorted                            [system] {
+  header "__algorithm/ranges_is_sorted.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_is_sorted_until                      [system] {
+  header "__algorithm/ranges_is_sorted_until.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_iterator_concept                     [system] { header "__algorithm/ranges_iterator_concept.h" }
+module std_private_algorithm_ranges_lexicographical_compare              [system] {
+  header "__algorithm/ranges_lexicographical_compare.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_lower_bound                          [system] {
+  header "__algorithm/ranges_lower_bound.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_make_heap                            [system] {
+  header "__algorithm/ranges_make_heap.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_max                                  [system] {
+  header "__algorithm/ranges_max.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_max_element                          [system] {
+  header "__algorithm/ranges_max_element.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_merge                                [system] {
+  header "__algorithm/ranges_merge.h"
+  export std_private_algorithm_in_in_out_result
+}
+module std_private_algorithm_ranges_min                                  [system] {
+  header "__algorithm/ranges_min.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_min_element                          [system] {
+  header "__algorithm/ranges_min_element.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_minmax                               [system] {
+  header "__algorithm/ranges_minmax.h"
+  export std_private_functional_ranges_operations
+  export std_private_algorithm_min_max_result
+}
+module std_private_algorithm_ranges_minmax_element                       [system] {
+  header "__algorithm/ranges_minmax_element.h"
+  export std_private_functional_ranges_operations
+  export std_private_algorithm_min_max_result
+}
+module std_private_algorithm_ranges_mismatch                             [system] {
+  header "__algorithm/ranges_mismatch.h"
+  export std_private_algorithm_in_in_result
+}
+module std_private_algorithm_ranges_move                                 [system] {
+  header "__algorithm/ranges_move.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_move_backward                        [system] {
+  header "__algorithm/ranges_move_backward.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_next_permutation                     [system] {
+  header "__algorithm/ranges_next_permutation.h"
+  export std_private_algorithm_in_found_result
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_none_of                              [system] { header "__algorithm/ranges_none_of.h" }
+module std_private_algorithm_ranges_nth_element                          [system] {
+  header "__algorithm/ranges_nth_element.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_partial_sort                         [system] {
+  header "__algorithm/ranges_partial_sort.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_partial_sort_copy                    [system] {
+  header "__algorithm/ranges_partial_sort_copy.h"
+  export std_private_algorithm_in_out_result
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_partition                            [system] { header "__algorithm/ranges_partition.h" }
+module std_private_algorithm_ranges_partition_copy                       [system] { header "__algorithm/ranges_partition_copy.h" }
+module std_private_algorithm_ranges_partition_point                      [system] { header "__algorithm/ranges_partition_point.h" }
+module std_private_algorithm_ranges_pop_heap                             [system] {
+  header "__algorithm/ranges_pop_heap.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_prev_permutation                     [system] {
+  header "__algorithm/ranges_prev_permutation.h"
+  export std_private_algorithm_in_found_result
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_push_heap                            [system] {
+  header "__algorithm/ranges_push_heap.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_remove                               [system] { header "__algorithm/ranges_remove.h" }
+module std_private_algorithm_ranges_remove_copy                          [system] {
+  header "__algorithm/ranges_remove_copy.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_remove_copy_if                       [system] {
+  header "__algorithm/ranges_remove_copy_if.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_remove_if                            [system] { header "__algorithm/ranges_remove_if.h" }
+module std_private_algorithm_ranges_replace                              [system] { header "__algorithm/ranges_replace.h" }
+module std_private_algorithm_ranges_replace_copy                         [system] {
+  header "__algorithm/ranges_replace_copy.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_replace_copy_if                      [system] {
+  header "__algorithm/ranges_replace_copy_if.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_replace_if                           [system] { header "__algorithm/ranges_replace_if.h" }
+module std_private_algorithm_ranges_reverse                              [system] { header "__algorithm/ranges_reverse.h" }
+module std_private_algorithm_ranges_reverse_copy                         [system] {
+  header "__algorithm/ranges_reverse_copy.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_rotate                               [system] { header "__algorithm/ranges_rotate.h" }
+module std_private_algorithm_ranges_rotate_copy                          [system] {
+  header "__algorithm/ranges_rotate_copy.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_sample                               [system] { header "__algorithm/ranges_sample.h" }
+module std_private_algorithm_ranges_search                               [system] { header "__algorithm/ranges_search.h" }
+module std_private_algorithm_ranges_search_n                             [system] { header "__algorithm/ranges_search_n.h" }
+module std_private_algorithm_ranges_set_difference                       [system] {
+  header "__algorithm/ranges_set_difference.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_set_intersection                     [system] {
+  header "__algorithm/ranges_set_intersection.h"
+  export std_private_algorithm_in_in_out_result
+}
+module std_private_algorithm_ranges_set_symmetric_difference             [system] {
+  header "__algorithm/ranges_set_symmetric_difference.h"
+  export std_private_algorithm_in_in_out_result
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_set_union                            [system] {
+  header "__algorithm/ranges_set_union.h"
+  export std_private_algorithm_in_in_out_result
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_shuffle                              [system] { header "__algorithm/ranges_shuffle.h" }
+module std_private_algorithm_ranges_sort                                 [system] {
+  header "__algorithm/ranges_sort.h"
+  export std_private_algorithm_make_projected
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_sort_heap                            [system] {
+  header "__algorithm/ranges_sort_heap.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_stable_partition                     [system] { header "__algorithm/ranges_stable_partition.h" }
+module std_private_algorithm_ranges_stable_sort                          [system] {
+  header "__algorithm/ranges_stable_sort.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_ranges_starts_with                          [system] { header "__algorithm/ranges_starts_with.h" }
+module std_private_algorithm_ranges_swap_ranges                          [system] {
+  header "__algorithm/ranges_swap_ranges.h"
+  export std_private_algorithm_in_in_result
+}
+module std_private_algorithm_ranges_transform                            [system] {
+  header "__algorithm/ranges_transform.h"
+  export std_private_algorithm_in_in_out_result
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_unique                               [system] { header "__algorithm/ranges_unique.h" }
+module std_private_algorithm_ranges_unique_copy                          [system] {
+  header "__algorithm/ranges_unique_copy.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_algorithm_ranges_upper_bound                          [system] {
+  header "__algorithm/ranges_upper_bound.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_algorithm_remove                                      [system] { header "__algorithm/remove.h" }
+module std_private_algorithm_remove_copy                                 [system] { header "__algorithm/remove_copy.h" }
+module std_private_algorithm_remove_copy_if                              [system] { header "__algorithm/remove_copy_if.h" }
+module std_private_algorithm_remove_if                                   [system] { header "__algorithm/remove_if.h" }
+module std_private_algorithm_replace                                     [system] { header "__algorithm/replace.h" }
+module std_private_algorithm_replace_copy                                [system] { header "__algorithm/replace_copy.h" }
+module std_private_algorithm_replace_copy_if                             [system] { header "__algorithm/replace_copy_if.h" }
+module std_private_algorithm_replace_if                                  [system] { header "__algorithm/replace_if.h" }
+module std_private_algorithm_reverse                                     [system] { header "__algorithm/reverse.h" }
+module std_private_algorithm_reverse_copy                                [system] { header "__algorithm/reverse_copy.h" }
+module std_private_algorithm_rotate                                      [system] { header "__algorithm/rotate.h" }
+module std_private_algorithm_rotate_copy                                 [system] { header "__algorithm/rotate_copy.h" }
+module std_private_algorithm_sample                                      [system] { header "__algorithm/sample.h" }
+module std_private_algorithm_search                                      [system] { header "__algorithm/search.h" }
+module std_private_algorithm_search_n                                    [system] { header "__algorithm/search_n.h" }
+module std_private_algorithm_set_difference                              [system] { header "__algorithm/set_difference.h" }
+module std_private_algorithm_set_intersection                            [system] { header "__algorithm/set_intersection.h" }
+module std_private_algorithm_set_symmetric_difference                    [system] { header "__algorithm/set_symmetric_difference.h" }
+module std_private_algorithm_set_union                                   [system] { header "__algorithm/set_union.h" }
+module std_private_algorithm_shift_left                                  [system] { header "__algorithm/shift_left.h" }
+module std_private_algorithm_shift_right                                 [system] { header "__algorithm/shift_right.h" }
+module std_private_algorithm_shuffle                                     [system] { header "__algorithm/shuffle.h" }
+module std_private_algorithm_sift_down                                   [system] { header "__algorithm/sift_down.h" }
+module std_private_algorithm_sort                                        [system] {
+  header "__algorithm/sort.h"
+  export std_private_debug_utils_strict_weak_ordering_check
+}
+module std_private_algorithm_sort_heap                                   [system] { header "__algorithm/sort_heap.h" }
+module std_private_algorithm_stable_partition                            [system] { header "__algorithm/stable_partition.h" }
+module std_private_algorithm_stable_sort                                 [system] { header "__algorithm/stable_sort.h" }
+module std_private_algorithm_swap_ranges                                 [system] {
+  header "__algorithm/swap_ranges.h"
+  export std_private_algorithm_iterator_operations
+}
+module std_private_algorithm_three_way_comp_ref_type                     [system] { header "__algorithm/three_way_comp_ref_type.h" }
+module std_private_algorithm_transform                                   [system] { header "__algorithm/transform.h" }
+module std_private_algorithm_uniform_random_bit_generator_adaptor        [system] { header "__algorithm/uniform_random_bit_generator_adaptor.h" }
+module std_private_algorithm_unique                                      [system] { header "__algorithm/unique.h" }
+module std_private_algorithm_unique_copy                                 [system] { header "__algorithm/unique_copy.h" }
+module std_private_algorithm_unwrap_iter                                 [system] {
+  header "__algorithm/unwrap_iter.h"
+  export std_private_iterator_iterator_traits
+}
+module std_private_algorithm_unwrap_range                                [system] {
+  header "__algorithm/unwrap_range.h"
+  export std_private_utility_pair
+}
+module std_private_algorithm_upper_bound                                 [system] { header "__algorithm/upper_bound.h" }
+
+module std_private_array_array_fwd [system] { header "__fwd/array.h" }
+
+module std_private_atomic_aliases             [system] {
+  header "__atomic/aliases.h"
+  export std_private_atomic_atomic
+}
+module std_private_atomic_atomic              [system] {
+  header "__atomic/atomic.h"
+  export std_private_atomic_atomic_base
+}
+module std_private_atomic_atomic_base         [system] { header "__atomic/atomic_base.h" }
+module std_private_atomic_atomic_flag         [system] {
+  header "__atomic/atomic_flag.h"
+  export *
+}
+module std_private_atomic_atomic_init         [system] { header "__atomic/atomic_init.h" }
+module std_private_atomic_atomic_lock_free    [system] { header "__atomic/atomic_lock_free.h" }
+module std_private_atomic_atomic_sync         [system] { header "__atomic/atomic_sync.h" }
+module std_private_atomic_check_memory_order  [system] { header "__atomic/check_memory_order.h" }
+module std_private_atomic_contention_t        [system] { header "__atomic/contention_t.h" }
+module std_private_atomic_cxx_atomic_impl     [system] { header "__atomic/cxx_atomic_impl.h" }
+module std_private_atomic_fence               [system] { header "__atomic/fence.h" }
+module std_private_atomic_is_always_lock_free [system] { header "__atomic/is_always_lock_free.h" }
+module std_private_atomic_kill_dependency     [system] { header "__atomic/kill_dependency.h" }
+module std_private_atomic_memory_order        [system] { header "__atomic/memory_order.h" }
+
+module std_private_bit_bit_cast       [system] { header "__bit/bit_cast.h" }
+module std_private_bit_bit_ceil       [system] { header "__bit/bit_ceil.h" }
+module std_private_bit_bit_floor      [system] { header "__bit/bit_floor.h" }
+module std_private_bit_bit_log2       [system] { header "__bit/bit_log2.h" }
+module std_private_bit_bit_width      [system] { header "__bit/bit_width.h" }
+module std_private_bit_blsr           [system] { header "__bit/blsr.h" }
+module std_private_bit_byteswap       [system] { header "__bit/byteswap.h" }
+module std_private_bit_countl         [system] { header "__bit/countl.h" }
+module std_private_bit_countr         [system] { header "__bit/countr.h" }
+module std_private_bit_endian         [system] { header "__bit/endian.h" }
+module std_private_bit_has_single_bit [system] { header "__bit/has_single_bit.h" }
+module std_private_bit_popcount       [system] { header "__bit/popcount.h" }
+module std_private_bit_rotate         [system] { header "__bit/rotate.h" }
+
+module std_private_charconv_chars_format            [system] { header "__charconv/chars_format.h" }
+module std_private_charconv_from_chars_integral     [system] { header "__charconv/from_chars_integral.h" }
+module std_private_charconv_from_chars_result       [system] { header "__charconv/from_chars_result.h" }
+module std_private_charconv_tables                  [system] { header "__charconv/tables.h" }
+module std_private_charconv_to_chars                [system] { header "__charconv/to_chars.h" }
+module std_private_charconv_to_chars_base_10        [system] { header "__charconv/to_chars_base_10.h" }
+module std_private_charconv_to_chars_floating_point [system] { header "__charconv/to_chars_floating_point.h" }
+module std_private_charconv_to_chars_integral       [system] { header "__charconv/to_chars_integral.h" }
+module std_private_charconv_to_chars_result         [system] { header "__charconv/to_chars_result.h" }
+module std_private_charconv_traits                  [system] { header "__charconv/traits.h" }
+
+module std_private_chrono_calendar               [system] { header "__chrono/calendar.h" }
+module std_private_chrono_concepts               [system] { header "__chrono/concepts.h" }
+module std_private_chrono_convert_to_timespec    [system] { header "__chrono/convert_to_timespec.h" }
+module std_private_chrono_convert_to_tm          [system] { header "__chrono/convert_to_tm.h" }
+module std_private_chrono_day                    [system] { header "__chrono/day.h" }
+module std_private_chrono_duration               [system] {
+  header "__chrono/duration.h"
+  export std_private_type_traits_is_convertible
+}
+module std_private_chrono_file_clock             [system] { header "__chrono/file_clock.h" }
+module std_private_chrono_formatter              [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "__chrono/formatter.h"
+}
+module std_private_chrono_hh_mm_ss               [system] { header "__chrono/hh_mm_ss.h" }
+module std_private_chrono_high_resolution_clock  [system] {
+  header "__chrono/high_resolution_clock.h"
+  export std_private_chrono_steady_clock
+  export std_private_chrono_system_clock
+}
+module std_private_chrono_literals               [system] { header "__chrono/literals.h" }
+module std_private_chrono_month                  [system] { header "__chrono/month.h" }
+module std_private_chrono_month_weekday          [system] { header "__chrono/month_weekday.h" }
+module std_private_chrono_monthday               [system] { header "__chrono/monthday.h" }
+module std_private_chrono_ostream                [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "__chrono/ostream.h"
+}
+module std_private_chrono_parser_std_format_spec [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "__chrono/parser_std_format_spec.h"
+}
+module std_private_chrono_statically_widen       [system] { header "__chrono/statically_widen.h" }
+module std_private_chrono_steady_clock           [system] {
+  header "__chrono/steady_clock.h"
+  export std_private_chrono_time_point
+}
+module std_private_chrono_system_clock           [system] {
+  header "__chrono/system_clock.h"
+  export std_private_chrono_time_point
+}
+module std_private_chrono_time_point             [system] { header "__chrono/time_point.h" }
+module std_private_chrono_weekday                [system] { header "__chrono/weekday.h" }
+module std_private_chrono_year                   [system] { header "__chrono/year.h" }
+module std_private_chrono_year_month             [system] { header "__chrono/year_month.h" }
+module std_private_chrono_year_month_day         [system] { header "__chrono/year_month_day.h" }
+module std_private_chrono_year_month_weekday     [system] { header "__chrono/year_month_weekday.h" }
+
+module std_private_compare_common_comparison_category     [system] { header "__compare/common_comparison_category.h" }
+module std_private_compare_compare_partial_order_fallback [system] { header "__compare/compare_partial_order_fallback.h" }
+module std_private_compare_compare_strong_order_fallback  [system] { header "__compare/compare_strong_order_fallback.h" }
+module std_private_compare_compare_three_way              [system] { header "__compare/compare_three_way.h" }
+module std_private_compare_compare_three_way_result       [system] { header "__compare/compare_three_way_result.h" }
+module std_private_compare_compare_weak_order_fallback    [system] { header "__compare/compare_weak_order_fallback.h" }
+module std_private_compare_is_eq                          [system] { header "__compare/is_eq.h" }
+module std_private_compare_ordering                       [system] { header "__compare/ordering.h" }
+module std_private_compare_partial_order                  [system] { header "__compare/partial_order.h" }
+module std_private_compare_strong_order                   [system] { header "__compare/strong_order.h" }
+module std_private_compare_synth_three_way                [system] { header "__compare/synth_three_way.h" }
+module std_private_compare_three_way_comparable           [system] { header "__compare/three_way_comparable.h" }
+module std_private_compare_weak_order                     [system] { header "__compare/weak_order.h" }
+
+module std_private_concepts_arithmetic            [system] { header "__concepts/arithmetic.h" }
+module std_private_concepts_assignable            [system] { header "__concepts/assignable.h" }
+module std_private_concepts_boolean_testable      [system] { header "__concepts/boolean_testable.h" }
+module std_private_concepts_class_or_enum         [system] { header "__concepts/class_or_enum.h" }
+module std_private_concepts_common_reference_with [system] { header "__concepts/common_reference_with.h" }
+module std_private_concepts_common_with           [system] { header "__concepts/common_with.h" }
+module std_private_concepts_constructible         [system] {
+  header "__concepts/constructible.h"
+  export std_private_concepts_destructible
+}
+module std_private_concepts_convertible_to        [system] { header "__concepts/convertible_to.h" }
+module std_private_concepts_copyable              [system] { header "__concepts/copyable.h" }
+module std_private_concepts_derived_from          [system] { header "__concepts/derived_from.h" }
+module std_private_concepts_destructible          [system] {
+  header "__concepts/destructible.h"
+  export std_private_type_traits_is_nothrow_destructible
+}
+module std_private_concepts_different_from        [system] { header "__concepts/different_from.h" }
+module std_private_concepts_equality_comparable   [system] {
+  header "__concepts/equality_comparable.h"
+  export std_private_type_traits_common_reference
+}
+module std_private_concepts_invocable             [system] { header "__concepts/invocable.h" }
+module std_private_concepts_movable               [system] {
+  header "__concepts/movable.h"
+  export std_private_type_traits_is_object
+}
+module std_private_concepts_predicate             [system] { header "__concepts/predicate.h" }
+module std_private_concepts_regular               [system] { header "__concepts/regular.h" }
+module std_private_concepts_relation              [system] { header "__concepts/relation.h" }
+module std_private_concepts_same_as               [system] {
+  header "__concepts/same_as.h"
+  export std_private_type_traits_is_same
+}
+module std_private_concepts_semiregular           [system] { header "__concepts/semiregular.h" }
+module std_private_concepts_swappable             [system] { header "__concepts/swappable.h" }
+module std_private_concepts_totally_ordered       [system] { header "__concepts/totally_ordered.h" }
 
-    module __exception {
-      module exception        { private header "__exception/exception.h" }
-      module exception_ptr    { private header "__exception/exception_ptr.h" }
-      module nested_exception { private header "__exception/nested_exception.h" }
-      module operations       { private header "__exception/operations.h" }
-      module terminate        { private header "__exception/terminate.h" }
-    }
-  }
-  module execution {
-    header "execution"
-    export *
-  }
-  module expected {
-    header "expected"
-    export *
+module std_private_condition_variable_condition_variable [system] {
+  header "__condition_variable/condition_variable.h"
+  export *
+}
 
-    module __expected {
-      module bad_expected_access          { private header "__expected/bad_expected_access.h" }
-      module expected                     { private header "__expected/expected.h" }
-      module unexpect                     { private header "__expected/unexpect.h" }
-      module unexpected                   { private header "__expected/unexpected.h" }
-    }
-  }
-  module filesystem {
-    @requires_LIBCXX_ENABLE_FILESYSTEM@
-    header "filesystem"
-    export *
+module std_private_coroutine_coroutine_handle      [system] { header "__coroutine/coroutine_handle.h" }
+module std_private_coroutine_coroutine_traits      [system] { header "__coroutine/coroutine_traits.h" }
+module std_private_coroutine_noop_coroutine_handle [system] { header "__coroutine/noop_coroutine_handle.h" }
+module std_private_coroutine_trivial_awaitables    [system] { header "__coroutine/trivial_awaitables.h" }
 
-    module __filesystem {
-      module copy_options                 { private header "__filesystem/copy_options.h" }
-      module directory_entry              { private header "__filesystem/directory_entry.h" }
-      module directory_iterator           { private header "__filesystem/directory_iterator.h" }
-      module directory_options            { private header "__filesystem/directory_options.h" }
-      module file_status                  { private header "__filesystem/file_status.h" }
-      module file_time_type               { private header "__filesystem/file_time_type.h" }
-      module file_type                    { private header "__filesystem/file_type.h" }
-      module filesystem_error             { private header "__filesystem/filesystem_error.h" }
-      module operations                   { private header "__filesystem/operations.h" }
-      module path                         {
-        private header "__filesystem/path.h"
-        export functional.__functional.hash
-        export functional.__functional.unary_function
-        export string
-      }
-      module path_iterator                { private header "__filesystem/path_iterator.h" }
-      module perm_options                 { private header "__filesystem/perm_options.h" }
-      module perms                        { private header "__filesystem/perms.h" }
-      module recursive_directory_iterator { private header "__filesystem/recursive_directory_iterator.h" }
-      module space_info                   { private header "__filesystem/space_info.h" }
-      module u8path                       { private header "__filesystem/u8path.h" }
-    }
-  }
-  module format {
-    header "format"
-    export *
+module std_private_debug_utils_randomize_range            [system] { header "__debug_utils/randomize_range.h" }
+module std_private_debug_utils_strict_weak_ordering_check [system] {
+  header "__debug_utils/strict_weak_ordering_check.h"
+  export std_private_type_traits_is_constant_evaluated
+}
 
-    module __format {
-      module buffer                          { private header "__format/buffer.h" }
-      module concepts                        { private header "__format/concepts.h" }
-      module container_adaptor               { private header "__format/container_adaptor.h" }
-      module enable_insertable               { private header "__format/enable_insertable.h" }
-      module escaped_output_table            { private header "__format/escaped_output_table.h" }
-      module extended_grapheme_cluster_table { private header "__format/extended_grapheme_cluster_table.h" }
-      module format_arg                      { private header "__format/format_arg.h" }
-      module format_arg_store                { private header "__format/format_arg_store.h" }
-      module format_args                     { private header "__format/format_args.h" }
-      module format_context {
-        private header "__format/format_context.h"
-        export optional
-        export locale
-      }
-      module format_error                    { private header "__format/format_error.h" }
-      module format_functions                { private header "__format/format_functions.h" }
-      module format_fwd                      { private header "__format/format_fwd.h" }
-      module format_parse_context            { private header "__format/format_parse_context.h" }
-      module format_string                   { private header "__format/format_string.h" }
-      module format_to_n_result {
-        private header "__format/format_to_n_result.h"
-        export iterator.__iterator.incrementable_traits
-      }
-      module formatter                       { private header "__format/formatter.h" }
-      module formatter_bool                  { private header "__format/formatter_bool.h" }
-      module formatter_char                  { private header "__format/formatter_char.h" }
-      module formatter_floating_point        { private header "__format/formatter_floating_point.h" }
-      module formatter_integer               { private header "__format/formatter_integer.h" }
-      module formatter_integral              { private header "__format/formatter_integral.h" }
-      module formatter_output                { private header "__format/formatter_output.h" }
-      module formatter_pointer               { private header "__format/formatter_pointer.h" }
-      module formatter_string                { private header "__format/formatter_string.h" }
-      module formatter_tuple                 { private header "__format/formatter_tuple.h" }
-      module parser_std_format_spec          { private header "__format/parser_std_format_spec.h" }
-      module range_default_formatter         { private header "__format/range_default_formatter.h" }
-      module range_formatter                 { private header "__format/range_formatter.h" }
-      module unicode                         { private header "__format/unicode.h" }
-      module width_estimation_table          { private header "__format/width_estimation_table.h" }
-      module write_escaped                   { private header "__format/write_escaped.h" }
-    }
-  }
-  module forward_list {
-    header "forward_list"
-    export *
-  }
-  module fstream {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    @requires_LIBCXX_ENABLE_FILESYSTEM@
-    header "fstream"
-    export *
-  }
-  module functional {
-    header "functional"
-    export *
+module std_private_exception_exception        [system] { header "__exception/exception.h" }
+module std_private_exception_exception_ptr    [system] {
+  header "__exception/exception_ptr.h"
+  export std_private_exception_operations
+}
+module std_private_exception_nested_exception [system] { header "__exception/nested_exception.h" }
+module std_private_exception_operations       [system] { header "__exception/operations.h" }
+module std_private_exception_terminate        [system] { header "__exception/terminate.h" }
 
-    module __functional {
-      module binary_function            { private header "__functional/binary_function.h" }
-      module binary_negate              { private header "__functional/binary_negate.h" }
-      module bind                       { private header "__functional/bind.h" }
-      module bind_back                  { private header "__functional/bind_back.h" }
-      module bind_front                 { private header "__functional/bind_front.h" }
-      module binder1st                  { private header "__functional/binder1st.h" }
-      module binder2nd                  { private header "__functional/binder2nd.h" }
-      module boyer_moore_searcher       {
-        private header "__functional/boyer_moore_searcher.h"
-        export memory.__memory.shared_ptr
-      }
-      module compose                    { private header "__functional/compose.h" }
-      module default_searcher           { private header "__functional/default_searcher.h" }
-      module function                   { private header "__functional/function.h" }
-      module hash                       {
-        private header "__functional/hash.h"
-        export compat.cstdint
-        export type_traits.underlying_type
-        export utility.__utility.pair
-      }
-      module hash_fwd                   { private header "__fwd/hash.h" }
-      module identity                   { private header "__functional/identity.h" }
-      module invoke                     {
-        private header "__functional/invoke.h"
-        export *
-      }
-      module is_transparent             { private header "__functional/is_transparent.h" }
-      module mem_fn                     { private header "__functional/mem_fn.h" }
-      module mem_fun_ref                { private header "__functional/mem_fun_ref.h" }
-      module not_fn                     { private header "__functional/not_fn.h" }
-      module operations                 { private header "__functional/operations.h" }
-      module perfect_forward            {
-        private header "__functional/perfect_forward.h"
-        export *
-      }
-      module pointer_to_binary_function { private header "__functional/pointer_to_binary_function.h" }
-      module pointer_to_unary_function  { private header "__functional/pointer_to_unary_function.h" }
-      module ranges_operations          { private header "__functional/ranges_operations.h" }
-      module reference_wrapper          { private header "__functional/reference_wrapper.h" }
-      module unary_function             { private header "__functional/unary_function.h" }
-      module unary_negate               { private header "__functional/unary_negate.h" }
-      module weak_result_type           { private header "__functional/weak_result_type.h" }
-    }
-  }
-  module future {
-    @requires_LIBCXX_ENABLE_THREADS@
-    header "future"
-    export *
-  }
-  module initializer_list {
-    header "initializer_list"
-    export *
-  }
-  module iomanip {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "iomanip"
-    export *
-  }
-  module ios {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "ios"
-    export *
+module std_private_expected_bad_expected_access [system] { header "__expected/bad_expected_access.h" }
+module std_private_expected_expected            [system] { header "__expected/expected.h" }
+module std_private_expected_unexpect            [system] { header "__expected/unexpect.h" }
+module std_private_expected_unexpected          [system] { header "__expected/unexpected.h" }
 
-    module __ios {
-      module fpos { private header "__ios/fpos.h" }
-    }
-  }
-  module iosfwd {
-    header "iosfwd"
-    export *
-    module __iosfwd {
-      module fstream_fwd   { private header "__fwd/fstream.h" }
-      module ios_fwd       { private header "__fwd/ios.h" }
-      module istream_fwd   { private header "__fwd/istream.h" }
-      module ostream_fwd   { private header "__fwd/ostream.h" }
-      module sstream_fwd   { private header "__fwd/sstream.h" }
-      module streambuf_fwd { private header "__fwd/streambuf.h" }
-    }
-  }
-  module iostream {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "iostream"
-    export *
-  }
-  module istream {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "istream"
-    // FIXME: should re-export ios, streambuf?
-    export *
-  }
-  module iterator {
-    header "iterator"
-    export *
+module std_private_filesystem_copy_options                 [system] { header "__filesystem/copy_options.h" }
+module std_private_filesystem_directory_entry              [system] {
+  header "__filesystem/directory_entry.h"
+  export *
+}
+module std_private_filesystem_directory_iterator           [system] {
+  header "__filesystem/directory_iterator.h"
+  export *
+}
+module std_private_filesystem_directory_options            [system] { header "__filesystem/directory_options.h" }
+module std_private_filesystem_file_status                  [system] { header "__filesystem/file_status.h" }
+module std_private_filesystem_file_time_type               [system] { header "__filesystem/file_time_type.h" }
+module std_private_filesystem_file_type                    [system] { header "__filesystem/file_type.h" }
+module std_private_filesystem_filesystem_error             [system] {
+  header "__filesystem/filesystem_error.h"
+  export *
+}
+module std_private_filesystem_operations                   [system] { header "__filesystem/operations.h" }
+module std_private_filesystem_path                         [system] {
+  header "__filesystem/path.h"
+  export *
+}
+module std_private_filesystem_path_iterator                [system] { header "__filesystem/path_iterator.h" }
+module std_private_filesystem_perm_options                 [system] { header "__filesystem/perm_options.h" }
+module std_private_filesystem_perms                        [system] { header "__filesystem/perms.h" }
+module std_private_filesystem_recursive_directory_iterator [system] {
+  header "__filesystem/recursive_directory_iterator.h"
+  export *
+}
+module std_private_filesystem_space_info                   [system] { header "__filesystem/space_info.h" }
+module std_private_filesystem_u8path                       [system] { header "__filesystem/u8path.h" }
 
-    module __iterator {
-      module access                  { private header "__iterator/access.h" }
-      module advance                 { private header "__iterator/advance.h" }
-      module back_insert_iterator    { private header "__iterator/back_insert_iterator.h" }
-      module bounded_iter            { private header "__iterator/bounded_iter.h" }
-      module common_iterator         { private header "__iterator/common_iterator.h" }
-      module cpp17_iterator_concepts { private header "__iterator/cpp17_iterator_concepts.h" }
-      module concepts {
-        private header "__iterator/concepts.h"
-        export std.concepts.__concepts.constructible
-        export std.concepts.__concepts.equality_comparable
-        export std.concepts.__concepts.movable
-        export type_traits.common_reference
-        export type_traits.is_reference
-        export type_traits.remove_cvref
-      }
-      module counted_iterator      { private header "__iterator/counted_iterator.h" }
-      module data                  { private header "__iterator/data.h" }
-      module default_sentinel      { private header "__iterator/default_sentinel.h" }
-      module distance              {
-        private header "__iterator/distance.h"
-        export ranges.__ranges.size
-      }
-      module empty                 { private header "__iterator/empty.h" }
-      module erase_if_container    { private header "__iterator/erase_if_container.h" }
-      module front_insert_iterator { private header "__iterator/front_insert_iterator.h" }
-      module incrementable_traits  { private header "__iterator/incrementable_traits.h" }
-      module indirectly_comparable { private header "__iterator/indirectly_comparable.h" }
-      module insert_iterator       { private header "__iterator/insert_iterator.h" }
-      module istream_iterator      { private header "__iterator/istream_iterator.h" }
-      module istreambuf_iterator   { private header "__iterator/istreambuf_iterator.h" }
-      module iter_move             { private header "__iterator/iter_move.h" }
-      module iter_swap             { private header "__iterator/iter_swap.h" }
-      module iterator              { private header "__iterator/iterator.h" }
-      module iterator_traits       {
-        private header "__iterator/iterator_traits.h"
-        export type_traits.is_primary_template
-      }
-      module iterator_with_data    { private header "__iterator/iterator_with_data.h" }
-      module mergeable {
-        private header "__iterator/mergeable.h"
-        export functional.__functional.ranges_operations
-      }
-      module move_iterator         { private header "__iterator/move_iterator.h" }
-      module move_sentinel         { private header "__iterator/move_sentinel.h" }
-      module next                  { private header "__iterator/next.h" }
-      module ostream_iterator      { private header "__iterator/ostream_iterator.h" }
-      module ostreambuf_iterator   {
-        private header "__iterator/ostreambuf_iterator.h"
-        export iosfwd
-      }
-      module permutable            { private header "__iterator/permutable.h" }
-      module prev                  { private header "__iterator/prev.h" }
-      module projected             { private header "__iterator/projected.h" }
-      module readable_traits       { private header "__iterator/readable_traits.h" }
-      module reverse_access        { private header "__iterator/reverse_access.h" }
-      module reverse_iterator      { private header "__iterator/reverse_iterator.h" }
-      module segmented_iterator    { private header "__iterator/segmented_iterator.h" }
-      module size                  { private header "__iterator/size.h" }
-      module sortable {
-        private header "__iterator/sortable.h"
-        export functional.__functional.ranges_operations
-      }
-      module unreachable_sentinel  { private header "__iterator/unreachable_sentinel.h" }
-      module wrap_iter             { private header "__iterator/wrap_iter.h" }
-    }
-  }
-  module latch {
-    @requires_LIBCXX_ENABLE_THREADS@
-    header "latch"
-    export *
-  }
+module std_private_format_buffer                          [system] { header "__format/buffer.h" }
+module std_private_format_concepts                        [system] { header "__format/concepts.h" }
+module std_private_format_container_adaptor               [system] { header "__format/container_adaptor.h" }
+module std_private_format_enable_insertable               [system] { header "__format/enable_insertable.h" }
+module std_private_format_escaped_output_table            [system] { header "__format/escaped_output_table.h" }
+module std_private_format_extended_grapheme_cluster_table [system] { header "__format/extended_grapheme_cluster_table.h" }
+module std_private_format_format_arg                      [system] { header "__format/format_arg.h" }
+module std_private_format_format_arg_store                [system] { header "__format/format_arg_store.h" }
+module std_private_format_format_args                     [system] { header "__format/format_args.h" }
+module std_private_format_format_context                  [system] {
+  header "__format/format_context.h"
+  export *
+}
+module std_private_format_format_error                    [system] { header "__format/format_error.h" }
+module std_private_format_format_functions                [system] { header "__format/format_functions.h" }
+module std_private_format_format_fwd                      [system] { header "__format/format_fwd.h" }
+module std_private_format_format_parse_context            [system] { header "__format/format_parse_context.h" }
+module std_private_format_format_string                   [system] { header "__format/format_string.h" }
+module std_private_format_format_to_n_result              [system] {
+  header "__format/format_to_n_result.h"
+  export std_private_iterator_incrementable_traits
+}
+module std_private_format_formatter                       [system] { header "__format/formatter.h" }
+module std_private_format_formatter_bool                  [system] { header "__format/formatter_bool.h" }
+module std_private_format_formatter_char                  [system] { header "__format/formatter_char.h" }
+module std_private_format_formatter_floating_point        [system] { header "__format/formatter_floating_point.h" }
+module std_private_format_formatter_integer               [system] { header "__format/formatter_integer.h" }
+module std_private_format_formatter_integral              [system] { header "__format/formatter_integral.h" }
+module std_private_format_formatter_output                [system] { header "__format/formatter_output.h" }
+module std_private_format_formatter_pointer               [system] { header "__format/formatter_pointer.h" }
+module std_private_format_formatter_string                [system] { header "__format/formatter_string.h" }
+module std_private_format_formatter_tuple                 [system] { header "__format/formatter_tuple.h" }
+module std_private_format_parser_std_format_spec          [system] { header "__format/parser_std_format_spec.h" }
+module std_private_format_range_default_formatter         [system] { header "__format/range_default_formatter.h" }
+module std_private_format_range_formatter                 [system] { header "__format/range_formatter.h" }
+module std_private_format_unicode                         [system] {
+  header "__format/unicode.h"
+  export std_private_format_extended_grapheme_cluster_table
+}
+module std_private_format_width_estimation_table          [system] { header "__format/width_estimation_table.h" }
+module std_private_format_write_escaped                   [system] { header "__format/write_escaped.h" }
 
-  module __debug_utils {
-    module randomize_range            { private header "__debug_utils/randomize_range.h" }
-    module strict_weak_ordering_check {
-      private header "__debug_utils/strict_weak_ordering_check.h"
-      export type_traits.is_constant_evaluated
-    }
-  }
+module std_private_functional_binary_function            [system] { header "__functional/binary_function.h" }
+module std_private_functional_binary_negate              [system] { header "__functional/binary_negate.h" }
+module std_private_functional_bind                       [system] { header "__functional/bind.h" }
+module std_private_functional_bind_back                  [system] { header "__functional/bind_back.h" }
+module std_private_functional_bind_front                 [system] { header "__functional/bind_front.h" }
+module std_private_functional_binder1st                  [system] { header "__functional/binder1st.h" }
+module std_private_functional_binder2nd                  [system] { header "__functional/binder2nd.h" }
+module std_private_functional_boyer_moore_searcher       [system] {
+  header "__functional/boyer_moore_searcher.h"
+  export std_private_memory_shared_ptr
+}
+module std_private_functional_compose                    [system] {
+  header "__functional/compose.h"
+  export std_private_functional_perfect_forward
+}
+module std_private_functional_default_searcher           [system] { header "__functional/default_searcher.h" }
+module std_private_functional_function                   [system] { header "__functional/function.h" }
+module std_private_functional_hash                       [system] {
+  header "__functional/hash.h"
+  export std_cstdint
+  export std_private_type_traits_underlying_type
+  export std_private_utility_pair
+}
+module std_private_functional_hash_fwd                   [system] { header "__fwd/hash.h" }
+module std_private_functional_identity                   [system] { header "__functional/identity.h" }
+module std_private_functional_invoke                     [system] {
+  header "__functional/invoke.h"
+  export *
+}
+module std_private_functional_is_transparent             [system] { header "__functional/is_transparent.h" }
+module std_private_functional_mem_fn                     [system] { header "__functional/mem_fn.h" }
+module std_private_functional_mem_fun_ref                [system] { header "__functional/mem_fun_ref.h" }
+module std_private_functional_not_fn                     [system] { header "__functional/not_fn.h" }
+module std_private_functional_operations                 [system] { header "__functional/operations.h" }
+module std_private_functional_perfect_forward            [system] {
+  header "__functional/perfect_forward.h"
+  export *
+}
+module std_private_functional_pointer_to_binary_function [system] { header "__functional/pointer_to_binary_function.h" }
+module std_private_functional_pointer_to_unary_function  [system] { header "__functional/pointer_to_unary_function.h" }
+module std_private_functional_ranges_operations          [system] { header "__functional/ranges_operations.h" }
+module std_private_functional_reference_wrapper          [system] { header "__functional/reference_wrapper.h" }
+module std_private_functional_unary_function             [system] { header "__functional/unary_function.h" }
+module std_private_functional_unary_negate               [system] { header "__functional/unary_negate.h" }
+module std_private_functional_weak_result_type           [system] { header "__functional/weak_result_type.h" }
 
-  module limits {
-    header "limits"
-    export *
-  }
-  module list {
-    header "list"
-    export *
-  }
-  module locale {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "locale"
-    export *
+module std_private_ios_fpos [system] { header "__ios/fpos.h" }
 
-    module __locale {
-      module locale_base_api_bsd_locale_defaults  { private textual header "__locale_dir/locale_base_api/bsd_locale_defaults.h" }
-      module locale_base_api_bsd_locale_fallbacks { private textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h" }
-      module locale_base_api_locale_guard         { private header "__locale_dir/locale_base_api/locale_guard.h" }
-    }
-  }
-  module map {
-    header "map"
-    export *
-  }
-  module mdspan {
-    header "mdspan"
-    export *
+module std_private_iosfwd_fstream_fwd   [system] { header "__fwd/fstream.h" }
+module std_private_iosfwd_ios_fwd       [system] { header "__fwd/ios.h" }
+module std_private_iosfwd_istream_fwd   [system] { header "__fwd/istream.h" }
+module std_private_iosfwd_ostream_fwd   [system] { header "__fwd/ostream.h" }
+module std_private_iosfwd_sstream_fwd   [system] { header "__fwd/sstream.h" }
+module std_private_iosfwd_streambuf_fwd [system] { header "__fwd/streambuf.h" }
 
-    module __mdspan {
-      module extents                         {
-        private header "__mdspan/extents.h"
-        export array
-        export span
-      }
-      module layout_left                     { private header "__mdspan/layout_left.h" }
-      module layout_right                    { private header "__mdspan/layout_right.h" }
-      module mdspan_fwd                      { private header "__fwd/mdspan.h" }
-    }
-  }
-  module memory {
-    header "memory"
-    export *
+module std_private_iterator_access                  [system] { header "__iterator/access.h" }
+module std_private_iterator_advance                 [system] { header "__iterator/advance.h" }
+module std_private_iterator_back_insert_iterator    [system] { header "__iterator/back_insert_iterator.h" }
+module std_private_iterator_bounded_iter            [system] { header "__iterator/bounded_iter.h" }
+module std_private_iterator_common_iterator         [system] { header "__iterator/common_iterator.h" }
+module std_private_iterator_concepts                [system] {
+  header "__iterator/concepts.h"
+  export std_private_concepts_constructible
+  export std_private_concepts_equality_comparable
+  export std_private_concepts_movable
+  export std_private_type_traits_common_reference
+  export std_private_type_traits_is_reference
+  export std_private_type_traits_remove_cvref
+}
+module std_private_iterator_counted_iterator        [system] { header "__iterator/counted_iterator.h" }
+module std_private_iterator_cpp17_iterator_concepts [system] { header "__iterator/cpp17_iterator_concepts.h" }
+module std_private_iterator_data                    [system] { header "__iterator/data.h" }
+module std_private_iterator_default_sentinel        [system] { header "__iterator/default_sentinel.h" }
+module std_private_iterator_distance                [system] {
+  header "__iterator/distance.h"
+  export std_private_ranges_size
+}
+module std_private_iterator_empty                   [system] { header "__iterator/empty.h" }
+module std_private_iterator_erase_if_container      [system] { header "__iterator/erase_if_container.h" }
+module std_private_iterator_front_insert_iterator   [system] { header "__iterator/front_insert_iterator.h" }
+module std_private_iterator_incrementable_traits    [system] { header "__iterator/incrementable_traits.h" }
+module std_private_iterator_indirectly_comparable   [system] { header "__iterator/indirectly_comparable.h" }
+module std_private_iterator_insert_iterator         [system] { header "__iterator/insert_iterator.h" }
+module std_private_iterator_istream_iterator        [system] { header "__iterator/istream_iterator.h" }
+module std_private_iterator_istreambuf_iterator     [system] { header "__iterator/istreambuf_iterator.h" }
+module std_private_iterator_iter_move               [system] { header "__iterator/iter_move.h" }
+module std_private_iterator_iter_swap               [system] { header "__iterator/iter_swap.h" }
+module std_private_iterator_iterator                [system] { header "__iterator/iterator.h" }
+module std_private_iterator_iterator_traits         [system] {
+  header "__iterator/iterator_traits.h"
+  export std_private_type_traits_is_primary_template
+}
+module std_private_iterator_iterator_with_data      [system] { header "__iterator/iterator_with_data.h" }
+module std_private_iterator_mergeable               [system] {
+  header "__iterator/mergeable.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_iterator_move_iterator           [system] { header "__iterator/move_iterator.h" }
+module std_private_iterator_move_sentinel           [system] { header "__iterator/move_sentinel.h" }
+module std_private_iterator_next                    [system] { header "__iterator/next.h" }
+module std_private_iterator_ostream_iterator        [system] { header "__iterator/ostream_iterator.h" }
+module std_private_iterator_ostreambuf_iterator     [system] {
+  header "__iterator/ostreambuf_iterator.h"
+  export *
+}
+module std_private_iterator_permutable              [system] { header "__iterator/permutable.h" }
+module std_private_iterator_prev                    [system] { header "__iterator/prev.h" }
+module std_private_iterator_projected               [system] { header "__iterator/projected.h" }
+module std_private_iterator_readable_traits         [system] { header "__iterator/readable_traits.h" }
+module std_private_iterator_reverse_access          [system] { header "__iterator/reverse_access.h" }
+module std_private_iterator_reverse_iterator        [system] { header "__iterator/reverse_iterator.h" }
+module std_private_iterator_segmented_iterator      [system] { header "__iterator/segmented_iterator.h" }
+module std_private_iterator_size                    [system] { header "__iterator/size.h" }
+module std_private_iterator_sortable                [system] {
+  header "__iterator/sortable.h"
+  export std_private_functional_ranges_operations
+}
+module std_private_iterator_unreachable_sentinel    [system] { header "__iterator/unreachable_sentinel.h" }
+module std_private_iterator_wrap_iter               [system] { header "__iterator/wrap_iter.h" }
 
-    module __memory {
-      module addressof                       { private header "__memory/addressof.h" }
-      module align                           { private header "__memory/align.h" }
-      module aligned_alloc                   { private header "__memory/aligned_alloc.h" }
-      module allocate_at_least               { private header "__memory/allocate_at_least.h" }
-      module allocation_guard                { private header "__memory/allocation_guard.h" }
-      module allocator                       { private header "__memory/allocator.h" }
-      module allocator_arg_t                 { private header "__memory/allocator_arg_t.h" }
-      module allocator_destructor            { private header "__memory/allocator_destructor.h" }
-      module allocator_traits                { private header "__memory/allocator_traits.h" }
-      module assume_aligned                  { private header "__memory/assume_aligned.h" }
-      module auto_ptr                        { private header "__memory/auto_ptr.h" }
-      module builtin_new_allocator           { private header "__memory/builtin_new_allocator.h" }
-      module compressed_pair                 { private header "__memory/compressed_pair.h" }
-      module concepts                        {
-        private header "__memory/concepts.h"
-        export type_traits.remove_reference
-      }
-      module construct_at                    { private header "__memory/construct_at.h" }
-      module destruct_n                      { private header "__memory/destruct_n.h" }
-      module pointer_traits                  { private header "__memory/pointer_traits.h" }
-      module ranges_construct_at             { private header "__memory/ranges_construct_at.h" }
-      module ranges_uninitialized_algorithms {
-        private header "__memory/ranges_uninitialized_algorithms.h"
-        export algorithm.__algorithm.in_out_result
-      }
-      module raw_storage_iterator            { private header "__memory/raw_storage_iterator.h" }
-      module shared_ptr                      {
-        private header "__memory/shared_ptr.h"
-        export memory.__memory.uninitialized_algorithms
-      }
-      module swap_allocator                  { private header "__memory/swap_allocator.h" }
-      module temp_value                      { private header "__memory/temp_value.h" }
-      module temporary_buffer                { private header "__memory/temporary_buffer.h" }
-      module uninitialized_algorithms        {
-        private header "__memory/uninitialized_algorithms.h"
-        export algorithm.__algorithm.copy
-      }
-      module unique_ptr                      {
-        private header "__memory/unique_ptr.h"
-        export type_traits.add_lvalue_reference
-        export type_traits.is_pointer
-        export type_traits.type_identity
-      }
-      module uses_allocator                  { private header "__memory/uses_allocator.h" }
-      module uses_allocator_construction     { private header "__memory/uses_allocator_construction.h" }
-      module voidify                         { private header "__memory/voidify.h" }
-    }
-  }
-  module memory_resource {
-    header "memory_resource"
-    export *
+module std_private_locale_locale_base_api_bsd_locale_defaults  [system] { textual header "__locale_dir/locale_base_api/bsd_locale_defaults.h" }
+module std_private_locale_locale_base_api_bsd_locale_fallbacks [system] { textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h" }
+module std_private_locale_locale_base_api_locale_guard         [system] { header "__locale_dir/locale_base_api/locale_guard.h" }
 
-    module __memory_resource {
-      module memory_resource              { private header "__memory_resource/memory_resource.h" }
-      module memory_resource_fwd          { private header "__fwd/memory_resource.h" }
-      module monotonic_buffer_resource    { private header "__memory_resource/monotonic_buffer_resource.h" }
-      module polymorphic_allocator        { private header "__memory_resource/polymorphic_allocator.h" }
-      module pool_options                 { private header "__memory_resource/pool_options.h" }
-      module synchronized_pool_resource   { private header "__memory_resource/synchronized_pool_resource.h" }
-      module unsynchronized_pool_resource { private header "__memory_resource/unsynchronized_pool_resource.h" }
-    }
-  }
-  module mutex {
-    @requires_LIBCXX_ENABLE_THREADS@
-    header "mutex"
-    export *
+module std_private_mdspan_extents      [system] {
+  header "__mdspan/extents.h"
+  export *
+}
+module std_private_mdspan_layout_left  [system] { header "__mdspan/layout_left.h" }
+module std_private_mdspan_layout_right [system] { header "__mdspan/layout_right.h" }
+module std_private_mdspan_mdspan_fwd   [system] { header "__fwd/mdspan.h" }
 
-    module __mutex {
-      module lock_guard  { private header "__mutex/lock_guard.h" }
-      module mutex       { private header "__mutex/mutex.h" }
-      module tag_types   { private header "__mutex/tag_types.h" }
-      module unique_lock { private header "__mutex/unique_lock.h" }
-    }
-  }
-  module new {
-    header "new"
-    export *
-  }
-  module numbers {
-    header "numbers"
-    export *
-  }
-  module numeric {
-    header "numeric"
-    export *
+module std_private_memory_addressof                       [system] { header "__memory/addressof.h" }
+module std_private_memory_align                           [system] { header "__memory/align.h" }
+module std_private_memory_aligned_alloc                   [system] { header "__memory/aligned_alloc.h" }
+module std_private_memory_allocate_at_least               [system] { header "__memory/allocate_at_least.h" }
+module std_private_memory_allocation_guard                [system] { header "__memory/allocation_guard.h" }
+module std_private_memory_allocator                       [system] { header "__memory/allocator.h" }
+module std_private_memory_allocator_arg_t                 [system] { header "__memory/allocator_arg_t.h" }
+module std_private_memory_allocator_destructor            [system] { header "__memory/allocator_destructor.h" }
+module std_private_memory_allocator_traits                [system] { header "__memory/allocator_traits.h" }
+module std_private_memory_assume_aligned                  [system] { header "__memory/assume_aligned.h" }
+module std_private_memory_auto_ptr                        [system] { header "__memory/auto_ptr.h" }
+module std_private_memory_builtin_new_allocator           [system] { header "__memory/builtin_new_allocator.h" }
+module std_private_memory_compressed_pair                 [system] { header "__memory/compressed_pair.h" }
+module std_private_memory_concepts                        [system] {
+  header "__memory/concepts.h"
+  export std_private_type_traits_remove_reference
+}
+module std_private_memory_construct_at                    [system] { header "__memory/construct_at.h" }
+module std_private_memory_destruct_n                      [system] { header "__memory/destruct_n.h" }
+module std_private_memory_pointer_traits                  [system] { header "__memory/pointer_traits.h" }
+module std_private_memory_ranges_construct_at             [system] { header "__memory/ranges_construct_at.h" }
+module std_private_memory_ranges_uninitialized_algorithms [system] {
+  header "__memory/ranges_uninitialized_algorithms.h"
+  export std_private_algorithm_in_out_result
+}
+module std_private_memory_raw_storage_iterator            [system] { header "__memory/raw_storage_iterator.h" }
+module std_private_memory_shared_ptr                      [system] {
+  header "__memory/shared_ptr.h"
+  export std_private_memory_uninitialized_algorithms
+}
+module std_private_memory_swap_allocator                  [system] { header "__memory/swap_allocator.h" }
+module std_private_memory_temp_value                      [system] { header "__memory/temp_value.h" }
+module std_private_memory_temporary_buffer                [system] { header "__memory/temporary_buffer.h" }
+module std_private_memory_uninitialized_algorithms        [system] {
+  header "__memory/uninitialized_algorithms.h"
+  export std_private_algorithm_copy
+}
+module std_private_memory_unique_ptr                      [system] {
+  header "__memory/unique_ptr.h"
+  export std_private_type_traits_add_lvalue_reference
+  export std_private_type_traits_is_pointer
+  export std_private_type_traits_type_identity
+}
+module std_private_memory_uses_allocator                  [system] { header "__memory/uses_allocator.h" }
+module std_private_memory_uses_allocator_construction     [system] { header "__memory/uses_allocator_construction.h" }
+module std_private_memory_voidify                         [system] { header "__memory/voidify.h" }
 
-    module __numeric {
-      module accumulate               { private header "__numeric/accumulate.h" }
-      module adjacent_difference      { private header "__numeric/adjacent_difference.h" }
-      module exclusive_scan           { private header "__numeric/exclusive_scan.h" }
-      module gcd_lcm                  { private header "__numeric/gcd_lcm.h" }
-      module inclusive_scan           { private header "__numeric/inclusive_scan.h" }
-      module inner_product            { private header "__numeric/inner_product.h" }
-      module iota                     { private header "__numeric/iota.h" }
-      module midpoint                 { private header "__numeric/midpoint.h" }
-      module partial_sum              { private header "__numeric/partial_sum.h" }
-      module pstl_reduce              { private header "__numeric/pstl_reduce.h" }
-      module pstl_transform_reduce    {
-        private header "__numeric/pstl_transform_reduce.h"
-        export *
-      }
-      module reduce                   { private header "__numeric/reduce.h" }
-      module transform_exclusive_scan { private header "__numeric/transform_exclusive_scan.h" }
-      module transform_inclusive_scan { private header "__numeric/transform_inclusive_scan.h" }
-      module transform_reduce         { private header "__numeric/transform_reduce.h" }
-    }
-  }
-  module optional {
-    header "optional"
-    export *
-  }
-  module ostream {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "ostream"
-    // FIXME: should re-export ios, streambuf?
-    export *
-  }
-  module print {
-    header "print"
-    export *
-  }
-  module queue {
-    header "queue"
-    export *
-  }
-  module random {
-    header "random"
-    export *
+module std_private_memory_resource_memory_resource              [system] { header "__memory_resource/memory_resource.h" }
+module std_private_memory_resource_memory_resource_fwd          [system] { header "__fwd/memory_resource.h" }
+module std_private_memory_resource_monotonic_buffer_resource    [system] { header "__memory_resource/monotonic_buffer_resource.h" }
+module std_private_memory_resource_polymorphic_allocator        [system] { header "__memory_resource/polymorphic_allocator.h" }
+module std_private_memory_resource_pool_options                 [system] { header "__memory_resource/pool_options.h" }
+module std_private_memory_resource_synchronized_pool_resource   [system] {
+  header "__memory_resource/synchronized_pool_resource.h"
+  export *
+}
+module std_private_memory_resource_unsynchronized_pool_resource [system] { header "__memory_resource/unsynchronized_pool_resource.h" }
 
-    module __random {
-      module bernoulli_distribution          { private header "__random/bernoulli_distribution.h" }
-      module binomial_distribution           { private header "__random/binomial_distribution.h" }
-      module cauchy_distribution             { private header "__random/cauchy_distribution.h" }
-      module chi_squared_distribution        { private header "__random/chi_squared_distribution.h" }
-      module clamp_to_integral               { private header "__random/clamp_to_integral.h" }
-      module default_random_engine           { private header "__random/default_random_engine.h" }
-      module discard_block_engine            { private header "__random/discard_block_engine.h" }
-      module discrete_distribution {
-        private header "__random/discrete_distribution.h"
-        export vector
-      }
-      module exponential_distribution        { private header "__random/exponential_distribution.h" }
-      module extreme_value_distribution      { private header "__random/extreme_value_distribution.h" }
-      module fisher_f_distribution           { private header "__random/fisher_f_distribution.h" }
-      module gamma_distribution              { private header "__random/gamma_distribution.h" }
-      module generate_canonical              { private header "__random/generate_canonical.h" }
-      module geometric_distribution          { private header "__random/geometric_distribution.h" }
-      module independent_bits_engine         { private header "__random/independent_bits_engine.h" }
-      module is_seed_sequence                { private header "__random/is_seed_sequence.h" }
-      module is_valid                        { private header "__random/is_valid.h" }
-      module knuth_b                         { private header "__random/knuth_b.h" }
-      module linear_congruential_engine      { private header "__random/linear_congruential_engine.h" }
-      module log2                            { private header "__random/log2.h" }
-      module lognormal_distribution          { private header "__random/lognormal_distribution.h" }
-      module mersenne_twister_engine         { private header "__random/mersenne_twister_engine.h" }
-      module negative_binomial_distribution  { private header "__random/negative_binomial_distribution.h" }
-      module normal_distribution             { private header "__random/normal_distribution.h" }
-      module piecewise_constant_distribution {
-        private header "__random/piecewise_constant_distribution.h"
-        export vector
-      }
-      module piecewise_linear_distribution {
-        private header "__random/piecewise_linear_distribution.h"
-        export vector
-      }
-      module poisson_distribution            { private header "__random/poisson_distribution.h" }
-      module random_device                   { private header "__random/random_device.h" }
-      module ranlux                          { private header "__random/ranlux.h" }
-      module seed_seq                        { private header "__random/seed_seq.h" }
-      module shuffle_order_engine            { private header "__random/shuffle_order_engine.h" }
-      module student_t_distribution          { private header "__random/student_t_distribution.h" }
-      module subtract_with_carry_engine      { private header "__random/subtract_with_carry_engine.h" }
-      module uniform_int_distribution        { private header "__random/uniform_int_distribution.h" }
-      module uniform_random_bit_generator    { private header "__random/uniform_random_bit_generator.h" }
-      module uniform_real_distribution       { private header "__random/uniform_real_distribution.h" }
-      module weibull_distribution            { private header "__random/weibull_distribution.h" }
-    }
-  }
-  module ranges {
-    header "ranges"
-    export *
+module std_private_mutex_lock_guard  [system] { header "__mutex/lock_guard.h" }
+module std_private_mutex_mutex       [system] { header "__mutex/mutex.h" }
+module std_private_mutex_tag_types   [system] { header "__mutex/tag_types.h" }
+module std_private_mutex_unique_lock [system] { header "__mutex/unique_lock.h" }
 
-    module __ranges {
-      module access                     { private header "__ranges/access.h" }
-      module all                        {
-        private header "__ranges/all.h"
-        export functional.__functional.compose
-        export functional.__functional.perfect_forward
-      }
-      module as_rvalue_view             { private header "__ranges/as_rvalue_view.h" }
-      module common_view                { private header "__ranges/common_view.h" }
-      module concepts                   {
-        private header "__ranges/concepts.h"
-        export iterator.__iterator.concepts
-      }
-      module container_compatible_range { private header "__ranges/container_compatible_range.h" }
-      module counted                    {
-        private header "__ranges/counted.h"
-        export span
-      }
-      module dangling                   { private header "__ranges/dangling.h" }
-      module data                       { private header "__ranges/data.h" }
-      module drop_view                  { private header "__ranges/drop_view.h" }
-      module drop_while_view            { private header "__ranges/drop_while_view.h" }
-      module elements_view              { private header "__ranges/elements_view.h" }
-      module empty                      { private header "__ranges/empty.h" }
-      module empty_view                 { private header "__ranges/empty_view.h" }
-      module enable_borrowed_range      { private header "__ranges/enable_borrowed_range.h" }
-      module enable_view                { private header "__ranges/enable_view.h" }
-      module filter_view                { private header "__ranges/filter_view.h" }
-      module from_range                 { private header "__ranges/from_range.h" }
-      module iota_view                  { private header "__ranges/iota_view.h" }
-      module istream_view               {
-        @requires_LIBCXX_ENABLE_LOCALIZATION@
-        private header "__ranges/istream_view.h"
-      }
-      module join_view                  { private header "__ranges/join_view.h" }
-      module lazy_split_view            { private header "__ranges/lazy_split_view.h" }
-      module movable_box                { private header "__ranges/movable_box.h" }
-      module non_propagating_cache      { private header "__ranges/non_propagating_cache.h" }
-      module owning_view                { private header "__ranges/owning_view.h" }
-      module range_adaptor              { private header "__ranges/range_adaptor.h" }
-      module rbegin                     { private header "__ranges/rbegin.h" }
-      module ref_view                   { private header "__ranges/ref_view.h" }
-      module rend                       { private header "__ranges/rend.h" }
-      module reverse_view               { private header "__ranges/reverse_view.h" }
-      module single_view                { private header "__ranges/single_view.h" }
-      module size                       {
-        private header "__ranges/size.h"
-        export type_traits.make_unsigned
-      }
-      module split_view                 { private header "__ranges/split_view.h" }
-      module subrange                   {
-        private header "__ranges/subrange.h"
-        export subrange_fwd
-      }
-      module subrange_fwd               {
-        private header "__fwd/subrange.h"
-        export iterator.__iterator.concepts
-      }
-      module take_view                  { private header "__ranges/take_view.h" }
-      module take_while_view            { private header "__ranges/take_while_view.h" }
-      module transform_view             {
-        private header "__ranges/transform_view.h"
-        export functional.__functional.bind_back
-        export functional.__functional.perfect_forward
-      }
-      module view_interface             { private header "__ranges/view_interface.h" }
-      module views                      { private header "__ranges/views.h" }
-      module zip_view                   { private header "__ranges/zip_view.h" }
-    }
-  }
-  module ratio {
-    header "ratio"
-    export *
-  }
-  module regex {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "regex"
-    export *
-  }
-  module scoped_allocator {
-    header "scoped_allocator"
-    export *
-  }
-  module semaphore {
-    @requires_LIBCXX_ENABLE_THREADS@
-    header "semaphore"
-    export *
-  }
-  module set {
-    header "set"
-    export *
-  }
-  module shared_mutex {
-    @requires_LIBCXX_ENABLE_THREADS@
-    header "shared_mutex"
-    export version
-  }
-  module source_location {
-    header "source_location"
-    export *
-  }
-  module span {
-    header "span"
-    export ranges.__ranges.enable_borrowed_range
-    export version
-    module span_fwd { private header "__fwd/span.h" }
-  }
-  module sstream {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "sstream"
-    // FIXME: should re-export istream, ostream, ios, streambuf, string?
-    export *
-  }
-  module stack {
-    header "stack"
-    export *
-  }
-  module stdexcept {
-    header "stdexcept"
-    export *
-  }
-  module stop_token {
-    @requires_LIBCXX_ENABLE_THREADS@
-    header "stop_token"
-    export *
-    module __stop_token {
-      module atomic_unique_lock   { private header "__stop_token/atomic_unique_lock.h" }
-      module intrusive_list_view  { private header "__stop_token/intrusive_list_view.h" }
-      module intrusive_shared_ptr { private header "__stop_token/intrusive_shared_ptr.h" }
-      module stop_callback        { private header "__stop_token/stop_callback.h" }
-      module stop_source          { private header "__stop_token/stop_source.h" }
-      module stop_state           { private header "__stop_token/stop_state.h" }
-      module stop_token           { private header "__stop_token/stop_token.h" }
-    }
-  }
-  module streambuf {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "streambuf"
-    export *
-  }
-  module string {
-    header "string"
-    module __string {
-      module char_traits           { private header "__string/char_traits.h" }
-      module constexpr_c_functions {
-        private header "__string/constexpr_c_functions.h"
-        export type_traits.is_equality_comparable
-      }
-      module extern_template_lists { private header "__string/extern_template_lists.h" }
-      module string_fwd            { private header "__fwd/string.h" }
-    }
-    export *
-  }
-  module string_view {
-    header "string_view"
-    export *
-    module string_view_fwd { private header "__fwd/string_view.h" }
-  }
-  module strstream {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    header "strstream"
-    export *
-  }
-  module system_error {
-    header "system_error"
-    export *
-    module __system_error {
-      module errc           { private header "__system_error/errc.h" }
-      module error_category { private header "__system_error/error_category.h" }
-      module error_code {
-        private header "__system_error/error_code.h"
-        export functional.__functional.hash
-        export functional.__functional.unary_function
-      }
-      module error_condition {
-        private header "__system_error/error_condition.h"
-        export functional.__functional.hash
-        export functional.__functional.unary_function
-      }
-      module system_error { private header "__system_error/system_error.h" }
+module std_private_numeric_accumulate               [system] { header "__numeric/accumulate.h" }
+module std_private_numeric_adjacent_difference      [system] { header "__numeric/adjacent_difference.h" }
+module std_private_numeric_exclusive_scan           [system] { header "__numeric/exclusive_scan.h" }
+module std_private_numeric_gcd_lcm                  [system] { header "__numeric/gcd_lcm.h" }
+module std_private_numeric_inclusive_scan           [system] { header "__numeric/inclusive_scan.h" }
+module std_private_numeric_inner_product            [system] { header "__numeric/inner_product.h" }
+module std_private_numeric_iota                     [system] { header "__numeric/iota.h" }
+module std_private_numeric_midpoint                 [system] { header "__numeric/midpoint.h" }
+module std_private_numeric_partial_sum              [system] { header "__numeric/partial_sum.h" }
+module std_private_numeric_pstl_reduce              [system] { header "__numeric/pstl_reduce.h" }
+module std_private_numeric_pstl_transform_reduce    [system] {
+  header "__numeric/pstl_transform_reduce.h"
+  export *
+}
+module std_private_numeric_reduce                   [system] { header "__numeric/reduce.h" }
+module std_private_numeric_transform_exclusive_scan [system] { header "__numeric/transform_exclusive_scan.h" }
+module std_private_numeric_transform_inclusive_scan [system] { header "__numeric/transform_inclusive_scan.h" }
+module std_private_numeric_transform_reduce         [system] { header "__numeric/transform_reduce.h" }
 
-    }
-  }
-  module thread {
-    @requires_LIBCXX_ENABLE_THREADS@
-    header "thread"
-    export *
+module std_private_random_bernoulli_distribution          [system] { header "__random/bernoulli_distribution.h" }
+module std_private_random_binomial_distribution           [system] { header "__random/binomial_distribution.h" }
+module std_private_random_cauchy_distribution             [system] { header "__random/cauchy_distribution.h" }
+module std_private_random_chi_squared_distribution        [system] { header "__random/chi_squared_distribution.h" }
+module std_private_random_clamp_to_integral               [system] { header "__random/clamp_to_integral.h" }
+module std_private_random_default_random_engine           [system] { header "__random/default_random_engine.h" }
+module std_private_random_discard_block_engine            [system] { header "__random/discard_block_engine.h" }
+module std_private_random_discrete_distribution           [system] {
+  header "__random/discrete_distribution.h"
+  export *
+}
+module std_private_random_exponential_distribution        [system] { header "__random/exponential_distribution.h" }
+module std_private_random_extreme_value_distribution      [system] { header "__random/extreme_value_distribution.h" }
+module std_private_random_fisher_f_distribution           [system] { header "__random/fisher_f_distribution.h" }
+module std_private_random_gamma_distribution              [system] { header "__random/gamma_distribution.h" }
+module std_private_random_generate_canonical              [system] { header "__random/generate_canonical.h" }
+module std_private_random_geometric_distribution          [system] { header "__random/geometric_distribution.h" }
+module std_private_random_independent_bits_engine         [system] { header "__random/independent_bits_engine.h" }
+module std_private_random_is_seed_sequence                [system] { header "__random/is_seed_sequence.h" }
+module std_private_random_is_valid                        [system] { header "__random/is_valid.h" }
+module std_private_random_knuth_b                         [system] { header "__random/knuth_b.h" }
+module std_private_random_linear_congruential_engine      [system] { header "__random/linear_congruential_engine.h" }
+module std_private_random_log2                            [system] { header "__random/log2.h" }
+module std_private_random_lognormal_distribution          [system] { header "__random/lognormal_distribution.h" }
+module std_private_random_mersenne_twister_engine         [system] { header "__random/mersenne_twister_engine.h" }
+module std_private_random_negative_binomial_distribution  [system] { header "__random/negative_binomial_distribution.h" }
+module std_private_random_normal_distribution             [system] { header "__random/normal_distribution.h" }
+module std_private_random_piecewise_constant_distribution [system] {
+  header "__random/piecewise_constant_distribution.h"
+  export *
+}
+module std_private_random_piecewise_linear_distribution   [system] {
+  header "__random/piecewise_linear_distribution.h"
+  export *
+}
+module std_private_random_poisson_distribution            [system] { header "__random/poisson_distribution.h" }
+module std_private_random_random_device                   [system] { header "__random/random_device.h" }
+module std_private_random_ranlux                          [system] { header "__random/ranlux.h" }
+module std_private_random_seed_seq                        [system] { header "__random/seed_seq.h" }
+module std_private_random_shuffle_order_engine            [system] { header "__random/shuffle_order_engine.h" }
+module std_private_random_student_t_distribution          [system] { header "__random/student_t_distribution.h" }
+module std_private_random_subtract_with_carry_engine      [system] { header "__random/subtract_with_carry_engine.h" }
+module std_private_random_uniform_int_distribution        [system] { header "__random/uniform_int_distribution.h" }
+module std_private_random_uniform_random_bit_generator    [system] { header "__random/uniform_random_bit_generator.h" }
+module std_private_random_uniform_real_distribution       [system] { header "__random/uniform_real_distribution.h" }
+module std_private_random_weibull_distribution            [system] { header "__random/weibull_distribution.h" }
 
-    module __thread {
-      module formatter            { private header "__thread/formatter.h" }
-      module id                   { private header "__thread/id.h" }
-      module poll_with_backoff    { private header "__thread/poll_with_backoff.h" }
-      module this_thread          { private header "__thread/this_thread.h" }
-      module thread               { private header "__thread/thread.h" }
-      module timed_backoff_policy { private header "__thread/timed_backoff_policy.h" }
-    }
-  }
-  module tuple {
-    header "tuple"
-    export *
+module std_private_ranges_access                     [system] { header "__ranges/access.h" }
+module std_private_ranges_all                        [system] {
+  header "__ranges/all.h"
+  export std_private_functional_compose
+  export std_private_functional_perfect_forward
+  export std_private_ranges_owning_view
+}
+module std_private_ranges_as_rvalue_view             [system] { header "__ranges/as_rvalue_view.h" }
+module std_private_ranges_common_view                [system] { header "__ranges/common_view.h" }
+module std_private_ranges_concepts                   [system] {
+  header "__ranges/concepts.h"
+  export std_private_iterator_concepts
+}
+module std_private_ranges_container_compatible_range [system] { header "__ranges/container_compatible_range.h" }
+module std_private_ranges_counted                    [system] {
+  header "__ranges/counted.h"
+  export std_span
+}
+module std_private_ranges_dangling                   [system] { header "__ranges/dangling.h" }
+module std_private_ranges_data                       [system] { header "__ranges/data.h" }
+module std_private_ranges_drop_view                  [system] { header "__ranges/drop_view.h" }
+module std_private_ranges_drop_while_view            [system] { header "__ranges/drop_while_view.h" }
+module std_private_ranges_elements_view              [system] { header "__ranges/elements_view.h" }
+module std_private_ranges_empty                      [system] { header "__ranges/empty.h" }
+module std_private_ranges_empty_view                 [system] { header "__ranges/empty_view.h" }
+module std_private_ranges_enable_borrowed_range      [system] { header "__ranges/enable_borrowed_range.h" }
+module std_private_ranges_enable_view                [system] { header "__ranges/enable_view.h" }
+module std_private_ranges_filter_view                [system] {
+  header "__ranges/filter_view.h"
+  export std_private_ranges_range_adaptor
+}
+module std_private_ranges_from_range                 [system] { header "__ranges/from_range.h" }
+module std_private_ranges_iota_view                  [system] { header "__ranges/iota_view.h" }
+module std_private_ranges_istream_view               [system] {
+  @requires_LIBCXX_ENABLE_LOCALIZATION@
+  header "__ranges/istream_view.h"
+}
+module std_private_ranges_join_view                  [system] {
+  header "__ranges/join_view.h"
+  export std_private_iterator_iterator_with_data
+  export std_private_iterator_segmented_iterator
+}
+module std_private_ranges_lazy_split_view            [system] {
+  header "__ranges/lazy_split_view.h"
+  export std_private_ranges_non_propagating_cache
+}
+module std_private_ranges_movable_box                [system] { header "__ranges/movable_box.h" }
+module std_private_ranges_non_propagating_cache      [system] { header "__ranges/non_propagating_cache.h" }
+module std_private_ranges_owning_view                [system] { header "__ranges/owning_view.h" }
+module std_private_ranges_range_adaptor              [system] { header "__ranges/range_adaptor.h" }
+module std_private_ranges_rbegin                     [system] { header "__ranges/rbegin.h" }
+module std_private_ranges_ref_view                   [system] { header "__ranges/ref_view.h" }
+module std_private_ranges_rend                       [system] { header "__ranges/rend.h" }
+module std_private_ranges_reverse_view               [system] { header "__ranges/reverse_view.h" }
+module std_private_ranges_single_view                [system] { header "__ranges/single_view.h" }
+module std_private_ranges_size                       [system] {
+  header "__ranges/size.h"
+  export std_private_type_traits_make_unsigned
+}
+module std_private_ranges_split_view                 [system] { header "__ranges/split_view.h" }
+module std_private_ranges_subrange                   [system] {
+  header "__ranges/subrange.h"
+  export std_private_ranges_subrange_fwd
+}
+module std_private_ranges_subrange_fwd               [system] {
+  header "__fwd/subrange.h"
+  export std_private_iterator_concepts
+}
+module std_private_ranges_take_view                  [system] { header "__ranges/take_view.h" }
+module std_private_ranges_take_while_view            [system] { header "__ranges/take_while_view.h" }
+module std_private_ranges_transform_view             [system] {
+  header "__ranges/transform_view.h"
+  export std_private_functional_bind_back
+  export std_private_functional_perfect_forward
+  export std_private_ranges_movable_box
+}
+module std_private_ranges_view_interface             [system] { header "__ranges/view_interface.h" }
+module std_private_ranges_views                      [system] { header "__ranges/views.h" }
+module std_private_ranges_zip_view                   [system] { header "__ranges/zip_view.h" }
 
-    module get_fwd          { private header "__fwd/get.h" }
-    module make_tuple_types { private header "__tuple/make_tuple_types.h" }
-    module pair_like        { private header "__tuple/pair_like.h" }
-    module sfinae_helpers   { private header "__tuple/sfinae_helpers.h" }
-    module tuple_element    { private header "__tuple/tuple_element.h" }
-    module tuple_fwd        { private header "__fwd/tuple.h" }
-    module tuple_indices    { private header "__tuple/tuple_indices.h" }
-    module tuple_like       { private header "__tuple/tuple_like.h" }
-    module tuple_like_ext   { private header "__tuple/tuple_like_ext.h" }
-    module tuple_size       { private header "__tuple/tuple_size.h" }
-    module tuple_types      { private header "__tuple/tuple_types.h" }
-  }
-  module type_traits {
-    header "type_traits"
-    export *
+module std_private_span_span_fwd [system] { header "__fwd/span.h" }
 
-    module add_const                                 { private header "__type_traits/add_const.h" }
-    module add_cv                                    { private header "__type_traits/add_cv.h" }
-    module add_lvalue_reference                      {
-      private header "__type_traits/add_lvalue_reference.h"
-      export is_referenceable
-    }
-    module add_pointer                               { private header "__type_traits/add_pointer.h" }
-    module add_rvalue_reference                      { private header "__type_traits/add_rvalue_reference.h" }
-    module add_volatile                              { private header "__type_traits/add_volatile.h" }
-    module aligned_storage                           { private header "__type_traits/aligned_storage.h" }
-    module aligned_union                             { private header "__type_traits/aligned_union.h" }
-    module alignment_of                              { private header "__type_traits/alignment_of.h" }
-    module apply_cv                                  {
-      private header "__type_traits/apply_cv.h"
-      export is_const
-      export is_volatile
-    }
-    module can_extract_key                           { private header "__type_traits/can_extract_key.h" }
-    module common_reference                          { private header "__type_traits/common_reference.h" }
-    module common_type                               {
-      private header "__type_traits/common_type.h"
-      export utility.__utility.declval
-    }
-    module conditional                               { private header "__type_traits/conditional.h" }
-    module conjunction                               { private header "__type_traits/conjunction.h" }
-    module copy_cv                                   { private header "__type_traits/copy_cv.h" }
-    module copy_cvref                                { private header "__type_traits/copy_cvref.h" }
-    module datasizeof                                { private header "__type_traits/datasizeof.h" }
-    module decay                                     {
-      private header "__type_traits/decay.h"
-      export add_pointer
-    }
-    module dependent_type                            { private header "__type_traits/dependent_type.h" }
-    module disjunction                               { private header "__type_traits/disjunction.h" }
-    module enable_if                                 { private header "__type_traits/enable_if.h" }
-    module extent                                    { private header "__type_traits/extent.h" }
-    module has_unique_object_representation          { private header "__type_traits/has_unique_object_representation.h" }
-    module has_virtual_destructor                    { private header "__type_traits/has_virtual_destructor.h" }
-    module integral_constant                         { private header "__type_traits/integral_constant.h" }
-    module invoke                                    {
-      private header "__type_traits/invoke.h"
-      export conditional
-      export decay
-      export is_base_of
-      export is_core_convertible
-      export is_reference_wrapper
-      export is_void
-      export remove_cv
-    }
-    module is_abstract                               { private header "__type_traits/is_abstract.h" }
-    module is_aggregate                              { private header "__type_traits/is_aggregate.h" }
-    module is_allocator                              { private header "__type_traits/is_allocator.h" }
-    module is_always_bitcastable                     { private header "__type_traits/is_always_bitcastable.h" }
-    module is_arithmetic {
-      private header "__type_traits/is_arithmetic.h"
-      export integral_constant
-    }
-    module is_array                                  {
-      private header "__type_traits/is_array.h"
-      export integral_constant
-    }
-    module is_assignable                             { private header "__type_traits/is_assignable.h" }
-    module is_base_of                                { private header "__type_traits/is_base_of.h" }
-    module is_bounded_array                          { private header "__type_traits/is_bounded_array.h" }
-    module is_callable                               { private header "__type_traits/is_callable.h" }
-    module is_char_like_type                         { private header "__type_traits/is_char_like_type.h" }
-    module is_class                                  { private header "__type_traits/is_class.h" }
-    module is_compound                               { private header "__type_traits/is_compound.h" }
-    module is_const                                  { private header "__type_traits/is_const.h" }
-    module is_constant_evaluated                     { private header "__type_traits/is_constant_evaluated.h" }
-    module is_constructible                          { private header "__type_traits/is_constructible.h" }
-    module is_convertible                            {
-      private header "__type_traits/is_convertible.h"
-      export is_array
-    }
-    module is_copy_assignable                        { private header "__type_traits/is_copy_assignable.h" }
-    module is_copy_constructible                     { private header "__type_traits/is_copy_constructible.h" }
-    module is_core_convertible                       {
-      private header "__type_traits/is_core_convertible.h"
-      export integral_constant
-    }
-    module is_default_constructible                  { private header "__type_traits/is_default_constructible.h" }
-    module is_destructible                           { private header "__type_traits/is_destructible.h" }
-    module is_empty                                  { private header "__type_traits/is_empty.h" }
-    module is_enum                                   {
-      private header "__type_traits/is_enum.h"
-      export integral_constant
-    }
-    module is_equality_comparable                    {
-      private header "__type_traits/is_equality_comparable.h"
-      export integral_constant
-    }
-    module is_execution_policy                       {
-      private header "__type_traits/is_execution_policy.h"
-      export type_traits.remove_cvref
-    }
-    module is_final                                  { private header "__type_traits/is_final.h" }
-    module is_floating_point                         { private header "__type_traits/is_floating_point.h" }
-    module is_function                               { private header "__type_traits/is_function.h" }
-    module is_fundamental                            { private header "__type_traits/is_fundamental.h" }
-    module is_implicitly_default_constructible       { private header "__type_traits/is_implicitly_default_constructible.h" }
-    module is_integral                               { private header "__type_traits/is_integral.h" }
-    module is_literal_type                           { private header "__type_traits/is_literal_type.h" }
-    module is_member_function_pointer                { private header "__type_traits/is_member_function_pointer.h" }
-    module is_member_object_pointer                  { private header "__type_traits/is_member_object_pointer.h" }
-    module is_member_pointer                         { private header "__type_traits/is_member_pointer.h" }
-    module is_move_assignable                        { private header "__type_traits/is_move_assignable.h" }
-    module is_move_constructible                     { private header "__type_traits/is_move_constructible.h" }
-    module is_nothrow_assignable                     { private header "__type_traits/is_nothrow_assignable.h" }
-    module is_nothrow_constructible                  { private header "__type_traits/is_nothrow_constructible.h" }
-    module is_nothrow_convertible                    { private header "__type_traits/is_nothrow_convertible.h" }
-    module is_nothrow_copy_assignable                { private header "__type_traits/is_nothrow_copy_assignable.h" }
-    module is_nothrow_copy_constructible             { private header "__type_traits/is_nothrow_copy_constructible.h" }
-    module is_nothrow_default_constructible          { private header "__type_traits/is_nothrow_default_constructible.h" }
-    module is_nothrow_destructible                   {
-      private header "__type_traits/is_nothrow_destructible.h"
-      export type_traits.is_destructible
-    }
-    module is_nothrow_move_assignable                { private header "__type_traits/is_nothrow_move_assignable.h" }
-    module is_nothrow_move_constructible             {
-      private header "__type_traits/is_nothrow_move_constructible.h"
-      export type_traits.is_nothrow_constructible
-    }
-    module is_null_pointer                           {
-      private header "__type_traits/is_null_pointer.h"
-      export compat.cstddef
-    }
-    module is_object                                 {
-      private header "__type_traits/is_object.h"
-      export type_traits.is_scalar
-    }
-    module is_pod                                    { private header "__type_traits/is_pod.h" }
-    module is_pointer                                { private header "__type_traits/is_pointer.h" }
-    module is_polymorphic                            { private header "__type_traits/is_polymorphic.h" }
-    module is_primary_template                       {
-      private header "__type_traits/is_primary_template.h"
-      export type_traits.enable_if
-    }
-    module is_reference                              { private header "__type_traits/is_reference.h" }
-    module is_reference_wrapper                      { private header "__type_traits/is_reference_wrapper.h" }
-    module is_referenceable                          { private header "__type_traits/is_referenceable.h" }
-    module is_same                                   {
-      private header "__type_traits/is_same.h"
-      export type_traits.integral_constant
-    }
-    module is_scalar                                 {
-      private header "__type_traits/is_scalar.h"
-      export type_traits.is_null_pointer
-    }
-    module is_scoped_enum                            { private header "__type_traits/is_scoped_enum.h" }
-    module is_signed                                 { private header "__type_traits/is_signed.h" }
-    module is_signed_integer                         { private header "__type_traits/is_signed_integer.h" }
-    module is_specialization                         { private header "__type_traits/is_specialization.h" }
-    module is_standard_layout                        { private header "__type_traits/is_standard_layout.h" }
-    module is_swappable                              {
-      private header "__type_traits/is_swappable.h"
-      export type_traits.is_move_constructible
-    }
-    module is_trivial                                { private header "__type_traits/is_trivial.h" }
-    module is_trivially_assignable                   { private header "__type_traits/is_trivially_assignable.h" }
-    module is_trivially_constructible                { private header "__type_traits/is_trivially_constructible.h" }
-    module is_trivially_copy_assignable              { private header "__type_traits/is_trivially_copy_assignable.h" }
-    module is_trivially_copy_constructible           { private header "__type_traits/is_trivially_copy_constructible.h" }
-    module is_trivially_copyable                     { private header "__type_traits/is_trivially_copyable.h" }
-    module is_trivially_default_constructible        { private header "__type_traits/is_trivially_default_constructible.h" }
-    module is_trivially_destructible                 { private header "__type_traits/is_trivially_destructible.h" }
-    module is_trivially_lexicographically_comparable { private header "__type_traits/is_trivially_lexicographically_comparable.h" }
-    module is_trivially_move_assignable              { private header "__type_traits/is_trivially_move_assignable.h" }
-    module is_trivially_move_constructible           { private header "__type_traits/is_trivially_move_constructible.h" }
-    module is_unbounded_array                        { private header "__type_traits/is_unbounded_array.h" }
-    module is_union                                  { private header "__type_traits/is_union.h" }
-    module is_unsigned                               { private header "__type_traits/is_unsigned.h" }
-    module is_unsigned_integer                       { private header "__type_traits/is_unsigned_integer.h" }
-    module is_valid_expansion                        { private header "__type_traits/is_valid_expansion.h" }
-    module is_void                                   {
-      private header "__type_traits/is_void.h"
-      export integral_constant
-    }
-    module is_volatile                               { private header "__type_traits/is_volatile.h" }
-    module lazy                                      { private header "__type_traits/lazy.h" }
-    module make_32_64_or_128_bit                     { private header "__type_traits/make_32_64_or_128_bit.h" }
-    module make_const_lvalue_ref                     { private header "__type_traits/make_const_lvalue_ref.h" }
-    module make_signed                               { private header "__type_traits/make_signed.h" }
-    module make_unsigned                             {
-      private header "__type_traits/make_unsigned.h"
-      export type_traits.is_unsigned
-    }
-    module maybe_const                               { private header "__type_traits/maybe_const.h" }
-    module nat                                       { private header "__type_traits/nat.h" }
-    module negation                                  { private header "__type_traits/negation.h" }
-    module noexcept_move_assign_container            { private header "__type_traits/noexcept_move_assign_container.h" }
-    module operation_traits                          { private header "__type_traits/operation_traits.h" }
-    module predicate_traits                          { private header "__type_traits/predicate_traits.h" }
-    module promote                                   { private header "__type_traits/promote.h" }
-    module rank                                      { private header "__type_traits/rank.h" }
-    module remove_all_extents                        { private header "__type_traits/remove_all_extents.h" }
-    module remove_const                              { private header "__type_traits/remove_const.h" }
-    module remove_const_ref                          { private header "__type_traits/remove_const_ref.h" }
-    module remove_cv                                 {
-      private header "__type_traits/remove_cv.h"
-      export type_traits.remove_const
-      export type_traits.remove_volatile
-    }
-    module remove_cvref                              { private header "__type_traits/remove_cvref.h" }
-    module remove_extent                             { private header "__type_traits/remove_extent.h" }
-    module remove_pointer                            { private header "__type_traits/remove_pointer.h" }
-    module remove_reference                          { private header "__type_traits/remove_reference.h" }
-    module remove_volatile                           { private header "__type_traits/remove_volatile.h" }
-    module result_of                                 { private header "__type_traits/result_of.h" }
-    module strip_signature                           { private header "__type_traits/strip_signature.h" }
-    module type_identity                             { private header "__type_traits/type_identity.h" }
-    module type_list                                 { private header "__type_traits/type_list.h" }
-    module underlying_type                           {
-      private header "__type_traits/underlying_type.h"
-      export type_traits.is_enum
-    }
-    module unwrap_ref                                { private header "__type_traits/unwrap_ref.h" }
-    module void_t                                    { private header "__type_traits/void_t.h" }
-  }
-  module typeindex {
-    header "typeindex"
-    export *
-  }
-  module typeinfo {
-    header "typeinfo"
-    export *
-  }
-  module unordered_map {
-    header "unordered_map"
-    export *
-  }
-  module unordered_set {
-    header "unordered_set"
-    export *
-  }
-  module utility {
-    header "utility"
-    export *
+module std_private_stop_token_atomic_unique_lock   [system] { header "__stop_token/atomic_unique_lock.h" }
+module std_private_stop_token_intrusive_list_view  [system] { header "__stop_token/intrusive_list_view.h" }
+module std_private_stop_token_intrusive_shared_ptr [system] { header "__stop_token/intrusive_shared_ptr.h" }
+module std_private_stop_token_stop_callback        [system] { header "__stop_token/stop_callback.h" }
+module std_private_stop_token_stop_source          [system] {
+  header "__stop_token/stop_source.h"
+  export *
+}
+module std_private_stop_token_stop_state           [system] {
+  header "__stop_token/stop_state.h"
+  export *
+}
+module std_private_stop_token_stop_token           [system] {
+  header "__stop_token/stop_token.h"
+  export *
+}
 
-    module __utility {
-      module as_const               { private header "__utility/as_const.h" }
-      module auto_cast              {
-        private header "__utility/auto_cast.h"
-        export type_traits.decay
-      }
-      module cmp                    {
-        private header "__utility/cmp.h"
-        export type_traits.make_unsigned
-      }
-      module convert_to_integral    { private header "__utility/convert_to_integral.h" }
-      module declval                { private header "__utility/declval.h" }
-      module exception_guard        { private header "__utility/exception_guard.h" }
-      module exchange               { private header "__utility/exchange.h" }
-      module forward                { private header "__utility/forward.h" }
-      module forward_like           { private header "__utility/forward_like.h" }
-      module in_place               { private header "__utility/in_place.h" }
-      module integer_sequence       { private header "__utility/integer_sequence.h" }
-      module is_pointer_in_range    { private header "__utility/is_pointer_in_range.h" }
-      module move                   {
-        private header "__utility/move.h"
-        export type_traits.is_copy_constructible
-        export type_traits.is_nothrow_move_constructible
-        export type_traits.remove_reference
-      }
-      module pair                   {
-        private header "__utility/pair.h"
-        export ranges.__ranges.subrange_fwd
-        export type_traits.is_assignable
-        export type_traits.is_constructible
-        export type_traits.is_convertible
-        export type_traits.is_copy_assignable
-        export type_traits.is_move_assignable
-        export type_traits.is_nothrow_copy_constructible
-        export type_traits.is_nothrow_default_constructible
-        export type_traits.is_nothrow_move_assignable
-      }
-      module pair_fwd               { private header "__fwd/pair.h" }
-      module piecewise_construct    { private header "__utility/piecewise_construct.h" }
-      module priority_tag           { private header "__utility/priority_tag.h" }
-      module rel_ops                { private header "__utility/rel_ops.h" }
-      module swap                   {
-        private header "__utility/swap.h"
-        export type_traits.is_swappable
-      }
-      module terminate_on_exception { private header "__utility/terminate_on_exception.h" }
-      module to_underlying          { private header "__utility/to_underlying.h" }
-      module unreachable            { private header "__utility/unreachable.h" }
-    }
-  }
-  module valarray {
-    header "valarray"
-    export *
-  }
-  module variant {
-    header "variant"
-    export *
+module std_private_string_char_traits           [system] { header "__string/char_traits.h" }
+module std_private_string_constexpr_c_functions [system] {
+  header "__string/constexpr_c_functions.h"
+  export std_private_type_traits_is_equality_comparable
+}
+module std_private_string_extern_template_lists [system] { header "__string/extern_template_lists.h" }
+module std_private_string_string_fwd            [system] { header "__fwd/string.h" }
 
-    module __variant {
-      module monostate { private header "__variant/monostate.h" }
-    }
-  }
-  module vector {
-    header "vector"
-    export *
-  }
-  module version {
-    header "version"
-    export *
-  }
+module std_private_string_view_string_view_fwd [system] { header "__fwd/string_view.h" }
 
-  // FIXME: These should be private.
-  module __assert            {         header "__assert"            export * }
-  module __availability      { private header "__availability"      export * }
-  module __bit_reference     { private header "__bit_reference"     export * }
-  module __hash_table        {         header "__hash_table"        export * }
-  module __locale            {
-    @requires_LIBCXX_ENABLE_LOCALIZATION@
-    private header "__locale" export *
-  }
-  module __mbstate_t         { private header "__mbstate_t.h"       export * }
-  module __node_handle       { private header "__node_handle"       export * }
-  module __split_buffer      { private header "__split_buffer"      export * }
-  module __std_mbstate_t     { private header "__std_mbstate_t.h"   export * }
-  module __threading_support {         header "__threading_support" export * }
-  module __tree              {         header "__tree"              export * }
-  module __undef_macros      { textual header "__undef_macros"      export * }
-  module __verbose_abort     {         header "__verbose_abort"     export * }
+module std_private_system_error_errc            [system] { header "__system_error/errc.h" }
+module std_private_system_error_error_category  [system] { header "__system_error/error_category.h" }
+module std_private_system_error_error_code      [system] {
+  header "__system_error/error_code.h"
+  export std_private_functional_hash
+  export std_private_functional_unary_function
+}
+module std_private_system_error_error_condition [system] {
+  header "__system_error/error_condition.h"
+  export std_private_functional_hash
+  export std_private_functional_unary_function
+}
+module std_private_system_error_system_error    [system] { header "__system_error/system_error.h" }
 
-  // This one needs to appear after __tree to work around issues with modules in Objective-C++ mode.
-  module coroutine {
-    header "coroutine"
-    export *
+module std_private_thread_formatter            [system] { header "__thread/formatter.h" }
+module std_private_thread_id                   [system] { header "__thread/id.h" }
+module std_private_thread_poll_with_backoff    [system] { header "__thread/poll_with_backoff.h" }
+module std_private_thread_this_thread          [system] { header "__thread/this_thread.h" }
+module std_private_thread_thread               [system] {
+  header "__thread/thread.h"
+  export *
+}
+module std_private_thread_timed_backoff_policy [system] { header "__thread/timed_backoff_policy.h" }
 
-    module __coroutine {
-      module coroutine_handle           { private header "__coroutine/coroutine_handle.h" }
-      module coroutine_traits           { private header "__coroutine/coroutine_traits.h" }
-      module noop_coroutine_handle      { private header "__coroutine/noop_coroutine_handle.h" }
-      module trivial_awaitables         { private header "__coroutine/trivial_awaitables.h" }
-    }
-  }
+module std_private_tuple_get_fwd          [system] { header "__fwd/get.h" }
+module std_private_tuple_make_tuple_types [system] { header "__tuple/make_tuple_types.h" }
+module std_private_tuple_pair_like        [system] {
+  header "__tuple/pair_like.h"
+  export std_private_tuple_tuple_like
+}
+module std_private_tuple_sfinae_helpers   [system] { header "__tuple/sfinae_helpers.h" }
+module std_private_tuple_tuple_element    [system] { header "__tuple/tuple_element.h" }
+module std_private_tuple_tuple_fwd        [system] { header "__fwd/tuple.h" }
+module std_private_tuple_tuple_indices    [system] { header "__tuple/tuple_indices.h" }
+module std_private_tuple_tuple_like       [system] { header "__tuple/tuple_like.h" }
+module std_private_tuple_tuple_like_ext   [system] { header "__tuple/tuple_like_ext.h" }
+module std_private_tuple_tuple_size       [system] { header "__tuple/tuple_size.h" }
+module std_private_tuple_tuple_types      [system] { header "__tuple/tuple_types.h" }
 
-  module experimental {
-    requires cplusplus11
+module std_private_type_traits_add_const                                 [system] { header "__type_traits/add_const.h" }
+module std_private_type_traits_add_cv                                    [system] { header "__type_traits/add_cv.h" }
+module std_private_type_traits_add_lvalue_reference                      [system] {
+  header "__type_traits/add_lvalue_reference.h"
+  export std_private_type_traits_is_referenceable
+}
+module std_private_type_traits_add_pointer                               [system] { header "__type_traits/add_pointer.h" }
+module std_private_type_traits_add_rvalue_reference                      [system] { header "__type_traits/add_rvalue_reference.h" }
+module std_private_type_traits_add_volatile                              [system] { header "__type_traits/add_volatile.h" }
+module std_private_type_traits_aligned_storage                           [system] { header "__type_traits/aligned_storage.h" }
+module std_private_type_traits_aligned_union                             [system] { header "__type_traits/aligned_union.h" }
+module std_private_type_traits_alignment_of                              [system] { header "__type_traits/alignment_of.h" }
+module std_private_type_traits_apply_cv                                  [system] {
+  header "__type_traits/apply_cv.h"
+  export std_private_type_traits_is_const
+  export std_private_type_traits_is_volatile
+}
+module std_private_type_traits_can_extract_key                           [system] { header "__type_traits/can_extract_key.h" }
+module std_private_type_traits_common_reference                          [system] {
+  header "__type_traits/common_reference.h"
+  export std_private_type_traits_remove_cvref
+}
+module std_private_type_traits_common_type                               [system] {
+  header "__type_traits/common_type.h"
+  export std_private_utility_declval
+}
+module std_private_type_traits_conditional                               [system] { header "__type_traits/conditional.h" }
+module std_private_type_traits_conjunction                               [system] { header "__type_traits/conjunction.h" }
+module std_private_type_traits_copy_cv                                   [system] { header "__type_traits/copy_cv.h" }
+module std_private_type_traits_copy_cvref                                [system] { header "__type_traits/copy_cvref.h" }
+module std_private_type_traits_datasizeof                                [system] { header "__type_traits/datasizeof.h" }
+module std_private_type_traits_decay                                     [system] {
+  header "__type_traits/decay.h"
+  export std_private_type_traits_add_pointer
+}
+module std_private_type_traits_dependent_type                            [system] { header "__type_traits/dependent_type.h" }
+module std_private_type_traits_disjunction                               [system] { header "__type_traits/disjunction.h" }
+module std_private_type_traits_enable_if                                 [system] { header "__type_traits/enable_if.h" }
+module std_private_type_traits_extent                                    [system] { header "__type_traits/extent.h" }
+module std_private_type_traits_has_unique_object_representation          [system] { header "__type_traits/has_unique_object_representation.h" }
+module std_private_type_traits_has_virtual_destructor                    [system] { header "__type_traits/has_virtual_destructor.h" }
+module std_private_type_traits_integral_constant                         [system] { header "__type_traits/integral_constant.h" }
+module std_private_type_traits_invoke                                    [system] {
+  header "__type_traits/invoke.h"
+  export std_private_type_traits_conditional
+  export std_private_type_traits_decay
+  export std_private_type_traits_decay
+  export std_private_type_traits_enable_if
+  export std_private_type_traits_is_base_of
+  export std_private_type_traits_is_core_convertible
+  export std_private_type_traits_is_reference_wrapper
+  export std_private_type_traits_is_same
+  export std_private_type_traits_is_void
+  export std_private_type_traits_nat
+  export std_private_type_traits_remove_cv
+}
+module std_private_type_traits_is_abstract                               [system] { header "__type_traits/is_abstract.h" }
+module std_private_type_traits_is_aggregate                              [system] { header "__type_traits/is_aggregate.h" }
+module std_private_type_traits_is_allocator                              [system] { header "__type_traits/is_allocator.h" }
+module std_private_type_traits_is_always_bitcastable                     [system] { header "__type_traits/is_always_bitcastable.h" }
+module std_private_type_traits_is_arithmetic                             [system] {
+  header "__type_traits/is_arithmetic.h"
+  export std_private_type_traits_integral_constant
+}
+module std_private_type_traits_is_array                                  [system] {
+  header "__type_traits/is_array.h"
+  export std_private_type_traits_integral_constant
+}
+module std_private_type_traits_is_assignable                             [system] { header "__type_traits/is_assignable.h" }
+module std_private_type_traits_is_base_of                                [system] { header "__type_traits/is_base_of.h" }
+module std_private_type_traits_is_bounded_array                          [system] { header "__type_traits/is_bounded_array.h" }
+module std_private_type_traits_is_callable                               [system] { header "__type_traits/is_callable.h" }
+module std_private_type_traits_is_char_like_type                         [system] { header "__type_traits/is_char_like_type.h" }
+module std_private_type_traits_is_class                                  [system] { header "__type_traits/is_class.h" }
+module std_private_type_traits_is_compound                               [system] { header "__type_traits/is_compound.h" }
+module std_private_type_traits_is_const                                  [system] { header "__type_traits/is_const.h" }
+module std_private_type_traits_is_constant_evaluated                     [system] { header "__type_traits/is_constant_evaluated.h" }
+module std_private_type_traits_is_constructible                          [system] { header "__type_traits/is_constructible.h" }
+module std_private_type_traits_is_convertible                            [system] {
+  header "__type_traits/is_convertible.h"
+  export std_private_type_traits_is_array
+}
+module std_private_type_traits_is_copy_assignable                        [system] { header "__type_traits/is_copy_assignable.h" }
+module std_private_type_traits_is_copy_constructible                     [system] { header "__type_traits/is_copy_constructible.h" }
+module std_private_type_traits_is_core_convertible                       [system] {
+  header "__type_traits/is_core_convertible.h"
+  export std_private_type_traits_integral_constant
+}
+module std_private_type_traits_is_default_constructible                  [system] { header "__type_traits/is_default_constructible.h" }
+module std_private_type_traits_is_destructible                           [system] { header "__type_traits/is_destructible.h" }
+module std_private_type_traits_is_empty                                  [system] { header "__type_traits/is_empty.h" }
+module std_private_type_traits_is_enum                                   [system] {
+  header "__type_traits/is_enum.h"
+  export std_private_type_traits_integral_constant
+}
+module std_private_type_traits_is_equality_comparable                    [system] {
+  header "__type_traits/is_equality_comparable.h"
+  export std_private_type_traits_integral_constant
+}
+module std_private_type_traits_is_execution_policy                       [system] {
+  header "__type_traits/is_execution_policy.h"
+  export std_private_type_traits_remove_cvref
+}
+module std_private_type_traits_is_final                                  [system] { header "__type_traits/is_final.h" }
+module std_private_type_traits_is_floating_point                         [system] { header "__type_traits/is_floating_point.h" }
+module std_private_type_traits_is_function                               [system] { header "__type_traits/is_function.h" }
+module std_private_type_traits_is_fundamental                            [system] { header "__type_traits/is_fundamental.h" }
+module std_private_type_traits_is_implicitly_default_constructible       [system] { header "__type_traits/is_implicitly_default_constructible.h" }
+module std_private_type_traits_is_integral                               [system] { header "__type_traits/is_integral.h" }
+module std_private_type_traits_is_literal_type                           [system] { header "__type_traits/is_literal_type.h" }
+module std_private_type_traits_is_member_function_pointer                [system] { header "__type_traits/is_member_function_pointer.h" }
+module std_private_type_traits_is_member_object_pointer                  [system] { header "__type_traits/is_member_object_pointer.h" }
+module std_private_type_traits_is_member_pointer                         [system] { header "__type_traits/is_member_pointer.h" }
+module std_private_type_traits_is_move_assignable                        [system] { header "__type_traits/is_move_assignable.h" }
+module std_private_type_traits_is_move_constructible                     [system] { header "__type_traits/is_move_constructible.h" }
+module std_private_type_traits_is_nothrow_assignable                     [system] { header "__type_traits/is_nothrow_assignable.h" }
+module std_private_type_traits_is_nothrow_constructible                  [system] { header "__type_traits/is_nothrow_constructible.h" }
+module std_private_type_traits_is_nothrow_convertible                    [system] { header "__type_traits/is_nothrow_convertible.h" }
+module std_private_type_traits_is_nothrow_copy_assignable                [system] { header "__type_traits/is_nothrow_copy_assignable.h" }
+module std_private_type_traits_is_nothrow_copy_constructible             [system] { header "__type_traits/is_nothrow_copy_constructible.h" }
+module std_private_type_traits_is_nothrow_default_constructible          [system] { header "__type_traits/is_nothrow_default_constructible.h" }
+module std_private_type_traits_is_nothrow_destructible                   [system] {
+  header "__type_traits/is_nothrow_destructible.h"
+  export std_private_type_traits_is_destructible
+}
+module std_private_type_traits_is_nothrow_move_assignable                [system] { header "__type_traits/is_nothrow_move_assignable.h" }
+module std_private_type_traits_is_nothrow_move_constructible             [system] {
+  header "__type_traits/is_nothrow_move_constructible.h"
+  export std_private_type_traits_is_nothrow_constructible
+}
+module std_private_type_traits_is_null_pointer                           [system] {
+  header "__type_traits/is_null_pointer.h"
+  export std_cstddef
+}
+module std_private_type_traits_is_object                                 [system] {
+  header "__type_traits/is_object.h"
+  export std_private_type_traits_is_scalar
+}
+module std_private_type_traits_is_pod                                    [system] { header "__type_traits/is_pod.h" }
+module std_private_type_traits_is_pointer                                [system] { header "__type_traits/is_pointer.h" }
+module std_private_type_traits_is_polymorphic                            [system] { header "__type_traits/is_polymorphic.h" }
+module std_private_type_traits_is_primary_template                       [system] {
+  header "__type_traits/is_primary_template.h"
+  export std_private_type_traits_enable_if
+}
+module std_private_type_traits_is_reference                              [system] { header "__type_traits/is_reference.h" }
+module std_private_type_traits_is_reference_wrapper                      [system] { header "__type_traits/is_reference_wrapper.h" }
+module std_private_type_traits_is_referenceable                          [system] { header "__type_traits/is_referenceable.h" }
+module std_private_type_traits_is_same                                   [system] {
+  header "__type_traits/is_same.h"
+  export std_private_type_traits_integral_constant
+}
+module std_private_type_traits_is_scalar                                 [system] {
+  header "__type_traits/is_scalar.h"
+  export std_private_type_traits_is_null_pointer
+}
+module std_private_type_traits_is_scoped_enum                            [system] { header "__type_traits/is_scoped_enum.h" }
+module std_private_type_traits_is_signed                                 [system] { header "__type_traits/is_signed.h" }
+module std_private_type_traits_is_signed_integer                         [system] { header "__type_traits/is_signed_integer.h" }
+module std_private_type_traits_is_specialization                         [system] { header "__type_traits/is_specialization.h" }
+module std_private_type_traits_is_standard_layout                        [system] { header "__type_traits/is_standard_layout.h" }
+module std_private_type_traits_is_swappable                              [system] {
+  header "__type_traits/is_swappable.h"
+  export std_private_type_traits_is_move_constructible
+}
+module std_private_type_traits_is_trivial                                [system] { header "__type_traits/is_trivial.h" }
+module std_private_type_traits_is_trivially_assignable                   [system] { header "__type_traits/is_trivially_assignable.h" }
+module std_private_type_traits_is_trivially_constructible                [system] { header "__type_traits/is_trivially_constructible.h" }
+module std_private_type_traits_is_trivially_copy_assignable              [system] { header "__type_traits/is_trivially_copy_assignable.h" }
+module std_private_type_traits_is_trivially_copy_constructible           [system] { header "__type_traits/is_trivially_copy_constructible.h" }
+module std_private_type_traits_is_trivially_copyable                     [system] { header "__type_traits/is_trivially_copyable.h" }
+module std_private_type_traits_is_trivially_default_constructible        [system] { header "__type_traits/is_trivially_default_constructible.h" }
+module std_private_type_traits_is_trivially_destructible                 [system] { header "__type_traits/is_trivially_destructible.h" }
+module std_private_type_traits_is_trivially_lexicographically_comparable [system] { header "__type_traits/is_trivially_lexicographically_comparable.h" }
+module std_private_type_traits_is_trivially_move_assignable              [system] { header "__type_traits/is_trivially_move_assignable.h" }
+module std_private_type_traits_is_trivially_move_constructible           [system] { header "__type_traits/is_trivially_move_constructible.h" }
+module std_private_type_traits_is_unbounded_array                        [system] { header "__type_traits/is_unbounded_array.h" }
+module std_private_type_traits_is_union                                  [system] { header "__type_traits/is_union.h" }
+module std_private_type_traits_is_unsigned                               [system] { header "__type_traits/is_unsigned.h" }
+module std_private_type_traits_is_unsigned_integer                       [system] { header "__type_traits/is_unsigned_integer.h" }
+module std_private_type_traits_is_valid_expansion                        [system] { header "__type_traits/is_valid_expansion.h" }
+module std_private_type_traits_is_void                                   [system] {
+  header "__type_traits/is_void.h"
+  export std_private_type_traits_integral_constant
+}
+module std_private_type_traits_is_volatile                               [system] { header "__type_traits/is_volatile.h" }
+module std_private_type_traits_lazy                                      [system] { header "__type_traits/lazy.h" }
+module std_private_type_traits_make_32_64_or_128_bit                     [system] { header "__type_traits/make_32_64_or_128_bit.h" }
+module std_private_type_traits_make_const_lvalue_ref                     [system] { header "__type_traits/make_const_lvalue_ref.h" }
+module std_private_type_traits_make_signed                               [system] { header "__type_traits/make_signed.h" }
+module std_private_type_traits_make_unsigned                             [system] {
+  header "__type_traits/make_unsigned.h"
+  export std_private_type_traits_is_unsigned
+}
+module std_private_type_traits_maybe_const                               [system] { header "__type_traits/maybe_const.h" }
+module std_private_type_traits_nat                                       [system] { header "__type_traits/nat.h" }
+module std_private_type_traits_negation                                  [system] { header "__type_traits/negation.h" }
+module std_private_type_traits_noexcept_move_assign_container            [system] { header "__type_traits/noexcept_move_assign_container.h" }
+module std_private_type_traits_operation_traits                          [system] { header "__type_traits/operation_traits.h" }
+module std_private_type_traits_predicate_traits                          [system] { header "__type_traits/predicate_traits.h" }
+module std_private_type_traits_promote                                   [system] { header "__type_traits/promote.h" }
+module std_private_type_traits_rank                                      [system] { header "__type_traits/rank.h" }
+module std_private_type_traits_remove_all_extents                        [system] { header "__type_traits/remove_all_extents.h" }
+module std_private_type_traits_remove_const                              [system] { header "__type_traits/remove_const.h" }
+module std_private_type_traits_remove_const_ref                          [system] { header "__type_traits/remove_const_ref.h" }
+module std_private_type_traits_remove_cv                                 [system] {
+  header "__type_traits/remove_cv.h"
+  export std_private_type_traits_remove_const
+  export std_private_type_traits_remove_volatile
+}
+module std_private_type_traits_remove_cvref                              [system] { header "__type_traits/remove_cvref.h" }
+module std_private_type_traits_remove_extent                             [system] { header "__type_traits/remove_extent.h" }
+module std_private_type_traits_remove_pointer                            [system] { header "__type_traits/remove_pointer.h" }
+module std_private_type_traits_remove_reference                          [system] { header "__type_traits/remove_reference.h" }
+module std_private_type_traits_remove_volatile                           [system] { header "__type_traits/remove_volatile.h" }
+module std_private_type_traits_result_of                                 [system] { header "__type_traits/result_of.h" }
+module std_private_type_traits_strip_signature                           [system] { header "__type_traits/strip_signature.h" }
+module std_private_type_traits_type_identity                             [system] { header "__type_traits/type_identity.h" }
+module std_private_type_traits_type_list                                 [system] { header "__type_traits/type_list.h" }
+module std_private_type_traits_underlying_type                           [system] {
+  header "__type_traits/underlying_type.h"
+  export std_private_type_traits_is_enum
+}
+module std_private_type_traits_unwrap_ref                                [system] { header "__type_traits/unwrap_ref.h" }
+module std_private_type_traits_void_t                                    [system] { header "__type_traits/void_t.h" }
 
-    module deque {
-      header "experimental/deque"
-      export *
-    }
-    module forward_list {
-      header "experimental/forward_list"
-      export *
-    }
-    module iterator {
-      header "experimental/iterator"
-      export *
-    }
-    module list {
-      header "experimental/list"
-      export *
-    }
-    module map {
-      header "experimental/map"
-      export *
-    }
-    module memory_resource {
-      header "experimental/memory_resource"
-      export *
-    }
-    module propagate_const {
-      header "experimental/propagate_const"
-      export *
-    }
-    module regex {
-      @requires_LIBCXX_ENABLE_LOCALIZATION@
-      header "experimental/regex"
-      export *
-    }
-    module simd {
-      header "experimental/simd"
-      export *
-    }
-    module set {
-      header "experimental/set"
-      export *
-    }
-    module string {
-      header "experimental/string"
-      export *
-    }
-    module type_traits {
-      header "experimental/type_traits"
-      export *
-    }
-    module unordered_map {
-      header "experimental/unordered_map"
-      export *
-    }
-    module unordered_set {
-      header "experimental/unordered_set"
-      export *
-    }
-    module utility {
-      header "experimental/utility"
-      export *
-    }
-    module vector {
-      header "experimental/vector"
-      export *
-    }
-    module __config {
-      private textual header "experimental/__config"
-      export *
-    }
-    // FIXME these should be private
-    module __memory {
-      header "experimental/__memory"
-      export *
-    }
-  } // end experimental
+module std_private_utility_as_const               [system] { header "__utility/as_const.h" }
+module std_private_utility_auto_cast              [system] {
+  header "__utility/auto_cast.h"
+  export std_private_type_traits_decay
+}
+module std_private_utility_cmp                    [system] {
+  header "__utility/cmp.h"
+  export std_private_type_traits_make_unsigned
 }
+module std_private_utility_convert_to_integral    [system] { header "__utility/convert_to_integral.h" }
+module std_private_utility_declval                [system] { header "__utility/declval.h" }
+module std_private_utility_exception_guard        [system] { header "__utility/exception_guard.h" }
+module std_private_utility_exchange               [system] { header "__utility/exchange.h" }
+module std_private_utility_forward                [system] { header "__utility/forward.h" }
+module std_private_utility_forward_like           [system] { header "__utility/forward_like.h" }
+module std_private_utility_in_place               [system] { header "__utility/in_place.h" }
+module std_private_utility_integer_sequence       [system] { header "__utility/integer_sequence.h" }
+module std_private_utility_is_pointer_in_range    [system] { header "__utility/is_pointer_in_range.h" }
+module std_private_utility_move                   [system] {
+  header "__utility/move.h"
+  export std_private_type_traits_is_copy_constructible
+  export std_private_type_traits_is_nothrow_move_constructible
+  export std_private_type_traits_remove_reference
+}
+module std_private_utility_pair                   [system] {
+  header "__utility/pair.h"
+  export std_private_ranges_subrange_fwd
+  export std_private_tuple_pair_like
+  export std_private_type_traits_is_assignable
+  export std_private_type_traits_is_constructible
+  export std_private_type_traits_is_convertible
+  export std_private_type_traits_is_copy_assignable
+  export std_private_type_traits_is_move_assignable
+  export std_private_type_traits_is_nothrow_copy_constructible
+  export std_private_type_traits_is_nothrow_default_constructible
+  export std_private_type_traits_is_nothrow_move_assignable
+}
+module std_private_utility_pair_fwd               [system] { header "__fwd/pair.h" }
+module std_private_utility_piecewise_construct    [system] { header "__utility/piecewise_construct.h" }
+module std_private_utility_priority_tag           [system] { header "__utility/priority_tag.h" }
+module std_private_utility_rel_ops                [system] { header "__utility/rel_ops.h" }
+module std_private_utility_swap                   [system] {
+  header "__utility/swap.h"
+  export std_private_type_traits_is_swappable
+}
+module std_private_utility_terminate_on_exception [system] { header "__utility/terminate_on_exception.h" }
+module std_private_utility_to_underlying          [system] { header "__utility/to_underlying.h" }
+module std_private_utility_unreachable            [system] { header "__utility/unreachable.h" }
+
+module std_private_variant_monostate [system] { header "__variant/monostate.h" }
diff --git a/libcxx/test/libcxx/lint/lint_modulemap.sh.py b/libcxx/test/libcxx/lint/lint_modulemap.sh.py
deleted file mode 100755
--- a/libcxx/test/libcxx/lint/lint_modulemap.sh.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# RUN: %{python} %s
-
-# Verify that each list of private submodules in libcxx/include/module.modulemap.in
-# is maintained in alphabetical order.
-
-import os
-import re
-
-
-if __name__ == "__main__":
-    libcxx_test_libcxx_lint = os.path.dirname(os.path.abspath(__file__))
-    libcxx = os.path.abspath(os.path.join(libcxx_test_libcxx_lint, "../../.."))
-    modulemap_name = os.path.join(libcxx, "include/module.modulemap.in")
-    assert os.path.isfile(modulemap_name)
-
-    okay = True
-    prevline = None
-    with open(modulemap_name, "r") as f:
-        for line in f.readlines():
-            if re.match(r"^\s*module.*[{]\s*private", line):
-                # Check that these lines are all of the expected format.
-                # This incidentally checks for typos in the module name.
-                if re.match(
-                    r'^\s*module (\w+)\s+[{] private header "\1(.h)?"\s+export [*] [}]',
-                    line,
-                ):
-                    # It's a top-level private header, such as <__bit_reference>.
-                    pass
-                elif re.match(
-                    r'^\s*module (\w+)\s+[{] private (textual )?header "__(\w+/)*\1[.]h" [}]',
-                    line,
-                ):
-                    # It's a private submodule, such as <__utility/swap.h>.
-                    pass
-                elif re.match(
-                    r'^\s*module (\w+)_fwd\s+[{] private header "__fwd/\1[.]h" [}]',
-                    line,
-                ):
-                    # It's a private submodule with forward declarations, such as <__fwd/span.h>.
-                    pass
-                elif re.match(
-                    r'^\s*module (?:\w+_)*(\w+)\s+[{] private (textual )?header "__(\w+/)*\1[.]h" [}]',
-                    line,
-                ):
-                    # It's a private pstl submodule, such as <__algorithm/pstl_backends/cpu_backend.h>
-                    pass
-                else:
-                    okay = False
-                    print(
-                        "LINE DOESN'T MATCH REGEX in libcxx/include/module.modulemap.in!"
-                    )
-                    print(line)
-                # Check that these lines are alphabetized.
-                if (prevline is not None) and (line < prevline):
-                    okay = False
-                    print("LINES OUT OF ORDER in libcxx/include/module.modulemap.in!")
-                    print(prevline)
-                    print(line)
-                prevline = line
-            else:
-                prevline = None
-    assert okay
diff --git a/libcxx/test/libcxx/private_headers.gen.py b/libcxx/test/libcxx/private_headers.gen.py
deleted file mode 100644
--- a/libcxx/test/libcxx/private_headers.gen.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#===----------------------------------------------------------------------===##
-#
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-#===----------------------------------------------------------------------===##
-
-# This test ensures that we produce a diagnostic when we use a private header
-# from user code.
-
-# RUN: %{python} %s %{libcxx}/utils
-
-import sys
-sys.path.append(sys.argv[1])
-from libcxx.test.header_information import lit_header_restrictions, private_headers, private_headers_still_public_in_modules
-
-for header in private_headers:
-  # Skip headers that are not private yet in the modulemap
-  if header in private_headers_still_public_in_modules:
-    continue
-
-  # Skip private headers that start with __support -- those are not in the modulemap yet
-  if header.startswith('__support'):
-    continue
-
-  # Skip the locale API headers, since they are platform-specific and thus inherently non-modular
-  if 'locale_base_api' in header:
-    continue
-
-  # TODO: Stop skipping PSTL headers once their integration is finished.
-  if header.startswith('__pstl'):
-    continue
-
-  BLOCKLIT = '' # block Lit from interpreting a RUN/XFAIL/etc inside the generation script
-  print(f"""\
-//--- {header}.verify.cpp
-// REQUIRES{BLOCKLIT}: modules-build
-{lit_header_restrictions.get(header, '')}
-
-#include <{header}> // expected-error@*:* {{{{use of private header from outside its module: '{header}'}}}}
-""")
diff --git a/libcxx/test/libcxx/strings/char.traits/char.traits.specializations/arbitrary_char_type.deprecated.verify.cpp b/libcxx/test/libcxx/strings/char.traits/char.traits.specializations/arbitrary_char_type.deprecated.verify.cpp
--- a/libcxx/test/libcxx/strings/char.traits/char.traits.specializations/arbitrary_char_type.deprecated.verify.cpp
+++ b/libcxx/test/libcxx/strings/char.traits/char.traits.specializations/arbitrary_char_type.deprecated.verify.cpp
@@ -6,6 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+// This should work for modules too, but clang doesn't emit the diagnostics for unknown reasons.
+// UNSUPPORTED: modules-build
+
 // <string>
 
 // template<> struct char_traits<T> for arbitrary T