1 files changed, 240 insertions, 23 deletions

diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 7b301d45d93e..b311b166c12f 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -24,18 +24,20 @@ SRCS+=		charconv.cpp
 SRCS+=		chrono.cpp
 SRCS+=		condition_variable.cpp
 SRCS+=		condition_variable_destructor.cpp
-SRCS+=		debug.cpp
 SRCS+=		exception.cpp
+SRCS+=		filesystem/directory_entry.cpp
 SRCS+=		filesystem/directory_iterator.cpp
+SRCS+=		filesystem/filesystem_clock.cpp
+SRCS+=		filesystem/filesystem_error.cpp
 SRCS+=		filesystem/int128_builtins.cpp
 SRCS+=		filesystem/operations.cpp
+SRCS+=		filesystem/path.cpp
 SRCS+=		functional.cpp
 SRCS+=		future.cpp
 SRCS+=		hash.cpp
 SRCS+=		ios.cpp
 SRCS+=		ios.instantiations.cpp
 SRCS+=		iostream.cpp
-SRCS+=		legacy_debug_handler.cpp
 SRCS+=		legacy_pointer_safety.cpp
 SRCS+=		locale.cpp
 SRCS+=		memory.cpp
@@ -43,7 +45,10 @@ SRCS+=		memory_resource.cpp
 SRCS+=		mutex.cpp
 SRCS+=		mutex_destructor.cpp
 SRCS+=		new.cpp
+SRCS+=		new_handler.cpp
+SRCS+=		new_helpers.cpp
 SRCS+=		optional.cpp
+SRCS+=		print.cpp
 SRCS+=		random.cpp
 SRCS+=		random_shuffle.cpp
 SRCS+=		regex.cpp
@@ -57,7 +62,6 @@ SRCS+=		strstream.cpp
 SRCS+=		system_error.cpp
 SRCS+=		thread.cpp
 SRCS+=		typeinfo.cpp
-SRCS+=		utility.cpp
 SRCS+=		valarray.cpp
 SRCS+=		variant.cpp
 SRCS+=		vector.cpp
@@ -100,18 +104,16 @@ STDDIR=		${CXXINCLUDEDIR}
 STD_HEADERS+=	__assert
 STD_HEADERS+=	__availability
 STD_HEADERS+=	__bit_reference
-STD_HEADERS+=	__bsd_locale_defaults.h
-STD_HEADERS+=	__bsd_locale_fallbacks.h
 STD_HEADERS+=	__config
-STD_HEADERS+=	__debug
-STD_HEADERS+=	__errc
 STD_HEADERS+=	__hash_table
 STD_HEADERS+=	__locale
 STD_HEADERS+=	__mbstate_t.h
-STD_HEADERS+=	__mutex_base
 STD_HEADERS+=	__node_handle
+STD_HEADERS+=	__pstl_algorithm
+STD_HEADERS+=	__pstl_memory
+STD_HEADERS+=	__pstl_numeric
 STD_HEADERS+=	__split_buffer
-STD_HEADERS+=	__std_stream
+STD_HEADERS+=	__std_mbstate_t.h
 STD_HEADERS+=	__threading_support
 STD_HEADERS+=	__tree
 STD_HEADERS+=	__undef_macros
@@ -188,6 +190,7 @@ STD_HEADERS+=	locale
 STD_HEADERS+=	locale.h
 STD_HEADERS+=	map
 STD_HEADERS+=	math.h
+STD_HEADERS+=	mdspan
 STD_HEADERS+=	memory
 STD_HEADERS+=	memory_resource
 STD_HEADERS+=	mutex
@@ -196,6 +199,7 @@ STD_HEADERS+=	numbers
 STD_HEADERS+=	numeric
 STD_HEADERS+=	optional
 STD_HEADERS+=	ostream
+STD_HEADERS+=	print
 STD_HEADERS+=	queue
 STD_HEADERS+=	random
 STD_HEADERS+=	ranges
