1 files changed, 116 insertions, 80 deletions

diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index ea93913e3585..52ea6c246a0c 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -27,6 +27,7 @@ SRCS+=		condition_variable.cpp
 SRCS+=		condition_variable_destructor.cpp
 SRCS+=		error_category.cpp
 SRCS+=		exception.cpp
+SRCS+=		expected.cpp
 SRCS+=		filesystem/directory_entry.cpp
 SRCS+=		filesystem/directory_iterator.cpp
 SRCS+=		filesystem/filesystem_clock.cpp
@@ -34,6 +35,7 @@ SRCS+=		filesystem/filesystem_error.cpp
 SRCS+=		filesystem/int128_builtins.cpp
 SRCS+=		filesystem/operations.cpp
 SRCS+=		filesystem/path.cpp
+SRCS+=		fstream.cpp
 SRCS+=		functional.cpp
 SRCS+=		future.cpp
 SRCS+=		hash.cpp
@@ -103,14 +105,13 @@ CFLAGS+=	-ffunction-sections
 CFLAGS+=	-fno-semantic-interposition
 CFLAGS+=	-fvisibility-inlines-hidden
 CFLAGS+=	-fvisibility=hidden
-CXXSTD?=	c++20
+CXXSTD?=	c++23
 
 LIBADD+=	cxxrt
 
 INCSGROUPS+=	STD
 STDDIR=		${CXXINCLUDEDIR}
 STD_HEADERS+=	__assert
-STD_HEADERS+=	__availability
 STD_HEADERS+=	__bit_reference
 STD_HEADERS+=	__config
 STD_HEADERS+=	__hash_table
@@ -120,7 +121,6 @@ STD_HEADERS+=	__node_handle
 STD_HEADERS+=	__split_buffer
 STD_HEADERS+=	__std_clang_module
 STD_HEADERS+=	__std_mbstate_t.h
-STD_HEADERS+=	__threading_support
 STD_HEADERS+=	__tree
 STD_HEADERS+=	__undef_macros
 STD_HEADERS+=	__verbose_abort
@@ -188,7 +188,6 @@ STD_HEADERS+=	iostream
 STD_HEADERS+=	istream
 STD_HEADERS+=	iterator
 STD_HEADERS+=	latch
-STD_HEADERS+=	libcxx.imp
 STD_HEADERS+=	limits
 STD_HEADERS+=	list
 STD_HEADERS+=	locale
@@ -253,16 +252,16 @@ STD_HEADERS+=	wctype.h
 STD+=		${HDRDIR}/${hdr}
 .endfor
 
-# Special case for __assertion_handler, which as of libc++ 18.0.0 is generated
-# by CMake.
+# Generated by CMake as of libc++ 18.
 STD+=		${.CURDIR}/__assertion_handler
 
-# Special case for __config_site, which as of libc++ 12.0.0 is generated by
-# CMake, and as of 13.0.0 installed side-by-side with__config.
+# Generated by CMake as of libc++ 13.
 STD+=		${.CURDIR}/__config_site
 
-# Special case for module.modulemap, which as of libc++ 15.0.0 is generated by
-# CMake.
+# Generated by CMake as of libc++ 19.
+STD_HEADERS+=	${.CURDIR}/libcxx.imp
+
+# Generated by CMake as of libc++ 15.
 STD+=		${.CURDIR}/module.modulemap
 
 RT_HEADERS+=	cxxabi.h
@@ -345,24 +344,7 @@ 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_equal.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_move.h
-ALG_HEADERS+=	pstl_replace.h
-ALG_HEADERS+=	pstl_rotate_copy.h
-ALG_HEADERS+=	pstl_sort.h
-ALG_HEADERS+=	pstl_stable_sort.h
-ALG_HEADERS+=	pstl_transform.h
+ALG_HEADERS+=	pstl.h
 ALG_HEADERS+=	push_heap.h
 ALG_HEADERS+=	ranges_adjacent_find.h
 ALG_HEADERS+=	ranges_all_of.h
