diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index eb7dae706e22af2c21ecf043b2c2dc3d407ec8e5..ea0a6f83b33aed85edcef1f0c95fa0220b6bd4e0 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -353,9 +353,9 @@ module std [system] {
     export *
 
     module __charconv {
-      module chars_format      { private header "__charconv/chars_format.h"      }
+      module chars_format      { private header "__charconv/chars_format.h" }
       module from_chars_result { private header "__charconv/from_chars_result.h" }
-      module to_chars_result   { private header "__charconv/to_chars_result.h"   }
+      module to_chars_result   { private header "__charconv/to_chars_result.h" }
     }
 
   }
@@ -373,15 +373,15 @@ module std [system] {
 
     module __compare {
       module common_comparison_category { private header "__compare/common_comparison_category.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 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 compare_three_way          { private header "__compare/compare_three_way.h" }
+      module compare_three_way_result   { private header "__compare/compare_three_way_result.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 {
@@ -393,28 +393,28 @@ module std [system] {
     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"             }
-      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"              }
-      module different_from             { private header "__concepts/different_from.h"            }
-      module equality_comparable        { private header "__concepts/equality_comparable.h"       }
-      module invocable                  { private header "__concepts/invocable.h"                 }
-      module movable                    { private header "__concepts/movable.h"                   }
-      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"                   }
-      module semiregular                { private header "__concepts/semiregular.h"               }
-      module swappable                  { private header "__concepts/swappable.h"                 }
-      module totally_ordered            { private header "__concepts/totally_ordered.h"           }
+      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" }
+      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" }
+      module different_from             { private header "__concepts/different_from.h" }
+      module equality_comparable        { private header "__concepts/equality_comparable.h" }
+      module invocable                  { private header "__concepts/invocable.h" }
+      module movable                    { private header "__concepts/movable.h" }
+      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" }
+      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 {
@@ -428,10 +428,10 @@ module std [system] {
     export *
 
     module __coroutine {
-      module coroutine_handle             { private header "__coroutine/coroutine_handle.h"             }
-      module coroutine_traits             { private header "__coroutine/coroutine_traits.h"             }
-      module trivial_awaitables           { private header "__coroutine/trivial_awaitables.h"           }
-      module noop_coroutine_handle        { private header "__coroutine/noop_coroutine_handle.h"        }
+      module coroutine_handle           { private header "__coroutine/coroutine_handle.h" }
+      module coroutine_traits           { private header "__coroutine/coroutine_traits.h" }
+      module trivial_awaitables         { private header "__coroutine/trivial_awaitables.h" }
+      module noop_coroutine_handle      { private header "__coroutine/noop_coroutine_handle.h" }
     }
   }
   module deque {
@@ -456,24 +456,24 @@ module std [system] {
     export *
 
     module __format {
-      module format_arg             { private header "__format/format_arg.h"           }
-      module format_args            { private header "__format/format_args.h"          }
+      module format_arg             { private header "__format/format_arg.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_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"     }
-      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_integer      { private header "__format/formatter_integer.h"      }
-      module formatter_integral     { private header "__format/formatter_integral.h"     }
-      module formatter_string       { private header "__format/formatter_string.h"       }
+      module format_error           { private header "__format/format_error.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" }
+      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_integer      { private header "__format/formatter_integer.h" }
+      module formatter_integral     { private header "__format/formatter_integral.h" }
+      module formatter_string       { private header "__format/formatter_string.h" }
       module parser_std_format_spec { private header "__format/parser_std_format_spec.h" }
     }
   }
@@ -505,8 +505,8 @@ module std [system] {
       module identity                   { private header "__functional/identity.h" }
       module invoke                     { private header "__functional/invoke.h" }
       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 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" }
@@ -700,41 +700,41 @@ module std [system] {
     export *
 
     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 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"           }
-      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 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 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 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" }
+      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 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" }
-      module piecewise_linear_distribution   { private header "__random/piecewise_linear_distribution.h"   }
-      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 piecewise_linear_distribution   { private header "__random/piecewise_linear_distribution.h" }
+      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 {
@@ -745,39 +745,39 @@ module std [system] {
     export *
 
     module __ranges {
-      module access                 { private header "__ranges/access.h"                }
+      module access                 { private header "__ranges/access.h" }
       module all                    {
         private header "__ranges/all.h"
         export functional.__functional.compose
         export functional.__functional.perfect_forward
       }
-      module common_view            { private header "__ranges/common_view.h"           }
-      module concepts               { private header "__ranges/concepts.h"              }
-      module copyable_box           { private header "__ranges/copyable_box.h"          }
-      module counted                { private header "__ranges/counted.h"               }
-      module dangling               { private header "__ranges/dangling.h"              }
-      module data                   { private header "__ranges/data.h"                  }
-      module drop_view              { private header "__ranges/drop_view.h"             }
-      module empty                  { private header "__ranges/empty.h"                 }
-      module empty_view             { private header "__ranges/empty_view.h"            }
+      module common_view            { private header "__ranges/common_view.h" }
+      module concepts               { private header "__ranges/concepts.h" }
+      module copyable_box           { private header "__ranges/copyable_box.h" }
+      module counted                { private header "__ranges/counted.h" }
+      module dangling               { private header "__ranges/dangling.h" }
+      module data                   { private header "__ranges/data.h" }
+      module drop_view              { private header "__ranges/drop_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 iota_view              { private header "__ranges/iota_view.h"             }
-      module join_view              { private header "__ranges/join_view.h"             }
+      module enable_view            { private header "__ranges/enable_view.h" }
+      module iota_view              { private header "__ranges/iota_view.h" }
+      module join_view              { private header "__ranges/join_view.h" }
       module non_propagating_cache  { private header "__ranges/non_propagating_cache.h" }
-      module range_adaptor          { private header "__ranges/range_adaptor.h"         }
-      module ref_view               { private header "__ranges/ref_view.h"              }
-      module reverse_view           { private header "__ranges/reverse_view.h"          }
-      module size                   { private header "__ranges/size.h"                  }
-      module single_view            { private header "__ranges/single_view.h"           }
-      module subrange               { private header "__ranges/subrange.h"              }
-      module take_view              { private header "__ranges/take_view.h"             }
+      module range_adaptor          { private header "__ranges/range_adaptor.h" }
+      module ref_view               { private header "__ranges/ref_view.h" }
+      module reverse_view           { private header "__ranges/reverse_view.h" }
+      module size                   { private header "__ranges/size.h" }
+      module single_view            { private header "__ranges/single_view.h" }
+      module subrange               { private header "__ranges/subrange.h" }
+      module take_view              { private header "__ranges/take_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 view_interface         { private header "__ranges/view_interface.h" }
     }
   }
   module ratio {
@@ -892,21 +892,21 @@ module std [system] {
     export *
 
     module __utility {
-      module as_const            { private header "__utility/as_const.h"            }
-      module cmp                 { private header "__utility/cmp.h"                 }
-      module decay_copy          { private header "__utility/decay_copy.h"          }
-      module declval             { private header "__utility/declval.h"             }
-      module exchange            { private header "__utility/exchange.h"            }
-      module forward             { private header "__utility/forward.h"             }
-      module in_place            { private header "__utility/in_place.h"            }
-      module integer_sequence    { private header "__utility/integer_sequence.h"    }
-      module move                { private header "__utility/move.h"                }
-      module pair                { private header "__utility/pair.h"                }
+      module as_const            { private header "__utility/as_const.h" }
+      module cmp                 { private header "__utility/cmp.h" }
+      module decay_copy          { private header "__utility/decay_copy.h" }
+      module declval             { private header "__utility/declval.h" }
+      module exchange            { private header "__utility/exchange.h" }
+      module forward             { private header "__utility/forward.h" }
+      module in_place            { private header "__utility/in_place.h" }
+      module integer_sequence    { private header "__utility/integer_sequence.h" }
+      module move                { private header "__utility/move.h" }
+      module pair                { private header "__utility/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"                }
-      module to_underlying       { private header "__utility/to_underlying.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" }
+      module to_underlying       { private header "__utility/to_underlying.h" }
     }
   }
   module valarray {