@@ -217,6 +221,7 @@ STD_HEADERS+=	stdexcept
 STD_HEADERS+=	stdint.h
 STD_HEADERS+=	stdio.h
 STD_HEADERS+=	stdlib.h
+STD_HEADERS+=	stop_token
 STD_HEADERS+=	streambuf
 STD_HEADERS+=	string
 STD_HEADERS+=	string.h
@@ -283,6 +288,7 @@ ALG_HEADERS+=	find_if.h
 ALG_HEADERS+=	find_if_not.h
 ALG_HEADERS+=	for_each.h
 ALG_HEADERS+=	for_each_n.h
+ALG_HEADERS+=	for_each_segment.h
 ALG_HEADERS+=	generate.h
 ALG_HEADERS+=	generate_n.h
 ALG_HEADERS+=	half_positive.h
@@ -303,6 +309,7 @@ ALG_HEADERS+=	is_sorted_until.h
 ALG_HEADERS+=	iter_swap.h
 ALG_HEADERS+=	iterator_operations.h
 ALG_HEADERS+=	lexicographical_compare.h
+ALG_HEADERS+=	lexicographical_compare_three_way.h
 ALG_HEADERS+=	lower_bound.h
 ALG_HEADERS+=	make_heap.h
 ALG_HEADERS+=	make_projected.h
@@ -327,6 +334,21 @@ ALG_HEADERS+=	partition_copy.h
 ALG_HEADERS+=	partition_point.h
 ALG_HEADERS+=	pop_heap.h
 ALG_HEADERS+=	prev_permutation.h
+ALG_HEADERS+=	pstl_any_all_none_of.h
+ALG_HEADERS+=	pstl_backend.h
+ALG_HEADERS+=	pstl_copy.h
+ALG_HEADERS+=	pstl_count.h
+ALG_HEADERS+=	pstl_fill.h
+ALG_HEADERS+=	pstl_find.h
+ALG_HEADERS+=	pstl_for_each.h
+ALG_HEADERS+=	pstl_frontend_dispatch.h
+ALG_HEADERS+=	pstl_generate.h
+ALG_HEADERS+=	pstl_is_partitioned.h
+ALG_HEADERS+=	pstl_merge.h
+ALG_HEADERS+=	pstl_replace.h
+ALG_HEADERS+=	pstl_sort.h
+ALG_HEADERS+=	pstl_stable_sort.h
+ALG_HEADERS+=	pstl_transform.h
 ALG_HEADERS+=	push_heap.h
 ALG_HEADERS+=	ranges_adjacent_find.h
 ALG_HEADERS+=	ranges_all_of.h
@@ -409,6 +431,7 @@ ALG_HEADERS+=	ranges_sort.h
 ALG_HEADERS+=	ranges_sort_heap.h
 ALG_HEADERS+=	ranges_stable_partition.h
 ALG_HEADERS+=	ranges_stable_sort.h
+ALG_HEADERS+=	ranges_starts_with.h
 ALG_HEADERS+=	ranges_swap_ranges.h
 ALG_HEADERS+=	ranges_transform.h
 ALG_HEADERS+=	ranges_unique.h
@@ -442,6 +465,7 @@ ALG_HEADERS+=	sort_heap.h
 ALG_HEADERS+=	stable_partition.h
 ALG_HEADERS+=	stable_sort.h
 ALG_HEADERS+=	swap_ranges.h
+ALG_HEADERS+=	three_way_comp_ref_type.h
 ALG_HEADERS+=	transform.h
 ALG_HEADERS+=	uniform_random_bit_generator_adaptor.h
 ALG_HEADERS+=	unique.h
@@ -453,6 +477,51 @@ ALG_HEADERS+=	upper_bound.h
 ALG+=		${HDRDIR}/__algorithm/${hdr}
 .endfor
 