@@ -370,6 +352,7 @@ ALG_HEADERS+=	ranges_any_of.h
 ALG_HEADERS+=	ranges_binary_search.h
 ALG_HEADERS+=	ranges_clamp.h
 ALG_HEADERS+=	ranges_contains.h
+ALG_HEADERS+=	ranges_contains_subrange.h
 ALG_HEADERS+=	ranges_copy.h
 ALG_HEADERS+=	ranges_copy_backward.h
 ALG_HEADERS+=	ranges_copy_if.h
@@ -386,6 +369,7 @@ ALG_HEADERS+=	ranges_find_end.h
 ALG_HEADERS+=	ranges_find_first_of.h
 ALG_HEADERS+=	ranges_find_if.h
 ALG_HEADERS+=	ranges_find_if_not.h
+ALG_HEADERS+=	ranges_find_last.h
 ALG_HEADERS+=	ranges_for_each.h
 ALG_HEADERS+=	ranges_for_each_n.h
 ALG_HEADERS+=	ranges_generate.h
@@ -476,6 +460,7 @@ ALG_HEADERS+=	shift_left.h
 ALG_HEADERS+=	shift_right.h
 ALG_HEADERS+=	shuffle.h
 ALG_HEADERS+=	sift_down.h
+ALG_HEADERS+=	simd_utils.h
 ALG_HEADERS+=	sort.h
 ALG_HEADERS+=	sort_heap.h
 ALG_HEADERS+=	stable_partition.h
@@ -493,31 +478,6 @@ 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
@@ -526,6 +486,7 @@ ATM_HEADERS+=	atomic_base.h
 ATM_HEADERS+=	atomic_flag.h
 ATM_HEADERS+=	atomic_init.h
 ATM_HEADERS+=	atomic_lock_free.h
+ATM_HEADERS+=	atomic_ref.h
 ATM_HEADERS+=	atomic_sync.h
 ATM_HEADERS+=	check_memory_order.h
 ATM_HEADERS+=	contention_t.h
@@ -534,6 +495,7 @@ ATM_HEADERS+=	fence.h
 ATM_HEADERS+=	is_always_lock_free.h
 ATM_HEADERS+=	kill_dependency.h
 ATM_HEADERS+=	memory_order.h
+ATM_HEADERS+=	to_gcc_order.h
 .for hdr in ${ATM_HEADERS}
 ATM+=		${HDRDIR}/__atomic/${hdr}
 .endfor
@@ -582,11 +544,14 @@ CHR_HEADERS+=	convert_to_timespec.h
 CHR_HEADERS+=	convert_to_tm.h
 CHR_HEADERS+=	day.h
 CHR_HEADERS+=	duration.h
+CHR_HEADERS+=	exception.h
 CHR_HEADERS+=	file_clock.h
 CHR_HEADERS+=	formatter.h
 CHR_HEADERS+=	hh_mm_ss.h
 CHR_HEADERS+=	high_resolution_clock.h
+CHR_HEADERS+=	leap_second.h
 CHR_HEADERS+=	literals.h
+CHR_HEADERS+=	local_info.h
 CHR_HEADERS+=	month.h
 CHR_HEADERS+=	month_weekday.h
 CHR_HEADERS+=	monthday.h
@@ -594,8 +559,11 @@ CHR_HEADERS+=	ostream.h
 CHR_HEADERS+=	parser_std_format_spec.h
 CHR_HEADERS+=	statically_widen.h
 CHR_HEADERS+=	steady_clock.h
+CHR_HEADERS+=	sys_info.h
 CHR_HEADERS+=	system_clock.h
 CHR_HEADERS+=	time_point.h
+CHR_HEADERS+=	time_zone.h
+CHR_HEADERS+=	time_zone_link.h
 CHR_HEADERS+=	tzdb.h
 CHR_HEADERS+=	tzdb_list.h
 CHR_HEADERS+=	weekday.h