+INCSGROUPS+=	PSB
+PSBDIR=		${CXXINCLUDEDIR}/__algorithm/pstl_backends
+PSB_HEADERS+=   cpu_backend.h
+.for hdr in ${PSB_HEADERS}
+PSB+=		${HDRDIR}/__algorithm/pstl_backends/${hdr}
+.endfor
+
+INCSGROUPS+=	PCB
+PCBDIR=		${CXXINCLUDEDIR}/__algorithm/pstl_backends/cpu_backends
+PCB_HEADERS+=   any_of.h
+PCB_HEADERS+=   backend.h
+PCB_HEADERS+=   fill.h
+PCB_HEADERS+=   find_if.h
+PCB_HEADERS+=   for_each.h
+PCB_HEADERS+=   libdispatch.h
+PCB_HEADERS+=   merge.h
+PCB_HEADERS+=   serial.h
+PCB_HEADERS+=   stable_sort.h
+PCB_HEADERS+=   thread.h
+PCB_HEADERS+=   transform.h
+PCB_HEADERS+=   transform_reduce.h
+.for hdr in ${PCB_HEADERS}
+PCB+=		${HDRDIR}/__algorithm/pstl_backends/cpu_backends/${hdr}
+.endfor
+
+INCSGROUPS+=	ATM
+ATMDIR=		${CXXINCLUDEDIR}/__atomic
+ATM_HEADERS+=	aliases.h
+ATM_HEADERS+=	atomic.h
+ATM_HEADERS+=	atomic_base.h
+ATM_HEADERS+=	atomic_flag.h
+ATM_HEADERS+=	atomic_init.h
+ATM_HEADERS+=	atomic_lock_free.h
+ATM_HEADERS+=	atomic_sync.h
+ATM_HEADERS+=	check_memory_order.h
+ATM_HEADERS+=	contention_t.h
+ATM_HEADERS+=	cxx_atomic_impl.h
+ATM_HEADERS+=	fence.h
+ATM_HEADERS+=	is_always_lock_free.h
+ATM_HEADERS+=	kill_dependency.h
+ATM_HEADERS+=	memory_order.h
+.for hdr in ${ATM_HEADERS}
+ATM+=		${HDRDIR}/__atomic/${hdr}
+.endfor
+
 INCSGROUPS+=	BIT
 BITDIR=		${CXXINCLUDEDIR}/__bit
 BIT_HEADERS+=	bit_cast.h
@@ -475,10 +544,15 @@ BIT+=		${HDRDIR}/__bit/${hdr}
 INCSGROUPS+=	CHC
 CHCDIR=		${CXXINCLUDEDIR}/__charconv
 CHC_HEADERS+=	chars_format.h
+CHC_HEADERS+=	from_chars_integral.h
 CHC_HEADERS+=	from_chars_result.h
 CHC_HEADERS+=	tables.h
+CHC_HEADERS+=	to_chars.h
 CHC_HEADERS+=	to_chars_base_10.h
+CHC_HEADERS+=	to_chars_floating_point.h
+CHC_HEADERS+=	to_chars_integral.h
 CHC_HEADERS+=	to_chars_result.h
+CHC_HEADERS+=	traits.h
 .for hdr in ${CHC_HEADERS}
 CHC+=		${HDRDIR}/__charconv/${hdr}
 .endfor
@@ -486,6 +560,7 @@ CHC+=		${HDRDIR}/__charconv/${hdr}
 INCSGROUPS+=	CHR
 CHRDIR=		${CXXINCLUDEDIR}/__chrono
 CHR_HEADERS+=	calendar.h
+CHR_HEADERS+=	concepts.h
 CHR_HEADERS+=	convert_to_timespec.h
 CHR_HEADERS+=	convert_to_tm.h
 CHR_HEADERS+=	day.h
@@ -560,6 +635,13 @@ CON_HEADERS+=	totally_ordered.h
 CON+=		${HDRDIR}/__concepts/${hdr}
 .endfor
 
+INCSGROUPS+=	CND
+CNDDIR=		${CXXINCLUDEDIR}/__condition_variable
+CND_HEADERS+=   condition_variable.h
+.for hdr in ${CND_HEADERS}
+CND+=		${HDRDIR}/__condition_variable/${hdr}
+.endfor
+
 INCSGROUPS+=	COR
 CORDIR=		${CXXINCLUDEDIR}/__coroutine
 COR_HEADERS+=	coroutine_handle.h
@@ -573,18 +655,30 @@ COR+=		${HDRDIR}/__coroutine/${hdr}
 INCSGROUPS+=	DBG
 DBGDIR=		${CXXINCLUDEDIR}/__debug_utils
 DBG_HEADERS+=	randomize_range.h
+DBG_HEADERS+=   strict_weak_ordering_check.h
 .for hdr in ${DBG_HEADERS}
 DBG+=		${HDRDIR}/__debug_utils/${hdr}
 .endfor
 
 INCSGROUPS+=	EXC
-EXCDIR=		${CXXINCLUDEDIR}/__expected
-EXC_HEADERS+=	bad_expected_access.h
-EXC_HEADERS+=	expected.h
-EXC_HEADERS+=	unexpect.h
-EXC_HEADERS+=	unexpected.h
+EXCDIR=		${CXXINCLUDEDIR}/__exception
+EXC_HEADERS+=   exception.h
+EXC_HEADERS+=   exception_ptr.h
+EXC_HEADERS+=   nested_exception.h
+EXC_HEADERS+=   operations.h
+EXC_HEADERS+=   terminate.h
 .for hdr in ${EXC_HEADERS}
-EXC+=		${HDRDIR}/__expected/${hdr}
+EXC+=		${HDRDIR}/__exception/${hdr}
+.endfor
+
+INCSGROUPS+=	EXD
+EXDDIR=		${CXXINCLUDEDIR}/__expected
+EXD_HEADERS+=	bad_expected_access.h
+EXD_HEADERS+=	expected.h
+EXD_HEADERS+=	unexpect.h
+EXD_HEADERS+=	unexpected.h
+.for hdr in ${EXD_HEADERS}
+EXD+=		${HDRDIR}/__expected/${hdr}
 .endfor
 
 INCSGROUPS+=	FS
@@ -641,6 +735,8 @@ FMT_HEADERS+=	parser_std_format_spec.h
 FMT_HEADERS+=	range_default_formatter.h
 FMT_HEADERS+=	range_formatter.h
 FMT_HEADERS+=	unicode.h
+FMT_HEADERS+=	width_estimation_table.h
+FMT_HEADERS+=	write_escaped.h
 .for hdr in ${FMT_HEADERS}
 FMT+=		${HDRDIR}/__format/${hdr}
 .endfor
@@ -673,7 +769,6 @@ FUN_HEADERS+=	ranges_operations.h
 FUN_HEADERS+=	reference_wrapper.h
 FUN_HEADERS+=	unary_function.h
 FUN_HEADERS+=	unary_negate.h
-FUN_HEADERS+=	unwrap_ref.h
 FUN_HEADERS+=	weak_result_type.h
 .for hdr in ${FUN_HEADERS}
 FUN+=		${HDRDIR}/__functional/${hdr}
@@ -682,11 +777,18 @@ FUN+=		${HDRDIR}/__functional/${hdr}
 INCSGROUPS+=	FWD
 FWDDIR=		${CXXINCLUDEDIR}/__fwd
 FWD_HEADERS+=	array.h
+FWD_HEADERS+=	fstream.h
 FWD_HEADERS+=	get.h
 FWD_HEADERS+=	hash.h
+FWD_HEADERS+=	ios.h
+FWD_HEADERS+=	istream.h
+FWD_HEADERS+=	mdspan.h
 FWD_HEADERS+=	memory_resource.h
+FWD_HEADERS+=	ostream.h
 FWD_HEADERS+=	pair.h
 FWD_HEADERS+=	span.h
+FWD_HEADERS+=	sstream.h
+FWD_HEADERS+=	streambuf.h
 FWD_HEADERS+=	string.h
 FWD_HEADERS+=	string_view.h
 FWD_HEADERS+=	subrange.h