@@ -603,6 +571,7 @@ CHR_HEADERS+=	year.h
 CHR_HEADERS+=	year_month.h
 CHR_HEADERS+=	year_month_day.h
 CHR_HEADERS+=	year_month_weekday.h
+CHR_HEADERS+=	zoned_time.h
 .for hdr in ${CHR_HEADERS}
 CHR+=		${HDRDIR}/__chrono/${hdr}
 .endfor
@@ -661,6 +630,17 @@ CND_HEADERS+=	condition_variable.h
 CND+=		${HDRDIR}/__condition_variable/${hdr}
 .endfor
 
+INCSGROUPS+=	CNF
+CNFDIR=		${CXXINCLUDEDIR}/__configuration
+CNF_HEADERS+=	abi.h
+CNF_HEADERS+=	availability.h
+CNF_HEADERS+=	compiler.h
+CNF_HEADERS+=	language.h
+CNF_HEADERS+=	platform.h
+.for hdr in ${CNF_HEADERS}
+CNF+=		${HDRDIR}/__configuration/${hdr}
+.endfor
+
 INCSGROUPS+=	COR
 CORDIR=		${CXXINCLUDEDIR}/__coroutine
 COR_HEADERS+=	coroutine_handle.h
@@ -674,6 +654,7 @@ COR+=		${HDRDIR}/__coroutine/${hdr}
 INCSGROUPS+=	DBG
 DBGDIR=		${CXXINCLUDEDIR}/__debug_utils
 DBG_HEADERS+=	randomize_range.h
+DBG_HEADERS+=	sanitizers.h
 DBG_HEADERS+=	strict_weak_ordering_check.h
 .for hdr in ${DBG_HEADERS}
 DBG+=		${HDRDIR}/__debug_utils/${hdr}
@@ -736,7 +717,6 @@ FMT_HEADERS+=	format_args.h
 FMT_HEADERS+=	format_context.h
 FMT_HEADERS+=	format_error.h
 FMT_HEADERS+=	format_functions.h
-FMT_HEADERS+=	format_fwd.h
 FMT_HEADERS+=	format_parse_context.h
 FMT_HEADERS+=	format_string.h
 FMT_HEADERS+=	format_to_n_result.h
@@ -750,6 +730,7 @@ FMT_HEADERS+=	formatter_output.h
 FMT_HEADERS+=	formatter_pointer.h
 FMT_HEADERS+=	formatter_string.h
 FMT_HEADERS+=	formatter_tuple.h
+FMT_HEADERS+=	indic_conjunct_break_table.h
 FMT_HEADERS+=	parser_std_format_spec.h
 FMT_HEADERS+=	range_default_formatter.h
 FMT_HEADERS+=	range_formatter.h
@@ -797,22 +778,28 @@ INCSGROUPS+=	FWD
 FWDDIR=		${CXXINCLUDEDIR}/__fwd
 FWD_HEADERS+=	array.h
 FWD_HEADERS+=	bit_reference.h
+FWD_HEADERS+=	complex.h
+FWD_HEADERS+=	deque.h
+FWD_HEADERS+=	format.h
 FWD_HEADERS+=	fstream.h
-FWD_HEADERS+=	get.h
-FWD_HEADERS+=	hash.h
+FWD_HEADERS+=	functional.h
 FWD_HEADERS+=	ios.h
 FWD_HEADERS+=	istream.h
 FWD_HEADERS+=	mdspan.h
+FWD_HEADERS+=	memory.h
 FWD_HEADERS+=	memory_resource.h
 FWD_HEADERS+=	ostream.h
 FWD_HEADERS+=	pair.h
+FWD_HEADERS+=	queue.h
 FWD_HEADERS+=	span.h
 FWD_HEADERS+=	sstream.h
+FWD_HEADERS+=	stack.h
 FWD_HEADERS+=	streambuf.h
 FWD_HEADERS+=	string.h
 FWD_HEADERS+=	string_view.h
 FWD_HEADERS+=	subrange.h
 FWD_HEADERS+=	tuple.h
+FWD_HEADERS+=	vector.h
 .for hdr in ${FWD_HEADERS}
 FWD+=		${HDRDIR}/__fwd/${hdr}
 .endfor
@@ -828,6 +815,7 @@ INCSGROUPS+=	IT
 ITDIR=		${CXXINCLUDEDIR}/__iterator
 IT_HEADERS+=	access.h
 IT_HEADERS+=	advance.h
+IT_HEADERS+=	aliasing_iterator.h
 IT_HEADERS+=	back_insert_iterator.h
 IT_HEADERS+=	bounded_iter.h
 IT_HEADERS+=	common_iterator.h
@@ -872,6 +860,13 @@ IT_HEADERS+=	wrap_iter.h
 IT+=		${HDRDIR}/__iterator/${hdr}
 .endfor
 
+INCSGROUPS+=	LOC
+LOCDIR=		${CXXINCLUDEDIR}/__locale_dir
+LOC_HEADERS+=	locale_base_api.h
+.for hdr in ${LOC_HEADERS}
+LOC+=		${HDRDIR}/__locale_dir/${hdr}
+.endfor
+
 INCSGROUPS+=	LBA
 LBADIR=		${CXXINCLUDEDIR}/__locale_dir/locale_base_api
 LBA_HEADERS+=	bsd_locale_defaults.h
@@ -900,6 +895,7 @@ MAT_HEADERS+=	modulo.h
 MAT_HEADERS+=	remainder.h
 MAT_HEADERS+=	roots.h
 MAT_HEADERS+=	rounding_functions.h
+MAT_HEADERS+=	special_functions.h
 MAT_HEADERS+=	traits.h
 MAT_HEADERS+=	trigonometric_functions.h
 .for hdr in ${MAT_HEADERS}
@@ -936,6 +932,8 @@ MEM_HEADERS+=	compressed_pair.h
 MEM_HEADERS+=	concepts.h
 MEM_HEADERS+=	construct_at.h
 MEM_HEADERS+=	destruct_n.h
+MEM_HEADERS+=	inout_ptr.h
+MEM_HEADERS+=	out_ptr.h
 MEM_HEADERS+=	pointer_traits.h
 MEM_HEADERS+=	ranges_construct_at.h
 MEM_HEADERS+=	ranges_uninitialized_algorithms.h
@@ -987,8 +985,7 @@ 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+=	pstl.h
 NUM_HEADERS+=	reduce.h
 NUM_HEADERS+=	saturation_arithmetic.h
 NUM_HEADERS+=	transform_exclusive_scan.h
@@ -998,6 +995,49 @@ NUM_HEADERS+=	transform_reduce.h
 NUM+=		${HDRDIR}/__numeric/${hdr}
 .endfor
 
+INCSGROUPS+=	OST
+OSTDIR=		${CXXINCLUDEDIR}/__ostream
+OST_HEADERS+=	basic_ostream.h
+OST_HEADERS+=	print.h
+.for hdr in ${OST_HEADERS}
+OST+=		${HDRDIR}/__ostream/${hdr}
+.endfor
+
+INCSGROUPS+=	PST
+PSTDIR=		${CXXINCLUDEDIR}/__pstl
+PST_HEADERS+=	backend.h
+PST_HEADERS+=	backend_fwd.h
+PST_HEADERS+=	dispatch.h
+PST_HEADERS+=	handle_exception.h
+.for hdr in ${PST_HEADERS}
+PST+=		${HDRDIR}/__pstl/${hdr}
+.endfor
+
+INCSGROUPS+=	PSB
+PSBDIR=		${CXXINCLUDEDIR}/__pstl/backends
+PSB_HEADERS+=	default.h
+PSB_HEADERS+=	libdispatch.h
+PSB_HEADERS+=	serial.h
+PSB_HEADERS+=	std_thread.h
+.for hdr in ${PSB_HEADERS}
+PSB+=		${HDRDIR}/__pstl/backends/${hdr}
+.endfor
+
+INCSGROUPS+=	PSC
+PSCDIR=		${CXXINCLUDEDIR}/__pstl/cpu_algos
+PSC_HEADERS+=	any_of.h
+PSC_HEADERS+=	cpu_traits.h
+PSC_HEADERS+=	fill.h
+PSC_HEADERS+=	find_if.h
+PSC_HEADERS+=	for_each.h
+PSC_HEADERS+=	merge.h
+PSC_HEADERS+=	stable_sort.h
+PSC_HEADERS+=	transform.h
+PSC_HEADERS+=	transform_reduce.h
+.for hdr in ${PSC_HEADERS}
+PSC+=		${HDRDIR}/__pstl/cpu_algos/${hdr}
+.endfor
+
 INCSGROUPS+=	RND
 RNDDIR=		${CXXINCLUDEDIR}/__random
 RND_HEADERS+=	bernoulli_distribution.h