@@ -711,6 +813,7 @@ IT_HEADERS+=	bounded_iter.h
 IT_HEADERS+=	common_iterator.h
 IT_HEADERS+=	concepts.h
 IT_HEADERS+=	counted_iterator.h
+IT_HEADERS+=	cpp17_iterator_concepts.h
 IT_HEADERS+=	data.h
 IT_HEADERS+=	default_sentinel.h
 IT_HEADERS+=	distance.h
@@ -736,6 +839,7 @@ IT_HEADERS+=	ostreambuf_iterator.h
 IT_HEADERS+=	permutable.h
 IT_HEADERS+=	prev.h
 IT_HEADERS+=	projected.h
+IT_HEADERS+=	ranges_iterator_traits.h
 IT_HEADERS+=	readable_traits.h
 IT_HEADERS+=	reverse_access.h
 IT_HEADERS+=	reverse_iterator.h
@@ -748,10 +852,30 @@ IT_HEADERS+=	wrap_iter.h
 IT+=		${HDRDIR}/__iterator/${hdr}
 .endfor
 
+INCSGROUPS+=	LBA
+LBADIR=		${CXXINCLUDEDIR}/__locale_dir/locale_base_api
+LBA_HEADERS+=	bsd_locale_defaults.h
+LBA_HEADERS+=	bsd_locale_fallbacks.h
+LBA_HEADERS+=	locale_guard.h
+.for hdr in ${LBA_HEADERS}
+LBA+=		${HDRDIR}/__locale_dir/locale_base_api/${hdr}
+.endfor
+
+INCSGROUPS+=	MDS
+MDSDIR=		${CXXINCLUDEDIR}/__mdspan
+MDS_HEADERS+=	default_accessor.h
+MDS_HEADERS+=	extents.h
+MDS_HEADERS+=	layout_left.h
+MDS_HEADERS+=	layout_right.h
+.for hdr in ${MDS_HEADERS}
+MDS+=		${HDRDIR}/__mdspan/${hdr}
+.endfor
+
 INCSGROUPS+=	MEM
 MEMDIR=		${CXXINCLUDEDIR}/__memory
 MEM_HEADERS+=	addressof.h
 MEM_HEADERS+=	align.h
+MEM_HEADERS+=	aligned_alloc.h
 MEM_HEADERS+=	allocate_at_least.h
 MEM_HEADERS+=	allocation_guard.h
 MEM_HEADERS+=	allocator.h
@@ -794,6 +918,16 @@ MER_HEADERS+=	unsynchronized_pool_resource.h
 MER+=		${HDRDIR}/__memory_resource/${hdr}
 .endfor
 
+INCSGROUPS+=	MUT
+MUTDIR=		${CXXINCLUDEDIR}/__mutex
+MUT_HEADERS+=	lock_guard.h
+MUT_HEADERS+=	mutex.h
+MUT_HEADERS+=	tag_types.h
+MUT_HEADERS+=	unique_lock.h
+.for hdr in ${MUT_HEADERS}
+MUT+=		${HDRDIR}/__mutex/${hdr}
+.endfor
+
 INCSGROUPS+=	NUM
 NUMDIR=		${CXXINCLUDEDIR}/__numeric
 NUM_HEADERS+=	accumulate.h
@@ -805,6 +939,8 @@ NUM_HEADERS+=	inner_product.h
 NUM_HEADERS+=	iota.h
 NUM_HEADERS+=	midpoint.h
 NUM_HEADERS+=	partial_sum.h
+NUM_HEADERS+=	pstl_reduce.h
+NUM_HEADERS+=	pstl_transform_reduce.h
 NUM_HEADERS+=	reduce.h
 NUM_HEADERS+=	transform_exclusive_scan.h
 NUM_HEADERS+=	transform_inclusive_scan.h
@@ -813,6 +949,48 @@ NUM_HEADERS+=	transform_reduce.h
 NUM+=		${HDRDIR}/__numeric/${hdr}
 .endfor
 