@@ -1129,6 +1169,7 @@ THR_HEADERS+=	formatter.h
 THR_HEADERS+=	id.h
 THR_HEADERS+=	jthread.h
 THR_HEADERS+=	poll_with_backoff.h
+THR_HEADERS+=	support.h
 THR_HEADERS+=	this_thread.h
 THR_HEADERS+=	thread.h
 THR_HEADERS+=	timed_backoff_policy.h
@@ -1136,15 +1177,27 @@ THR_HEADERS+=	timed_backoff_policy.h
 THR+=		${HDRDIR}/__thread/${hdr}
 .endfor
 
+INCSGROUPS+=	THS
+THSDIR=		${CXXINCLUDEDIR}/__thread/support
+THS_HEADERS+=	c11.h
+THS_HEADERS+=	external.h
+THS_HEADERS+=	pthread.h
+THS_HEADERS+=	windows.h
+.for hdr in ${THS_HEADERS}
+THS+=		${HDRDIR}/__thread/support/${hdr}
+.endfor
+
 INCSGROUPS+=	TUP
 TUPDIR=		${CXXINCLUDEDIR}/__tuple
+TUP_HEADERS+=	find_index.h
+TUP_HEADERS+=	ignore.h
 TUP_HEADERS+=	make_tuple_types.h
-TUP_HEADERS+=	pair_like.h
 TUP_HEADERS+=	sfinae_helpers.h
 TUP_HEADERS+=	tuple_element.h
 TUP_HEADERS+=	tuple_indices.h
 TUP_HEADERS+=	tuple_like.h
 TUP_HEADERS+=	tuple_like_ext.h
+TUP_HEADERS+=	tuple_like_no_subrange.h
 TUP_HEADERS+=	tuple_size.h
 TUP_HEADERS+=	tuple_types.h
 .for hdr in ${TUP_HEADERS}
@@ -1162,7 +1215,6 @@ TTR_HEADERS+=	add_volatile.h
 TTR_HEADERS+=	aligned_storage.h
 TTR_HEADERS+=	aligned_union.h
 TTR_HEADERS+=	alignment_of.h
-TTR_HEADERS+=	apply_cv.h
 TTR_HEADERS+=	can_extract_key.h
 TTR_HEADERS+=	common_reference.h
 TTR_HEADERS+=	common_type.h
@@ -1173,6 +1225,7 @@ TTR_HEADERS+=	copy_cvref.h
 TTR_HEADERS+=	datasizeof.h
 TTR_HEADERS+=	decay.h
 TTR_HEADERS+=	dependent_type.h
+TTR_HEADERS+=	desugars_to.h
 TTR_HEADERS+=	disjunction.h
 TTR_HEADERS+=	enable_if.h
 TTR_HEADERS+=	extent.h
@@ -1197,10 +1250,7 @@ TTR_HEADERS+=	is_const.h
 TTR_HEADERS+=	is_constant_evaluated.h
 TTR_HEADERS+=	is_constructible.h
 TTR_HEADERS+=	is_convertible.h
-TTR_HEADERS+=	is_copy_assignable.h
-TTR_HEADERS+=	is_copy_constructible.h
 TTR_HEADERS+=	is_core_convertible.h