+INCSGROUPS+=	PSI
+PSIDIR=		${CXXINCLUDEDIR}/__pstl/internal
+PSI_HEADERS+=	algorithm_fwd.h
+PSI_HEADERS+=	algorithm_impl.h
+PSI_HEADERS+=	execution_defs.h
+PSI_HEADERS+=	execution_impl.h
+PSI_HEADERS+=	glue_algorithm_defs.h
+PSI_HEADERS+=	glue_algorithm_impl.h
+PSI_HEADERS+=	glue_memory_defs.h
+PSI_HEADERS+=	glue_memory_impl.h
+PSI_HEADERS+=	glue_numeric_defs.h
+PSI_HEADERS+=	glue_numeric_impl.h
+PSI_HEADERS+=	memory_impl.h
+PSI_HEADERS+=	numeric_fwd.h
+PSI_HEADERS+=	numeric_impl.h
+PSI_HEADERS+=	parallel_backend.h
+PSI_HEADERS+=	parallel_backend_omp.h
+PSI_HEADERS+=	parallel_backend_serial.h
+PSI_HEADERS+=	parallel_backend_tbb.h
+PSI_HEADERS+=	parallel_backend_utils.h
+PSI_HEADERS+=	unseq_backend_simd.h
+PSI_HEADERS+=	utils.h
+.for hdr in ${PSI_HEADERS}
+PSI+=		${HDRDIR}/__pstl/internal/${hdr}
+.endfor
+
+INCSGROUPS+=	PSO
+PSODIR=		${CXXINCLUDEDIR}/__pstl/internal/omp
+PSO_HEADERS+=	parallel_for.h
+PSO_HEADERS+=	parallel_for_each.h
+PSO_HEADERS+=	parallel_invoke.h
+PSO_HEADERS+=	parallel_merge.h
+PSO_HEADERS+=	parallel_scan.h
+PSO_HEADERS+=	parallel_stable_partial_sort.h
+PSO_HEADERS+=	parallel_stable_sort.h
+PSO_HEADERS+=	parallel_transform_reduce.h
+PSO_HEADERS+=	parallel_transform_scan.h
+PSO_HEADERS+=	util.h
+.for hdr in ${PSO_HEADERS}
+PSO+=		${HDRDIR}/__pstl/internal/omp/${hdr}
+.endfor
+
 INCSGROUPS+=	RND
 RNDDIR=		${CXXINCLUDEDIR}/__random
 RND_HEADERS+=	bernoulli_distribution.h
@@ -863,7 +1041,7 @@ RNG_HEADERS+=	all.h
 RNG_HEADERS+=	as_rvalue_view.h
 RNG_HEADERS+=	common_view.h
 RNG_HEADERS+=	concepts.h
-RNG_HEADERS+=	copyable_box.h
+RNG_HEADERS+=	container_compatible_range.h
 RNG_HEADERS+=	counted.h
 RNG_HEADERS+=	dangling.h
 RNG_HEADERS+=	data.h
@@ -875,16 +1053,19 @@ RNG_HEADERS+=	empty_view.h
 RNG_HEADERS+=	enable_borrowed_range.h
 RNG_HEADERS+=	enable_view.h
 RNG_HEADERS+=	filter_view.h
+RNG_HEADERS+=	from_range.h
 RNG_HEADERS+=	iota_view.h
 RNG_HEADERS+=	istream_view.h
 RNG_HEADERS+=	join_view.h
 RNG_HEADERS+=	lazy_split_view.h
+RNG_HEADERS+=	movable_box.h
 RNG_HEADERS+=	non_propagating_cache.h
 RNG_HEADERS+=	owning_view.h
 RNG_HEADERS+=	range_adaptor.h
 RNG_HEADERS+=	rbegin.h
 RNG_HEADERS+=	ref_view.h
 RNG_HEADERS+=	rend.h
+RNG_HEADERS+=	repeat_view.h
 RNG_HEADERS+=	reverse_view.h
 RNG_HEADERS+=	single_view.h
 RNG_HEADERS+=	size.h
@@ -892,6 +1073,7 @@ RNG_HEADERS+=	split_view.h
 RNG_HEADERS+=	subrange.h
 RNG_HEADERS+=	take_view.h
 RNG_HEADERS+=	take_while_view.h
+RNG_HEADERS+=	to.h
 RNG_HEADERS+=	transform_view.h
 RNG_HEADERS+=	view_interface.h
 RNG_HEADERS+=	views.h
@@ -900,25 +1082,53 @@ RNG_HEADERS+=	zip_view.h
 RNG+=		${HDRDIR}/__ranges/${hdr}
 .endfor
 
+INCSGROUPS+=	STT
+STTDIR=		${CXXINCLUDEDIR}/__stop_token
+STT_HEADERS+=	atomic_unique_lock.h
+STT_HEADERS+=	intrusive_list_view.h
+STT_HEADERS+=	intrusive_shared_ptr.h
+STT_HEADERS+=	stop_callback.h
+STT_HEADERS+=	stop_source.h
+STT_HEADERS+=	stop_state.h
+STT_HEADERS+=	stop_token.h
+.for hdr in ${STT_HEADERS}
+STT+=		${HDRDIR}/__stop_token/${hdr}
+.endfor
+
 INCSGROUPS+=	STR
 STRDIR=		${CXXINCLUDEDIR}/__string
 STR_HEADERS+=	char_traits.h
+STR_HEADERS+=	constexpr_c_functions.h
 STR_HEADERS+=	extern_template_lists.h
 .for hdr in ${STR_HEADERS}
 STR+=		${HDRDIR}/__string/${hdr}
 .endfor
 
+INCSGROUPS+=	SER
+SERDIR=		${CXXINCLUDEDIR}/__system_error
+SER_HEADERS+=	errc.h
+SER_HEADERS+=	error_category.h
+SER_HEADERS+=	error_code.h
+SER_HEADERS+=	error_condition.h
+SER_HEADERS+=	system_error.h
+.for hdr in ${SER_HEADERS}
+SER+=		${HDRDIR}/__system_error/${hdr}
+.endfor
+
 INCSGROUPS+=	THR
 THRDIR=		${CXXINCLUDEDIR}/__thread
+THR_HEADERS+=	formatter.h
+THR_HEADERS+=	id.h
 THR_HEADERS+=	poll_with_backoff.h
+THR_HEADERS+=	this_thread.h
+THR_HEADERS+=	thread.h
 THR_HEADERS+=	timed_backoff_policy.h
 .for hdr in ${THR_HEADERS}
 THR+=		${HDRDIR}/__thread/${hdr}
 .endfor
 
 INCSGROUPS+=	TUP
-TUPDIR=		${CXXINCLUDEDIR}/__tuple_dir
-TUP_HEADERS+=	apply_cv.h
+TUPDIR=		${CXXINCLUDEDIR}/__tuple
 TUP_HEADERS+=	make_tuple_types.h
 TUP_HEADERS+=	pair_like.h
 TUP_HEADERS+=	sfinae_helpers.h
@@ -929,7 +1139,7 @@ TUP_HEADERS+=	tuple_like_ext.h
 TUP_HEADERS+=	tuple_size.h
 TUP_HEADERS+=	tuple_types.h
 .for hdr in ${TUP_HEADERS}
-TUP+=		${HDRDIR}/__tuple_dir/${hdr}
+TUP+=		${HDRDIR}/__tuple/${hdr}
 .endfor
 
 INCSGROUPS+=	TTR
@@ -951,6 +1161,7 @@ TTR_HEADERS+=	conditional.h
 TTR_HEADERS+=	conjunction.h
 TTR_HEADERS+=	copy_cv.h
 TTR_HEADERS+=	copy_cvref.h
+TTR_HEADERS+=	datasizeof.h
 TTR_HEADERS+=	decay.h
 TTR_HEADERS+=	dependent_type.h
 TTR_HEADERS+=	disjunction.h