-TTR_HEADERS+=	is_default_constructible.h
 TTR_HEADERS+=	is_destructible.h
 TTR_HEADERS+=	is_empty.h
 TTR_HEADERS+=	is_enum.h
@@ -1213,20 +1263,11 @@ TTR_HEADERS+=	is_fundamental.h
 TTR_HEADERS+=	is_implicitly_default_constructible.h
 TTR_HEADERS+=	is_integral.h
 TTR_HEADERS+=	is_literal_type.h
-TTR_HEADERS+=	is_member_function_pointer.h
-TTR_HEADERS+=	is_member_object_pointer.h
 TTR_HEADERS+=	is_member_pointer.h
-TTR_HEADERS+=	is_move_assignable.h
-TTR_HEADERS+=	is_move_constructible.h
 TTR_HEADERS+=	is_nothrow_assignable.h
 TTR_HEADERS+=	is_nothrow_constructible.h
 TTR_HEADERS+=	is_nothrow_convertible.h
-TTR_HEADERS+=	is_nothrow_copy_assignable.h
-TTR_HEADERS+=	is_nothrow_copy_constructible.h
-TTR_HEADERS+=	is_nothrow_default_constructible.h
 TTR_HEADERS+=	is_nothrow_destructible.h
-TTR_HEADERS+=	is_nothrow_move_assignable.h
-TTR_HEADERS+=	is_nothrow_move_constructible.h
 TTR_HEADERS+=	is_null_pointer.h
 TTR_HEADERS+=	is_object.h
 TTR_HEADERS+=	is_pod.h
@@ -1238,7 +1279,6 @@ TTR_HEADERS+=	is_reference_wrapper.h
 TTR_HEADERS+=	is_referenceable.h
 TTR_HEADERS+=	is_same.h
 TTR_HEADERS+=	is_scalar.h
-TTR_HEADERS+=	is_scoped_enum.h
 TTR_HEADERS+=	is_signed.h
 TTR_HEADERS+=	is_signed_integer.h
 TTR_HEADERS+=	is_specialization.h
@@ -1247,14 +1287,10 @@ TTR_HEADERS+=	is_swappable.h
 TTR_HEADERS+=	is_trivial.h
 TTR_HEADERS+=	is_trivially_assignable.h
 TTR_HEADERS+=	is_trivially_constructible.h
-TTR_HEADERS+=	is_trivially_copy_assignable.h
-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_trivially_relocatable.h
 TTR_HEADERS+=	is_unbounded_array.h
 TTR_HEADERS+=	is_union.h
 TTR_HEADERS+=	is_unsigned.h
@@ -1271,7 +1307,6 @@ 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+=	promote.h
 TTR_HEADERS+=	rank.h
 TTR_HEADERS+=	remove_all_extents.h
@@ -1310,11 +1345,13 @@ UTL_HEADERS+=	forward_like.h
 UTL_HEADERS+=	in_place.h
 UTL_HEADERS+=	integer_sequence.h
 UTL_HEADERS+=	is_pointer_in_range.h
+UTL_HEADERS+=	is_valid_range.h
 UTL_HEADERS+=	move.h
 UTL_HEADERS+=	no_destroy.h
 UTL_HEADERS+=	pair.h
 UTL_HEADERS+=	piecewise_construct.h
 UTL_HEADERS+=	priority_tag.h
+UTL_HEADERS+=	private_constructor_tag.h
 UTL_HEADERS+=	rel_ops.h
 UTL_HEADERS+=	small_buffer.h
 UTL_HEADERS+=	swap.h
@@ -1334,7 +1371,6 @@ VAR+=		${HDRDIR}/__variant/${hdr}
 INCSGROUPS+=	EXP
 EXPDIR=		${CXXINCLUDEDIR}/experimental
 EXP_HEADERS+=	__config
-EXP_HEADERS+=	__memory
 EXP_HEADERS+=	iterator
 EXP_HEADERS+=	memory
 EXP_HEADERS+=	propagate_const