@@ -959,6 +1170,7 @@ TTR_HEADERS+=	extent.h
 TTR_HEADERS+=	has_unique_object_representation.h
 TTR_HEADERS+=	has_virtual_destructor.h
 TTR_HEADERS+=	integral_constant.h
+TTR_HEADERS+=	invoke.h
 TTR_HEADERS+=	is_abstract.h
 TTR_HEADERS+=	is_aggregate.h
 TTR_HEADERS+=	is_allocator.h
@@ -983,6 +1195,8 @@ TTR_HEADERS+=	is_default_constructible.h
 TTR_HEADERS+=	is_destructible.h
 TTR_HEADERS+=	is_empty.h
 TTR_HEADERS+=	is_enum.h
+TTR_HEADERS+=	is_equality_comparable.h
+TTR_HEADERS+=	is_execution_policy.h
 TTR_HEADERS+=	is_final.h
 TTR_HEADERS+=	is_floating_point.h
 TTR_HEADERS+=	is_function.h
@@ -1029,6 +1243,7 @@ TTR_HEADERS+=	is_trivially_copy_constructible.h
 TTR_HEADERS+=	is_trivially_copyable.h
 TTR_HEADERS+=	is_trivially_default_constructible.h
 TTR_HEADERS+=	is_trivially_destructible.h
+TTR_HEADERS+=	is_trivially_lexicographically_comparable.h
 TTR_HEADERS+=	is_trivially_move_assignable.h
 TTR_HEADERS+=	is_trivially_move_constructible.h
 TTR_HEADERS+=	is_unbounded_array.h
@@ -1047,6 +1262,8 @@ TTR_HEADERS+=	maybe_const.h
 TTR_HEADERS+=	nat.h
 TTR_HEADERS+=	negation.h
 TTR_HEADERS+=	noexcept_move_assign_container.h
+TTR_HEADERS+=	operation_traits.h
+TTR_HEADERS+=	predicate_traits.h
 TTR_HEADERS+=	promote.h
 TTR_HEADERS+=	rank.h
 TTR_HEADERS+=	remove_all_extents.h
@@ -1063,6 +1280,7 @@ TTR_HEADERS+=	strip_signature.h
 TTR_HEADERS+=	type_identity.h
 TTR_HEADERS+=	type_list.h
 TTR_HEADERS+=	underlying_type.h
+TTR_HEADERS+=	unwrap_ref.h
 TTR_HEADERS+=	void_t.h
 .for hdr in ${TTR_HEADERS}
 TTR+=		${HDRDIR}/__type_traits/${hdr}
@@ -1081,12 +1299,14 @@ UTL_HEADERS+=	forward.h
 UTL_HEADERS+=	forward_like.h
 UTL_HEADERS+=	in_place.h
 UTL_HEADERS+=	integer_sequence.h
+UTL_HEADERS+=	is_pointer_in_range.h
 UTL_HEADERS+=	move.h
 UTL_HEADERS+=	pair.h
 UTL_HEADERS+=	piecewise_construct.h
 UTL_HEADERS+=	priority_tag.h
 UTL_HEADERS+=	rel_ops.h
 UTL_HEADERS+=	swap.h
+UTL_HEADERS+=	terminate_on_exception.h
 UTL_HEADERS+=	to_underlying.h
 UTL_HEADERS+=	unreachable.h
 .for hdr in ${UTL_HEADERS}
@@ -1104,11 +1324,8 @@ INCSGROUPS+=	EXP
 EXPDIR=		${CXXINCLUDEDIR}/experimental
 EXP_HEADERS+=	__config
 EXP_HEADERS+=	__memory
-EXP_HEADERS+=	algorithm
-EXP_HEADERS+=	coroutine
 EXP_HEADERS+=	deque
 EXP_HEADERS+=	forward_list
-EXP_HEADERS+=	functional
 EXP_HEADERS+=	iterator
 EXP_HEADERS+=	list
 EXP_HEADERS+=	map