[libcxx-commits] [libcxx] 9185d6e - [libc++] Avoids self references in transitive include test.
Mark de Wever via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Sep 1 11:33:51 PDT 2022
Author: Mark de Wever
Date: 2022-09-01T20:33:37+02:00
New Revision: 9185d6e6bca8ec41b48661c371e813498f840455
URL: https://github.com/llvm/llvm-project/commit/9185d6e6bca8ec41b48661c371e813498f840455
DIFF: https://github.com/llvm/llvm-project/commit/9185d6e6bca8ec41b48661c371e813498f840455.diff
LOG: [libc++] Avoids self references in transitive include test.
The output of --trace-includes starts with the header whose includes are
being processed. Since the sanitize script processed all lines this
include was added to the list of transitive includes. This looks odd
since it implies all headers have a cyclic dependency on themselves.
This change removes this self-include.
Instead of just dropping the first line extract that header and use it
to guard against cyclic dependencies in the header itself.
The regex used has a small improvement; don't capture groups that aren't
extracted.
Depends on D132284
Reviewed By: ldionne, #libc
Differential Revision: https://reviews.llvm.org/D132787
Added:
Modified:
libcxx/test/libcxx/transitive_includes.sanitize.py
libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
libcxx/test/libcxx/transitive_includes/cxx03/expected.any
libcxx/test/libcxx/transitive_includes/cxx03/expected.array
libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
libcxx/test/libcxx/transitive_includes/cxx03/expected.format
libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
libcxx/test/libcxx/transitive_includes/cxx03/expected.future
libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
libcxx/test/libcxx/transitive_includes/cxx03/expected.list
libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
libcxx/test/libcxx/transitive_includes/cxx03/expected.map
libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
libcxx/test/libcxx/transitive_includes/cxx03/expected.new
libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
libcxx/test/libcxx/transitive_includes/cxx03/expected.random
libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
libcxx/test/libcxx/transitive_includes/cxx03/expected.set
libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
libcxx/test/libcxx/transitive_includes/cxx03/expected.span
libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
libcxx/test/libcxx/transitive_includes/cxx03/expected.string
libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set
libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
libcxx/test/libcxx/transitive_includes/cxx03/expected.version
libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
libcxx/test/libcxx/transitive_includes/cxx11/expected.any
libcxx/test/libcxx/transitive_includes/cxx11/expected.array
libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
libcxx/test/libcxx/transitive_includes/cxx11/expected.format
libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
libcxx/test/libcxx/transitive_includes/cxx11/expected.future
libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
libcxx/test/libcxx/transitive_includes/cxx11/expected.list
libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
libcxx/test/libcxx/transitive_includes/cxx11/expected.map
libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
libcxx/test/libcxx/transitive_includes/cxx11/expected.new
libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
libcxx/test/libcxx/transitive_includes/cxx11/expected.random
libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
libcxx/test/libcxx/transitive_includes/cxx11/expected.set
libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
libcxx/test/libcxx/transitive_includes/cxx11/expected.span
libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
libcxx/test/libcxx/transitive_includes/cxx11/expected.string
libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
libcxx/test/libcxx/transitive_includes/cxx11/expected.version
libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
libcxx/test/libcxx/transitive_includes/cxx14/expected.any
libcxx/test/libcxx/transitive_includes/cxx14/expected.array
libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
libcxx/test/libcxx/transitive_includes/cxx14/expected.format
libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
libcxx/test/libcxx/transitive_includes/cxx14/expected.future
libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
libcxx/test/libcxx/transitive_includes/cxx14/expected.list
libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
libcxx/test/libcxx/transitive_includes/cxx14/expected.map
libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
libcxx/test/libcxx/transitive_includes/cxx14/expected.new
libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
libcxx/test/libcxx/transitive_includes/cxx14/expected.random
libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
libcxx/test/libcxx/transitive_includes/cxx14/expected.set
libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
libcxx/test/libcxx/transitive_includes/cxx14/expected.span
libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
libcxx/test/libcxx/transitive_includes/cxx14/expected.string
libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
libcxx/test/libcxx/transitive_includes/cxx14/expected.version
libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
libcxx/test/libcxx/transitive_includes/cxx17/expected.any
libcxx/test/libcxx/transitive_includes/cxx17/expected.array
libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
libcxx/test/libcxx/transitive_includes/cxx17/expected.format
libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
libcxx/test/libcxx/transitive_includes/cxx17/expected.future
libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
libcxx/test/libcxx/transitive_includes/cxx17/expected.list
libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
libcxx/test/libcxx/transitive_includes/cxx17/expected.map
libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
libcxx/test/libcxx/transitive_includes/cxx17/expected.new
libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
libcxx/test/libcxx/transitive_includes/cxx17/expected.random
libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
libcxx/test/libcxx/transitive_includes/cxx17/expected.set
libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
libcxx/test/libcxx/transitive_includes/cxx17/expected.span
libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
libcxx/test/libcxx/transitive_includes/cxx17/expected.string
libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
libcxx/test/libcxx/transitive_includes/cxx17/expected.version
libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
libcxx/test/libcxx/transitive_includes/cxx20/expected.any
libcxx/test/libcxx/transitive_includes/cxx20/expected.array
libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
libcxx/test/libcxx/transitive_includes/cxx20/expected.format
libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
libcxx/test/libcxx/transitive_includes/cxx20/expected.future
libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
libcxx/test/libcxx/transitive_includes/cxx20/expected.list
libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
libcxx/test/libcxx/transitive_includes/cxx20/expected.map
libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
libcxx/test/libcxx/transitive_includes/cxx20/expected.new
libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
libcxx/test/libcxx/transitive_includes/cxx20/expected.random
libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
libcxx/test/libcxx/transitive_includes/cxx20/expected.set
libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
libcxx/test/libcxx/transitive_includes/cxx20/expected.span
libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
libcxx/test/libcxx/transitive_includes/cxx20/expected.string
libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
libcxx/test/libcxx/transitive_includes/cxx20/expected.version
libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
Removed:
################################################################################
diff --git a/libcxx/test/libcxx/transitive_includes.sanitize.py b/libcxx/test/libcxx/transitive_includes.sanitize.py
index c692fd3772b52..26dd4e2a23944 100755
--- a/libcxx/test/libcxx/transitive_includes.sanitize.py
+++ b/libcxx/test/libcxx/transitive_includes.sanitize.py
@@ -11,28 +11,66 @@
# Specifically, it looks for lines of the form 'c++/v1/header' where 'header' is the name
# of a public C++ header, excluding C compatibility headers.
+# The input looks like
+#. ${build_dir}/include/c++/v1/algorithm
+#.. ${build_dir}/include/c++/v1/__assert
+#... ${build_dir}/include/c++/v1/__config
+#.... ${build_dir}/include/c++/v1/__config_site
+#.... /usr/include/features.h
+#..... /usr/include/stdc-predef.h
+#..... /usr/include/x86_64-linux-gnu/sys/cdefs.h
+#...... /usr/include/x86_64-linux-gnu/bits/wordsize.h
+# <snip>
+#.... ${build_dir}/include/c++/v1/version
+#.... ${build_dir}/include/c++/v1/stddef.h
+#..... /usr/lib/llvm-15/lib/clang/15.0.0/include/stddef.h
+#...... /usr/lib/llvm-15/lib/clang/15.0.0/include/__stddef_max_align_t.h
+#... ${build_dir}/include/c++/v1/type_traits
+# <more>
+
+# The first line matched libc++ header contains the name of the header being
+# evaluated. The might be other headers before, for example ASAN adds
+# additional headers. The filtered output will be like:
+# version
+# type_traits
+
import os
import re
import sys
+# Determine the top-level header in the input.
+top_level_header = None
+while True:
+ line = sys.stdin.readline()
+ # On Windows, the path separators can either be forward slash or backslash.
+ # If it is a backslash, Clang prints it escaped as two consecutive
+ # backslashes, and they need to be escaped in the RE. (Use a raw string for
+ # the pattern to avoid needing another level of escaping on the Python string
+ # literal level.)
+ match = re.match(
+ r". .*(?:/|\\\\)include(?:/|\\\\)c\+\+(?:/|\\\\)v[0-9]+(?:/|\\\\)(.+)", line
+ )
+ if match:
+ top_level_header = match.group(1)
+ break
+
+# Filter out non Standard transitive includes.
headers = []
for line in sys.stdin.readlines():
- # On Windows, the path separators can either be forward slash or backslash.
- # If it is a backslash, Clang prints it escaped as two consecutive
- # backslashes, and they need to be escaped in the RE. (Use a raw string for
- # the pattern to avoid needing another level of escaping on the Python string
- # literal level.)
- match = re.search(r'c\+\+(/|\\\\)v[0-9]+(/|\\\\)(.+)', line)
- if not match:
- continue
+ match = re.search(r"c\+\+(?:/|\\\\)v[0-9]+(?:/|\\\\)(.+)", line)
+ if not match:
+ continue
+
+ header = match.group(1)
+ if os.path.basename(header).endswith(".h"): # Skip C headers
+ continue
- header = match.group(3)
- if os.path.basename(header).endswith('.h'): # Skip C headers
- continue
+ if os.path.basename(header).startswith("__"): # Skip internal headers
+ continue
- if os.path.basename(header).startswith('__'): # Skip internal headers
- continue
+ if header == top_level_header:
+ sys.exit(f"Cyclic dependency in header {header}")
- headers.append(header)
+ headers.append(header)
-print('\n'.join(sorted(set(headers))))
+print("\n".join(sorted(set(headers))))
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
index 944a3eeea2d64..ece47497507b2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
atomic
bit
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.any b/libcxx/test/libcxx/transitive_includes/cxx03/expected.any
index 86009188e53e3..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.any
@@ -1,4 +1,3 @@
-any
atomic
chrono
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.array b/libcxx/test/libcxx/transitive_includes/cxx03/expected.array
index 7145642a8f46e..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.array
@@ -1,5 +1,4 @@
algorithm
-array
atomic
bit
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
index 3e9917b3da1a0..4206ba1eee44e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
@@ -1,4 +1,3 @@
-atomic
chrono
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
index c2865c8d3ef09..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
@@ -1,5 +1,4 @@
atomic
-barrier
chrono
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
index 4fb5285f8142e..e53db43d769bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
@@ -1,4 +1,3 @@
-bit
cstddef
cstdint
cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
index 3cf3e8dbdfc73..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
@@ -2,7 +2,6 @@ algorithm
array
atomic
bit
-bitset
cctype
chrono
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
index 69b779ef2f206..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
index 98bf9a8010e40..64161c1d331fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
@@ -3,7 +3,6 @@ array
atomic
bit
bitset
-ccomplex
cctype
cerrno
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
index a82e62c088dce..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
index 24c00a9877c3b..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
index 9980586372456..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
index 3bb5aa14cfbfe..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
index 1ab0e5d37a401..458696c3a73ff 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
@@ -1,5 +1,4 @@
cerrno
-charconv
cmath
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
index fdb624bc1df42..9f1521d4d4835 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
@@ -1,4 +1,3 @@
-chrono
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
index 911d5dd27d082..37103a4f4b892 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
index 6c1d5458c9c9c..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
index 271e000221016..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
index 0ac42c4b403ed..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
index 7678c0e38802c..49fcbf44c5b21 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
@@ -1,4 +1,3 @@
-cmath
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
index 0931ca137c0bd..4d101cb290c16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
@@ -7,7 +7,6 @@ cerrno
chrono
climits
cmath
-codecvt
compare
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
index df2d92f5d4b6c..7678c0e38802c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
@@ -1,5 +1,4 @@
cmath
-compare
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
index 64161c1d331fe..1724fbdde39ed 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
@@ -9,7 +9,6 @@ chrono
climits
cmath
compare
-complex
concepts
cstdarg
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
index 31e9f436e6cd3..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
@@ -1,4 +1,3 @@
-concepts
cstddef
cstdint
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
index 968007a37cef8..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
@@ -9,7 +9,6 @@ climits
cmath
compare
concepts
-condition_variable
cstddef
cstdint
cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
index 8dd332d472542..afddf59ae6bf5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
@@ -1,6 +1,5 @@
cmath
compare
-coroutine
cstddef
cstdint
cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
index 2f72e67f0324d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
index c17f2a3b99dfb..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
index ce71517eeb149..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
index f3a52bba86c16..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
index 7b45506ea14b3..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
@@ -1,2 +1 @@
-cstddef
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
index 37103a4f4b892..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
index 5b70aa3cf8d42..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
index b98a7237dde79..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
index 0fdbe597c9df1..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
index 7467a5ab59520..98bf9a8010e40 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
@@ -18,7 +18,6 @@ cstdint
cstdio
cstdlib
cstring
-ctgmath
ctime
cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
index ee049c40b25b3..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
index 588664ab50b3f..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
index 1e6c2091fa4a0..fa1b7f2569941 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
@@ -1,3 +1,2 @@
cctype
-cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
index fa1b7f2569941..a82e62c088dce 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
@@ -1,2 +1 @@
cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
index c26bdc7479b64..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
@@ -12,7 +12,6 @@ cstdint
cstdlib
cstring
ctime
-deque
exception
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
index c48f9ed9e744d..4c4515dcec7d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
@@ -1,6 +1,5 @@
cstddef
cstdint
cstdlib
-exception
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
index b42e7095b5800..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
@@ -1,2 +1 @@
-execution
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
index 8a5cd7de65d88..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/algorithm
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
index 682f0fa0e7a83..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/coroutine
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
index bd86d1588beb1..e9b93fcc7c91e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
@@ -14,7 +14,6 @@ cstring
ctime
deque
exception
-experimental/deque
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
index c43fab08b41f3..e1ba276ab7ef9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/forward_list
experimental/memory_resource
experimental/utility
forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
index 87cee2d288827..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/functional
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
index 14d31c215ffb7..447087a3f6f96 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
@@ -6,7 +6,6 @@ cstdint
cstdlib
cstring
exception
-experimental/iterator
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
index ac800654f5323..ed186faf929c5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/list
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
index d132098b01a1b..179b5b76d6f6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/map
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
index 94d9abd26b6cb..064d3eab47aef 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/memory_resource
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
index a78fa83bc983f..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
cstddef
cstdint
-experimental/propagate_const
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex
index 8a49aac962c25..3c525e1b4a9d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex
@@ -20,7 +20,6 @@ cwctype
deque
exception
experimental/memory_resource
-experimental/regex
experimental/string
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
index f1d2953360dc6..21d59c287aca1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
index f06f6e9cea012..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/simd
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
index 367a9ed7da4bb..46dcb1d1a6282 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
@@ -18,7 +18,6 @@ cwchar
cwctype
exception
experimental/memory_resource
-experimental/string
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
index 1e6fdfeb25cfc..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
@@ -1 +1 @@
-experimental/type_traits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
index 16753ae30a7b3..251dd7013fd2f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_map
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
index 1aafa61386b74..c678f3985291a 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
index a399b3ebb27c6..799a14724cf41 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
@@ -3,7 +3,6 @@ compare
cstddef
cstdint
cstdlib
-experimental/utility
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
index 1c569628be18e..a97f08e050a8f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
@@ -14,7 +14,6 @@ ctime
exception
experimental/memory_resource
experimental/utility
-experimental/vector
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
index 459536294e0c1..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
@@ -17,7 +17,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_map
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
index 160335aab3676..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
@@ -17,7 +17,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_set
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
index 22e80bc111922..39829086f4cb1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
@@ -20,7 +20,6 @@ ctime
cwchar
cwctype
exception
-filesystem
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.format b/libcxx/test/libcxx/transitive_includes/cxx03/expected.format
index 08d46d27a9c04..efe2c926890e3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.format
@@ -20,7 +20,6 @@ ctime
cwchar
cwctype
exception
-format
functional
initializer_list
ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
index 33afc74bd420a..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-forward_list
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
index 7a892e11bfe61..22e80bc111922 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
@@ -21,7 +21,6 @@ cwchar
cwctype
exception
filesystem
-fstream
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
index 7625982373f82..a202e549334ae 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-functional
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.future b/libcxx/test/libcxx/transitive_includes/cxx03/expected.future
index 92bd4e044ecc3..0bffec1c88f36 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.future
@@ -19,7 +19,6 @@ cwchar
cwctype
exception
functional
-future
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
index 8b92a6553ca19..7b45506ea14b3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
@@ -1,3 +1,2 @@
cstddef
-initializer_list
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
index 39829086f4cb1..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
@@ -22,7 +22,6 @@ cwctype
exception
functional
initializer_list
-iomanip
ios
iosfwd
istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
index 6e7e5b2689767..4d101cb290c16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
@@ -20,7 +20,6 @@ cwctype
exception
functional
initializer_list
-ios
iosfwd
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
index ff6e0e3d092b7..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
index 580aeaf867341..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
@@ -24,7 +24,6 @@ functional
initializer_list
ios
iosfwd
-iostream
istream
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
index fd0c4b4ca7361..762d13c26ac3c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
@@ -24,7 +24,6 @@ functional
initializer_list
ios
iosfwd
-istream
iterator
limits
locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
index 447087a3f6f96..f6043d7d3b1d4 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
@@ -8,7 +8,6 @@ cstring
exception
initializer_list
iosfwd
-iterator
limits
new
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
index a7a6bbc912cef..3e9917b3da1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
@@ -8,7 +8,6 @@ cstdint
cstring
ctime
iosfwd
-latch
limits
ratio
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
index 49fcbf44c5b21..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
@@ -1,5 +1,4 @@
cstddef
cstdint
-limits
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.list
index b596079c340b0..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.list
@@ -18,7 +18,6 @@ initializer_list
iosfwd
iterator
limits
-list
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
index 29719367689e4..a5ac726129c05 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
@@ -25,7 +25,6 @@ ios
iosfwd
iterator
limits
-locale
memory
mutex
new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.map
index c871579ea35ed..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.map
@@ -18,7 +18,6 @@ initializer_list
iosfwd
iterator
limits
-map
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
index f36910fde696d..9af31ba1b625d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
@@ -14,7 +14,6 @@ initializer_list
iosfwd
iterator
limits
-memory
new
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
index 4d101cb290c16..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
@@ -24,7 +24,6 @@ iosfwd
iterator
limits
memory
-mutex
new
optional
ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.new b/libcxx/test/libcxx/transitive_includes/cxx03/expected.new
index 9fd8f6aabd0c9..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.new
@@ -2,6 +2,5 @@ cstddef
cstdint
cstdlib
exception
-new
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
index a8b65fc82096b..31e9f436e6cd3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
@@ -1,6 +1,5 @@
concepts
cstddef
cstdint
-numbers
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
index 558b32457eb4c..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
@@ -20,7 +20,6 @@ iterator
limits
memory
new
-numeric
optional
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
index 993ce23d8009d..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
@@ -16,7 +16,6 @@ iterator
limits
memory
new
-optional
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
index 762d13c26ac3c..63afc93662e2e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
@@ -31,7 +31,6 @@ memory
mutex
new
optional
-ostream
ratio
stdexcept
streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
index 5861852fc5322..c26bdc7479b64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
@@ -22,7 +22,6 @@ limits
memory
new
optional
-queue
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.random b/libcxx/test/libcxx/transitive_includes/cxx03/expected.random
index 96a956ad800a1..67c6aa6723acf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.random
@@ -26,7 +26,6 @@ memory
new
numeric
optional
-random
ratio
stdexcept
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
index 3dbb13bb9680f..a46c30df88516 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
@@ -21,7 +21,6 @@ limits
memory
new
optional
-ranges
ratio
span
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
index deda945f1b575..29043403235fa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
@@ -1,6 +1,5 @@
climits
cstddef
cstdint
-ratio
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
index 76df207366621..4f3dd16a93887 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
@@ -29,7 +29,6 @@ mutex
new
optional
ratio
-regex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
index 22dcb319a5e67..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
@@ -17,7 +17,6 @@ limits
memory
new
ratio
-scoped_allocator
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
index d6802e25aa70d..3e9917b3da1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
@@ -10,6 +10,5 @@ ctime
iosfwd
limits
ratio
-semaphore
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.set
index 849e87331b725..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.set
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-set
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
index 81568d83b17c7..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
@@ -1,2 +1 @@
-shared_mutex
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.span b/libcxx/test/libcxx/transitive_includes/cxx03/expected.span
index a46c30df88516..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.span
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-span
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
index 1724fbdde39ed..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
@@ -34,7 +34,6 @@ new
optional
ostream
ratio
-sstream
stdexcept
streambuf
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
index 1a7d18cb85f24..c26bdc7479b64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
@@ -23,7 +23,6 @@ memory
new
optional
ratio
-stack
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
index b8dd684ffcbbf..e9e1b1a3af1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
@@ -3,6 +3,5 @@ cstdint
cstdlib
exception
iosfwd
-stdexcept
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
index a3001ce44a1bb..6e7e5b2689767 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
@@ -30,7 +30,6 @@ new
optional
ratio
stdexcept
-streambuf
string
string_view
system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string
index 0dacf739a7859..e814351725ef2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string
@@ -27,7 +27,6 @@ new
optional
ratio
stdexcept
-string
string_view
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
index e814351725ef2..138c1f54d41bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
@@ -27,7 +27,6 @@ new
optional
ratio
stdexcept
-string_view
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
index 782153b595b63..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
@@ -38,7 +38,6 @@ stdexcept
streambuf
string
string_view
-strstream
system_error
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
index 4101ee5209a39..8598675317389 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
@@ -30,7 +30,6 @@ ratio
stdexcept
string
string_view
-system_error
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
index ab8c3c7c85ba2..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
@@ -31,7 +31,6 @@ stdexcept
string
string_view
system_error
-thread
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
index 69858dc888c3b..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
@@ -8,7 +8,6 @@ initializer_list
iosfwd
limits
new
-tuple
type_traits
typeinfo
utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
index 8448275a1728c..fa3e26219e865 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
@@ -1,4 +1,3 @@
cstddef
cstdint
-type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
index 8f1c652535378..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
@@ -9,7 +9,6 @@ iosfwd
limits
new
type_traits
-typeindex
typeinfo
utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
index 609a604805c9b..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
@@ -3,5 +3,4 @@ cstdint
cstdlib
exception
type_traits
-typeinfo
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
index 2250cf96690a3..ba220443ca812 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
@@ -24,7 +24,6 @@ stdexcept
tuple
type_traits
typeinfo
-unordered_map
utility
variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set
index 9352f0b05b721..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set
@@ -27,7 +27,6 @@ tuple
type_traits
typeinfo
unordered_map
-unordered_set
utility
variant
vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
index 799a14724cf41..2f34f998b4faa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
@@ -7,5 +7,4 @@ initializer_list
iosfwd
limits
type_traits
-utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
index a069f37119fa8..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
@@ -28,7 +28,6 @@ type_traits
typeinfo
unordered_map
utility
-valarray
variant
vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
index d94d72974cb84..accc76242aff2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
@@ -13,5 +13,4 @@ tuple
type_traits
typeinfo
utility
-variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
index 5fb9d7d19cc12..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
@@ -25,5 +25,4 @@ type_traits
typeinfo
utility
variant
-vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.version b/libcxx/test/libcxx/transitive_includes/cxx03/expected.version
index 088eda41aa61d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
index 944a3eeea2d64..ece47497507b2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
atomic
bit
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.any b/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
index 86009188e53e3..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
@@ -1,4 +1,3 @@
-any
atomic
chrono
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.array b/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
index 7145642a8f46e..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
@@ -1,5 +1,4 @@
algorithm
-array
atomic
bit
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
index 3e9917b3da1a0..4206ba1eee44e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
@@ -1,4 +1,3 @@
-atomic
chrono
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
index c2865c8d3ef09..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
@@ -1,5 +1,4 @@
atomic
-barrier
chrono
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
index 4fb5285f8142e..e53db43d769bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
@@ -1,4 +1,3 @@
-bit
cstddef
cstdint
cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
index 3cf3e8dbdfc73..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
@@ -2,7 +2,6 @@ algorithm
array
atomic
bit
-bitset
cctype
chrono
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
index 69b779ef2f206..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
index 98bf9a8010e40..64161c1d331fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
@@ -3,7 +3,6 @@ array
atomic
bit
bitset
-ccomplex
cctype
cerrno
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
index a82e62c088dce..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
index 24c00a9877c3b..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
index 9980586372456..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
index 3bb5aa14cfbfe..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
index 1ab0e5d37a401..458696c3a73ff 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
@@ -1,5 +1,4 @@
cerrno
-charconv
cmath
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
index fdb624bc1df42..9f1521d4d4835 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
@@ -1,4 +1,3 @@
-chrono
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
index 911d5dd27d082..37103a4f4b892 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
index 6c1d5458c9c9c..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
index 271e000221016..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
index 0ac42c4b403ed..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
index 7678c0e38802c..49fcbf44c5b21 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
@@ -1,4 +1,3 @@
-cmath
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
index 0931ca137c0bd..4d101cb290c16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
@@ -7,7 +7,6 @@ cerrno
chrono
climits
cmath
-codecvt
compare
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
index df2d92f5d4b6c..7678c0e38802c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
@@ -1,5 +1,4 @@
cmath
-compare
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
index 64161c1d331fe..1724fbdde39ed 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
@@ -9,7 +9,6 @@ chrono
climits
cmath
compare
-complex
concepts
cstdarg
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
index 31e9f436e6cd3..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
@@ -1,4 +1,3 @@
-concepts
cstddef
cstdint
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
index 968007a37cef8..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
@@ -9,7 +9,6 @@ climits
cmath
compare
concepts
-condition_variable
cstddef
cstdint
cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
index 8dd332d472542..afddf59ae6bf5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
@@ -1,6 +1,5 @@
cmath
compare
-coroutine
cstddef
cstdint
cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
index 2f72e67f0324d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
index c17f2a3b99dfb..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
index ce71517eeb149..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
index f3a52bba86c16..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
index 7b45506ea14b3..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
@@ -1,2 +1 @@
-cstddef
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
index 37103a4f4b892..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
index 5b70aa3cf8d42..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
index b98a7237dde79..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
index 0fdbe597c9df1..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
index 7467a5ab59520..98bf9a8010e40 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
@@ -18,7 +18,6 @@ cstdint
cstdio
cstdlib
cstring
-ctgmath
ctime
cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
index ee049c40b25b3..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
index 588664ab50b3f..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
index 1e6c2091fa4a0..fa1b7f2569941 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
@@ -1,3 +1,2 @@
cctype
-cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
index fa1b7f2569941..a82e62c088dce 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
@@ -1,2 +1 @@
cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
index c26bdc7479b64..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
@@ -12,7 +12,6 @@ cstdint
cstdlib
cstring
ctime
-deque
exception
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
index c48f9ed9e744d..4c4515dcec7d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
@@ -1,6 +1,5 @@
cstddef
cstdint
cstdlib
-exception
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
index b42e7095b5800..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
@@ -1,2 +1 @@
-execution
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
index 8a5cd7de65d88..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/algorithm
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
index 682f0fa0e7a83..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/coroutine
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
index bd86d1588beb1..e9b93fcc7c91e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
@@ -14,7 +14,6 @@ cstring
ctime
deque
exception
-experimental/deque
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
index c43fab08b41f3..e1ba276ab7ef9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/forward_list
experimental/memory_resource
experimental/utility
forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
index 87cee2d288827..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/functional
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
index 14d31c215ffb7..447087a3f6f96 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
@@ -6,7 +6,6 @@ cstdint
cstdlib
cstring
exception
-experimental/iterator
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
index ac800654f5323..ed186faf929c5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/list
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
index d132098b01a1b..179b5b76d6f6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/map
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
index 94d9abd26b6cb..064d3eab47aef 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/memory_resource
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
index a78fa83bc983f..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
cstddef
cstdint
-experimental/propagate_const
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
index 8a49aac962c25..3c525e1b4a9d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
@@ -20,7 +20,6 @@ cwctype
deque
exception
experimental/memory_resource
-experimental/regex
experimental/string
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
index f1d2953360dc6..21d59c287aca1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
index f06f6e9cea012..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/simd
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
index 367a9ed7da4bb..46dcb1d1a6282 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
@@ -18,7 +18,6 @@ cwchar
cwctype
exception
experimental/memory_resource
-experimental/string
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
index 1e6fdfeb25cfc..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
@@ -1 +1 @@
-experimental/type_traits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
index 16753ae30a7b3..251dd7013fd2f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_map
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
index 1aafa61386b74..c678f3985291a 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
index a399b3ebb27c6..799a14724cf41 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
@@ -3,7 +3,6 @@ compare
cstddef
cstdint
cstdlib
-experimental/utility
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
index 1c569628be18e..a97f08e050a8f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
@@ -14,7 +14,6 @@ ctime
exception
experimental/memory_resource
experimental/utility
-experimental/vector
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
index 459536294e0c1..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
@@ -17,7 +17,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_map
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
index 160335aab3676..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
@@ -17,7 +17,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_set
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
index 22e80bc111922..39829086f4cb1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
@@ -20,7 +20,6 @@ ctime
cwchar
cwctype
exception
-filesystem
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.format b/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
index 08d46d27a9c04..efe2c926890e3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
@@ -20,7 +20,6 @@ ctime
cwchar
cwctype
exception
-format
functional
initializer_list
ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
index 33afc74bd420a..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-forward_list
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
index 7a892e11bfe61..22e80bc111922 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
@@ -21,7 +21,6 @@ cwchar
cwctype
exception
filesystem
-fstream
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
index 7625982373f82..a202e549334ae 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-functional
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.future b/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
index 92bd4e044ecc3..0bffec1c88f36 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
@@ -19,7 +19,6 @@ cwchar
cwctype
exception
functional
-future
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
index 8b92a6553ca19..7b45506ea14b3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
@@ -1,3 +1,2 @@
cstddef
-initializer_list
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
index 39829086f4cb1..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
@@ -22,7 +22,6 @@ cwctype
exception
functional
initializer_list
-iomanip
ios
iosfwd
istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
index 6e7e5b2689767..4d101cb290c16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
@@ -20,7 +20,6 @@ cwctype
exception
functional
initializer_list
-ios
iosfwd
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
index ff6e0e3d092b7..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
index 580aeaf867341..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
@@ -24,7 +24,6 @@ functional
initializer_list
ios
iosfwd
-iostream
istream
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
index fd0c4b4ca7361..762d13c26ac3c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
@@ -24,7 +24,6 @@ functional
initializer_list
ios
iosfwd
-istream
iterator
limits
locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
index 447087a3f6f96..f6043d7d3b1d4 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
@@ -8,7 +8,6 @@ cstring
exception
initializer_list
iosfwd
-iterator
limits
new
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
index a7a6bbc912cef..3e9917b3da1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
@@ -8,7 +8,6 @@ cstdint
cstring
ctime
iosfwd
-latch
limits
ratio
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
index 49fcbf44c5b21..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
@@ -1,5 +1,4 @@
cstddef
cstdint
-limits
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
index b596079c340b0..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
@@ -18,7 +18,6 @@ initializer_list
iosfwd
iterator
limits
-list
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
index 29719367689e4..a5ac726129c05 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
@@ -25,7 +25,6 @@ ios
iosfwd
iterator
limits
-locale
memory
mutex
new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
index c871579ea35ed..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
@@ -18,7 +18,6 @@ initializer_list
iosfwd
iterator
limits
-map
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
index f36910fde696d..9af31ba1b625d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
@@ -14,7 +14,6 @@ initializer_list
iosfwd
iterator
limits
-memory
new
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
index 4d101cb290c16..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
@@ -24,7 +24,6 @@ iosfwd
iterator
limits
memory
-mutex
new
optional
ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.new b/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
index 9fd8f6aabd0c9..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
@@ -2,6 +2,5 @@ cstddef
cstdint
cstdlib
exception
-new
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
index a8b65fc82096b..31e9f436e6cd3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
@@ -1,6 +1,5 @@
concepts
cstddef
cstdint
-numbers
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
index 558b32457eb4c..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
@@ -20,7 +20,6 @@ iterator
limits
memory
new
-numeric
optional
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
index 993ce23d8009d..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
@@ -16,7 +16,6 @@ iterator
limits
memory
new
-optional
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
index 762d13c26ac3c..63afc93662e2e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
@@ -31,7 +31,6 @@ memory
mutex
new
optional
-ostream
ratio
stdexcept
streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
index 5861852fc5322..c26bdc7479b64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
@@ -22,7 +22,6 @@ limits
memory
new
optional
-queue
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.random b/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
index 96a956ad800a1..67c6aa6723acf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
@@ -26,7 +26,6 @@ memory
new
numeric
optional
-random
ratio
stdexcept
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
index 3dbb13bb9680f..a46c30df88516 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
@@ -21,7 +21,6 @@ limits
memory
new
optional
-ranges
ratio
span
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
index deda945f1b575..29043403235fa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
@@ -1,6 +1,5 @@
climits
cstddef
cstdint
-ratio
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
index 76df207366621..4f3dd16a93887 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
@@ -29,7 +29,6 @@ mutex
new
optional
ratio
-regex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
index 22dcb319a5e67..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
@@ -17,7 +17,6 @@ limits
memory
new
ratio
-scoped_allocator
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
index d6802e25aa70d..3e9917b3da1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
@@ -10,6 +10,5 @@ ctime
iosfwd
limits
ratio
-semaphore
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
index 849e87331b725..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-set
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
index 81568d83b17c7..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
@@ -1,2 +1 @@
-shared_mutex
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.span b/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
index a46c30df88516..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-span
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
index 1724fbdde39ed..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
@@ -34,7 +34,6 @@ new
optional
ostream
ratio
-sstream
stdexcept
streambuf
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
index 1a7d18cb85f24..c26bdc7479b64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
@@ -23,7 +23,6 @@ memory
new
optional
ratio
-stack
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
index b8dd684ffcbbf..e9e1b1a3af1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
@@ -3,6 +3,5 @@ cstdint
cstdlib
exception
iosfwd
-stdexcept
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
index a3001ce44a1bb..6e7e5b2689767 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
@@ -30,7 +30,6 @@ new
optional
ratio
stdexcept
-streambuf
string
string_view
system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
index 0dacf739a7859..e814351725ef2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
@@ -27,7 +27,6 @@ new
optional
ratio
stdexcept
-string
string_view
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
index e814351725ef2..138c1f54d41bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
@@ -27,7 +27,6 @@ new
optional
ratio
stdexcept
-string_view
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
index 782153b595b63..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
@@ -38,7 +38,6 @@ stdexcept
streambuf
string
string_view
-strstream
system_error
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
index 4101ee5209a39..8598675317389 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
@@ -30,7 +30,6 @@ ratio
stdexcept
string
string_view
-system_error
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
index ab8c3c7c85ba2..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
@@ -31,7 +31,6 @@ stdexcept
string
string_view
system_error
-thread
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
index 69858dc888c3b..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
@@ -8,7 +8,6 @@ initializer_list
iosfwd
limits
new
-tuple
type_traits
typeinfo
utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
index 8448275a1728c..fa3e26219e865 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
@@ -1,4 +1,3 @@
cstddef
cstdint
-type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
index 8f1c652535378..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
@@ -9,7 +9,6 @@ iosfwd
limits
new
type_traits
-typeindex
typeinfo
utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
index 609a604805c9b..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
@@ -3,5 +3,4 @@ cstdint
cstdlib
exception
type_traits
-typeinfo
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
index 2250cf96690a3..ba220443ca812 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
@@ -24,7 +24,6 @@ stdexcept
tuple
type_traits
typeinfo
-unordered_map
utility
variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
index 9352f0b05b721..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
@@ -27,7 +27,6 @@ tuple
type_traits
typeinfo
unordered_map
-unordered_set
utility
variant
vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
index 799a14724cf41..2f34f998b4faa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
@@ -7,5 +7,4 @@ initializer_list
iosfwd
limits
type_traits
-utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
index a069f37119fa8..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
@@ -28,7 +28,6 @@ type_traits
typeinfo
unordered_map
utility
-valarray
variant
vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
index d94d72974cb84..accc76242aff2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
@@ -13,5 +13,4 @@ tuple
type_traits
typeinfo
utility
-variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
index 5fb9d7d19cc12..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
@@ -25,5 +25,4 @@ type_traits
typeinfo
utility
variant
-vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.version b/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
index 088eda41aa61d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
index 944a3eeea2d64..ece47497507b2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
atomic
bit
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.any b/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
index 86009188e53e3..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
@@ -1,4 +1,3 @@
-any
atomic
chrono
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.array b/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
index 7145642a8f46e..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
@@ -1,5 +1,4 @@
algorithm
-array
atomic
bit
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
index 3e9917b3da1a0..4206ba1eee44e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
@@ -1,4 +1,3 @@
-atomic
chrono
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
index c2865c8d3ef09..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
@@ -1,5 +1,4 @@
atomic
-barrier
chrono
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
index 4fb5285f8142e..e53db43d769bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
@@ -1,4 +1,3 @@
-bit
cstddef
cstdint
cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
index 3cf3e8dbdfc73..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
@@ -2,7 +2,6 @@ algorithm
array
atomic
bit
-bitset
cctype
chrono
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
index 69b779ef2f206..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
index 98bf9a8010e40..64161c1d331fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
@@ -3,7 +3,6 @@ array
atomic
bit
bitset
-ccomplex
cctype
cerrno
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
index a82e62c088dce..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
index 24c00a9877c3b..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
index 9980586372456..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
index 3bb5aa14cfbfe..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
index 1ab0e5d37a401..458696c3a73ff 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
@@ -1,5 +1,4 @@
cerrno
-charconv
cmath
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
index fdb624bc1df42..9f1521d4d4835 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
@@ -1,4 +1,3 @@
-chrono
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
index 911d5dd27d082..37103a4f4b892 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
index 6c1d5458c9c9c..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
index 271e000221016..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
index 0ac42c4b403ed..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
index 7678c0e38802c..49fcbf44c5b21 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
@@ -1,4 +1,3 @@
-cmath
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
index 0931ca137c0bd..4d101cb290c16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
@@ -7,7 +7,6 @@ cerrno
chrono
climits
cmath
-codecvt
compare
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
index df2d92f5d4b6c..7678c0e38802c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
@@ -1,5 +1,4 @@
cmath
-compare
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
index 64161c1d331fe..1724fbdde39ed 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
@@ -9,7 +9,6 @@ chrono
climits
cmath
compare
-complex
concepts
cstdarg
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
index 31e9f436e6cd3..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
@@ -1,4 +1,3 @@
-concepts
cstddef
cstdint
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
index 968007a37cef8..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
@@ -9,7 +9,6 @@ climits
cmath
compare
concepts
-condition_variable
cstddef
cstdint
cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
index 8dd332d472542..afddf59ae6bf5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
@@ -1,6 +1,5 @@
cmath
compare
-coroutine
cstddef
cstdint
cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
index 2f72e67f0324d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
index c17f2a3b99dfb..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
index ce71517eeb149..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
index f3a52bba86c16..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
index 7b45506ea14b3..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
@@ -1,2 +1 @@
-cstddef
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
index 37103a4f4b892..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
index 5b70aa3cf8d42..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
index b98a7237dde79..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
index 0fdbe597c9df1..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
index 7467a5ab59520..98bf9a8010e40 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
@@ -18,7 +18,6 @@ cstdint
cstdio
cstdlib
cstring
-ctgmath
ctime
cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
index ee049c40b25b3..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
index 588664ab50b3f..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
index 1e6c2091fa4a0..fa1b7f2569941 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
@@ -1,3 +1,2 @@
cctype
-cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
index fa1b7f2569941..a82e62c088dce 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
@@ -1,2 +1 @@
cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
index c26bdc7479b64..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
@@ -12,7 +12,6 @@ cstdint
cstdlib
cstring
ctime
-deque
exception
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
index c48f9ed9e744d..4c4515dcec7d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
@@ -1,6 +1,5 @@
cstddef
cstdint
cstdlib
-exception
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
index b42e7095b5800..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
@@ -1,2 +1 @@
-execution
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
index 8a5cd7de65d88..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/algorithm
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
index 682f0fa0e7a83..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/coroutine
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
index bd86d1588beb1..e9b93fcc7c91e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
@@ -14,7 +14,6 @@ cstring
ctime
deque
exception
-experimental/deque
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
index c43fab08b41f3..e1ba276ab7ef9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/forward_list
experimental/memory_resource
experimental/utility
forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
index 87cee2d288827..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/functional
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
index 14d31c215ffb7..447087a3f6f96 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
@@ -6,7 +6,6 @@ cstdint
cstdlib
cstring
exception
-experimental/iterator
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
index ac800654f5323..ed186faf929c5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/list
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
index d132098b01a1b..179b5b76d6f6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/map
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
index 94d9abd26b6cb..064d3eab47aef 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/memory_resource
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
index a78fa83bc983f..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
cstddef
cstdint
-experimental/propagate_const
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
index 8a49aac962c25..3c525e1b4a9d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
@@ -20,7 +20,6 @@ cwctype
deque
exception
experimental/memory_resource
-experimental/regex
experimental/string
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
index f1d2953360dc6..21d59c287aca1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
index f06f6e9cea012..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/simd
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
index 367a9ed7da4bb..46dcb1d1a6282 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
@@ -18,7 +18,6 @@ cwchar
cwctype
exception
experimental/memory_resource
-experimental/string
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
index c1e83e731fbd2..5866e56e076ea 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
@@ -1,6 +1,5 @@
cstddef
cstdint
-experimental/type_traits
initializer_list
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
index 16753ae30a7b3..251dd7013fd2f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_map
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
index 1aafa61386b74..c678f3985291a 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
index a399b3ebb27c6..799a14724cf41 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
@@ -3,7 +3,6 @@ compare
cstddef
cstdint
cstdlib
-experimental/utility
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
index 1c569628be18e..a97f08e050a8f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
@@ -14,7 +14,6 @@ ctime
exception
experimental/memory_resource
experimental/utility
-experimental/vector
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
index 459536294e0c1..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
@@ -17,7 +17,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_map
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
index 160335aab3676..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
@@ -17,7 +17,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_set
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
index 22e80bc111922..39829086f4cb1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
@@ -20,7 +20,6 @@ ctime
cwchar
cwctype
exception
-filesystem
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.format b/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
index 08d46d27a9c04..efe2c926890e3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
@@ -20,7 +20,6 @@ ctime
cwchar
cwctype
exception
-format
functional
initializer_list
ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
index 33afc74bd420a..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-forward_list
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
index 7a892e11bfe61..22e80bc111922 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
@@ -21,7 +21,6 @@ cwchar
cwctype
exception
filesystem
-fstream
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
index 7625982373f82..a202e549334ae 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-functional
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.future b/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
index 92bd4e044ecc3..0bffec1c88f36 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
@@ -19,7 +19,6 @@ cwchar
cwctype
exception
functional
-future
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
index 8b92a6553ca19..7b45506ea14b3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
@@ -1,3 +1,2 @@
cstddef
-initializer_list
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
index 39829086f4cb1..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
@@ -22,7 +22,6 @@ cwctype
exception
functional
initializer_list
-iomanip
ios
iosfwd
istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
index 6e7e5b2689767..4d101cb290c16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
@@ -20,7 +20,6 @@ cwctype
exception
functional
initializer_list
-ios
iosfwd
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
index ff6e0e3d092b7..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
index 580aeaf867341..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
@@ -24,7 +24,6 @@ functional
initializer_list
ios
iosfwd
-iostream
istream
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
index fd0c4b4ca7361..762d13c26ac3c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
@@ -24,7 +24,6 @@ functional
initializer_list
ios
iosfwd
-istream
iterator
limits
locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
index 447087a3f6f96..f6043d7d3b1d4 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
@@ -8,7 +8,6 @@ cstring
exception
initializer_list
iosfwd
-iterator
limits
new
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
index a7a6bbc912cef..3e9917b3da1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
@@ -8,7 +8,6 @@ cstdint
cstring
ctime
iosfwd
-latch
limits
ratio
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
index 49fcbf44c5b21..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
@@ -1,5 +1,4 @@
cstddef
cstdint
-limits
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
index b596079c340b0..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
@@ -18,7 +18,6 @@ initializer_list
iosfwd
iterator
limits
-list
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
index 29719367689e4..a5ac726129c05 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
@@ -25,7 +25,6 @@ ios
iosfwd
iterator
limits
-locale
memory
mutex
new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
index c871579ea35ed..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
@@ -18,7 +18,6 @@ initializer_list
iosfwd
iterator
limits
-map
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
index f36910fde696d..9af31ba1b625d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
@@ -14,7 +14,6 @@ initializer_list
iosfwd
iterator
limits
-memory
new
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
index 4d101cb290c16..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
@@ -24,7 +24,6 @@ iosfwd
iterator
limits
memory
-mutex
new
optional
ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.new b/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
index 9fd8f6aabd0c9..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
@@ -2,6 +2,5 @@ cstddef
cstdint
cstdlib
exception
-new
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
index a8b65fc82096b..31e9f436e6cd3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
@@ -1,6 +1,5 @@
concepts
cstddef
cstdint
-numbers
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
index 558b32457eb4c..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
@@ -20,7 +20,6 @@ iterator
limits
memory
new
-numeric
optional
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
index 993ce23d8009d..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
@@ -16,7 +16,6 @@ iterator
limits
memory
new
-optional
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
index 762d13c26ac3c..63afc93662e2e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
@@ -31,7 +31,6 @@ memory
mutex
new
optional
-ostream
ratio
stdexcept
streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
index 5861852fc5322..c26bdc7479b64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
@@ -22,7 +22,6 @@ limits
memory
new
optional
-queue
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.random b/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
index 96a956ad800a1..67c6aa6723acf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
@@ -26,7 +26,6 @@ memory
new
numeric
optional
-random
ratio
stdexcept
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
index 3dbb13bb9680f..a46c30df88516 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
@@ -21,7 +21,6 @@ limits
memory
new
optional
-ranges
ratio
span
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
index deda945f1b575..29043403235fa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
@@ -1,6 +1,5 @@
climits
cstddef
cstdint
-ratio
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
index 76df207366621..4f3dd16a93887 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
@@ -29,7 +29,6 @@ mutex
new
optional
ratio
-regex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
index 22dcb319a5e67..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
@@ -17,7 +17,6 @@ limits
memory
new
ratio
-scoped_allocator
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
index d6802e25aa70d..3e9917b3da1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
@@ -10,6 +10,5 @@ ctime
iosfwd
limits
ratio
-semaphore
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
index 849e87331b725..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-set
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
index fdea61e19bba8..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
@@ -27,7 +27,6 @@ memory
new
optional
ratio
-shared_mutex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.span b/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
index a46c30df88516..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-span
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
index 1724fbdde39ed..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
@@ -34,7 +34,6 @@ new
optional
ostream
ratio
-sstream
stdexcept
streambuf
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
index 1a7d18cb85f24..c26bdc7479b64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
@@ -23,7 +23,6 @@ memory
new
optional
ratio
-stack
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
index b8dd684ffcbbf..e9e1b1a3af1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
@@ -3,6 +3,5 @@ cstdint
cstdlib
exception
iosfwd
-stdexcept
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
index a3001ce44a1bb..6e7e5b2689767 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
@@ -30,7 +30,6 @@ new
optional
ratio
stdexcept
-streambuf
string
string_view
system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
index 0dacf739a7859..e814351725ef2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
@@ -27,7 +27,6 @@ new
optional
ratio
stdexcept
-string
string_view
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
index e814351725ef2..138c1f54d41bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
@@ -27,7 +27,6 @@ new
optional
ratio
stdexcept
-string_view
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
index 782153b595b63..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
@@ -38,7 +38,6 @@ stdexcept
streambuf
string
string_view
-strstream
system_error
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
index 4101ee5209a39..8598675317389 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
@@ -30,7 +30,6 @@ ratio
stdexcept
string
string_view
-system_error
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
index ab8c3c7c85ba2..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
@@ -31,7 +31,6 @@ stdexcept
string
string_view
system_error
-thread
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
index 69858dc888c3b..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
@@ -8,7 +8,6 @@ initializer_list
iosfwd
limits
new
-tuple
type_traits
typeinfo
utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
index 8448275a1728c..fa3e26219e865 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
@@ -1,4 +1,3 @@
cstddef
cstdint
-type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
index 8f1c652535378..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
@@ -9,7 +9,6 @@ iosfwd
limits
new
type_traits
-typeindex
typeinfo
utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
index 609a604805c9b..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
@@ -3,5 +3,4 @@ cstdint
cstdlib
exception
type_traits
-typeinfo
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
index 2250cf96690a3..ba220443ca812 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
@@ -24,7 +24,6 @@ stdexcept
tuple
type_traits
typeinfo
-unordered_map
utility
variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
index 9352f0b05b721..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
@@ -27,7 +27,6 @@ tuple
type_traits
typeinfo
unordered_map
-unordered_set
utility
variant
vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
index 799a14724cf41..2f34f998b4faa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
@@ -7,5 +7,4 @@ initializer_list
iosfwd
limits
type_traits
-utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
index a069f37119fa8..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
@@ -28,7 +28,6 @@ type_traits
typeinfo
unordered_map
utility
-valarray
variant
vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
index d94d72974cb84..accc76242aff2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
@@ -13,5 +13,4 @@ tuple
type_traits
typeinfo
utility
-variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
index 5fb9d7d19cc12..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
@@ -25,5 +25,4 @@ type_traits
typeinfo
utility
variant
-vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.version b/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
index 088eda41aa61d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
index 944a3eeea2d64..ece47497507b2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
atomic
bit
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.any b/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
index 86009188e53e3..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
@@ -1,4 +1,3 @@
-any
atomic
chrono
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.array b/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
index 7145642a8f46e..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
@@ -1,5 +1,4 @@
algorithm
-array
atomic
bit
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
index 3e9917b3da1a0..4206ba1eee44e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
@@ -1,4 +1,3 @@
-atomic
chrono
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
index c2865c8d3ef09..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
@@ -1,5 +1,4 @@
atomic
-barrier
chrono
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
index 4fb5285f8142e..e53db43d769bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
@@ -1,4 +1,3 @@
-bit
cstddef
cstdint
cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
index 3cf3e8dbdfc73..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
@@ -2,7 +2,6 @@ algorithm
array
atomic
bit
-bitset
cctype
chrono
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
index 69b779ef2f206..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
index 98bf9a8010e40..64161c1d331fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
@@ -3,7 +3,6 @@ array
atomic
bit
bitset
-ccomplex
cctype
cerrno
chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
index a82e62c088dce..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
index 24c00a9877c3b..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
index 9980586372456..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
index 3bb5aa14cfbfe..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
index 1ab0e5d37a401..458696c3a73ff 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
@@ -1,5 +1,4 @@
cerrno
-charconv
cmath
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
index fdb624bc1df42..9f1521d4d4835 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
@@ -1,4 +1,3 @@
-chrono
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
index 911d5dd27d082..37103a4f4b892 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
index 6c1d5458c9c9c..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
index 271e000221016..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
index 0ac42c4b403ed..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
index 7678c0e38802c..49fcbf44c5b21 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
@@ -1,4 +1,3 @@
-cmath
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
index 0931ca137c0bd..4d101cb290c16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
@@ -7,7 +7,6 @@ cerrno
chrono
climits
cmath
-codecvt
compare
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
index df2d92f5d4b6c..7678c0e38802c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
@@ -1,5 +1,4 @@
cmath
-compare
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
index 64161c1d331fe..1724fbdde39ed 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
@@ -9,7 +9,6 @@ chrono
climits
cmath
compare
-complex
concepts
cstdarg
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
index 31e9f436e6cd3..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
@@ -1,4 +1,3 @@
-concepts
cstddef
cstdint
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
index 968007a37cef8..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
@@ -9,7 +9,6 @@ climits
cmath
compare
concepts
-condition_variable
cstddef
cstdint
cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
index 8dd332d472542..afddf59ae6bf5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
@@ -1,6 +1,5 @@
cmath
compare
-coroutine
cstddef
cstdint
cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
index 2f72e67f0324d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
index c17f2a3b99dfb..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
index ce71517eeb149..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
index f3a52bba86c16..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
index 7b45506ea14b3..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
@@ -1,2 +1 @@
-cstddef
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
index 37103a4f4b892..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
index 5b70aa3cf8d42..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
index b98a7237dde79..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
index 0fdbe597c9df1..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
index 7467a5ab59520..98bf9a8010e40 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
@@ -18,7 +18,6 @@ cstdint
cstdio
cstdlib
cstring
-ctgmath
ctime
cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
index ee049c40b25b3..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
index 588664ab50b3f..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
index 1e6c2091fa4a0..fa1b7f2569941 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
@@ -1,3 +1,2 @@
cctype
-cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
index fa1b7f2569941..a82e62c088dce 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
@@ -1,2 +1 @@
cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
index c26bdc7479b64..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
@@ -12,7 +12,6 @@ cstdint
cstdlib
cstring
ctime
-deque
exception
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
index c48f9ed9e744d..4c4515dcec7d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
@@ -1,6 +1,5 @@
cstddef
cstdint
cstdlib
-exception
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
index b42e7095b5800..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
@@ -1,2 +1 @@
-execution
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
index 8a5cd7de65d88..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/algorithm
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
index 682f0fa0e7a83..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/coroutine
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
index bd86d1588beb1..e9b93fcc7c91e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
@@ -14,7 +14,6 @@ cstring
ctime
deque
exception
-experimental/deque
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
index c43fab08b41f3..e1ba276ab7ef9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/forward_list
experimental/memory_resource
experimental/utility
forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
index 87cee2d288827..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/functional
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
index 14d31c215ffb7..447087a3f6f96 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
@@ -6,7 +6,6 @@ cstdint
cstdlib
cstring
exception
-experimental/iterator
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
index ac800654f5323..ed186faf929c5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/list
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
index d132098b01a1b..179b5b76d6f6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/map
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
index 94d9abd26b6cb..064d3eab47aef 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/memory_resource
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
index a78fa83bc983f..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
cstddef
cstdint
-experimental/propagate_const
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
index 8a49aac962c25..3c525e1b4a9d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
@@ -20,7 +20,6 @@ cwctype
deque
exception
experimental/memory_resource
-experimental/regex
experimental/string
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
index f1d2953360dc6..21d59c287aca1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
index f06f6e9cea012..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-experimental/simd
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
index 367a9ed7da4bb..46dcb1d1a6282 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
@@ -18,7 +18,6 @@ cwchar
cwctype
exception
experimental/memory_resource
-experimental/string
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
index c1e83e731fbd2..5866e56e076ea 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
@@ -1,6 +1,5 @@
cstddef
cstdint
-experimental/type_traits
initializer_list
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
index 16753ae30a7b3..251dd7013fd2f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_map
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
index 1aafa61386b74..c678f3985291a 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
@@ -14,7 +14,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
index a399b3ebb27c6..799a14724cf41 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
@@ -3,7 +3,6 @@ compare
cstddef
cstdint
cstdlib
-experimental/utility
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
index 1c569628be18e..a97f08e050a8f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
@@ -14,7 +14,6 @@ ctime
exception
experimental/memory_resource
experimental/utility
-experimental/vector
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
index 459536294e0c1..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
@@ -17,7 +17,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_map
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
index 160335aab3676..0dacf739a7859 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
@@ -17,7 +17,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_set
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
index 22e80bc111922..39829086f4cb1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
@@ -20,7 +20,6 @@ ctime
cwchar
cwctype
exception
-filesystem
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.format b/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
index 08d46d27a9c04..efe2c926890e3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
@@ -20,7 +20,6 @@ ctime
cwchar
cwctype
exception
-format
functional
initializer_list
ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
index 33afc74bd420a..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-forward_list
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
index 7a892e11bfe61..22e80bc111922 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
@@ -21,7 +21,6 @@ cwchar
cwctype
exception
filesystem
-fstream
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
index 7625982373f82..a202e549334ae 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
@@ -13,7 +13,6 @@ cstdlib
cstring
ctime
exception
-functional
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.future b/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
index 92bd4e044ecc3..0bffec1c88f36 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
@@ -19,7 +19,6 @@ cwchar
cwctype
exception
functional
-future
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
index 8b92a6553ca19..7b45506ea14b3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
@@ -1,3 +1,2 @@
cstddef
-initializer_list
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
index 39829086f4cb1..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
@@ -22,7 +22,6 @@ cwctype
exception
functional
initializer_list
-iomanip
ios
iosfwd
istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
index 6e7e5b2689767..4d101cb290c16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
@@ -20,7 +20,6 @@ cwctype
exception
functional
initializer_list
-ios
iosfwd
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
index ff6e0e3d092b7..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
index 580aeaf867341..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
@@ -24,7 +24,6 @@ functional
initializer_list
ios
iosfwd
-iostream
istream
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
index fd0c4b4ca7361..762d13c26ac3c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
@@ -24,7 +24,6 @@ functional
initializer_list
ios
iosfwd
-istream
iterator
limits
locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
index 447087a3f6f96..f6043d7d3b1d4 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
@@ -8,7 +8,6 @@ cstring
exception
initializer_list
iosfwd
-iterator
limits
new
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
index a7a6bbc912cef..3e9917b3da1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
@@ -8,7 +8,6 @@ cstdint
cstring
ctime
iosfwd
-latch
limits
ratio
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
index 49fcbf44c5b21..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
@@ -1,5 +1,4 @@
cstddef
cstdint
-limits
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
index b596079c340b0..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
@@ -18,7 +18,6 @@ initializer_list
iosfwd
iterator
limits
-list
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
index 29719367689e4..a5ac726129c05 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
@@ -25,7 +25,6 @@ ios
iosfwd
iterator
limits
-locale
memory
mutex
new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
index c871579ea35ed..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
@@ -18,7 +18,6 @@ initializer_list
iosfwd
iterator
limits
-map
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
index f36910fde696d..9af31ba1b625d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
@@ -14,7 +14,6 @@ initializer_list
iosfwd
iterator
limits
-memory
new
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
index 4d101cb290c16..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
@@ -24,7 +24,6 @@ iosfwd
iterator
limits
memory
-mutex
new
optional
ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.new b/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
index 9fd8f6aabd0c9..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
@@ -2,6 +2,5 @@ cstddef
cstdint
cstdlib
exception
-new
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
index a8b65fc82096b..31e9f436e6cd3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
@@ -1,6 +1,5 @@
concepts
cstddef
cstdint
-numbers
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
index 558b32457eb4c..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
@@ -20,7 +20,6 @@ iterator
limits
memory
new
-numeric
optional
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
index 993ce23d8009d..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
@@ -16,7 +16,6 @@ iterator
limits
memory
new
-optional
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
index 762d13c26ac3c..63afc93662e2e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
@@ -31,7 +31,6 @@ memory
mutex
new
optional
-ostream
ratio
stdexcept
streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
index 5861852fc5322..c26bdc7479b64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
@@ -22,7 +22,6 @@ limits
memory
new
optional
-queue
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.random b/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
index 96a956ad800a1..67c6aa6723acf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
@@ -26,7 +26,6 @@ memory
new
numeric
optional
-random
ratio
stdexcept
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
index 3dbb13bb9680f..a46c30df88516 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
@@ -21,7 +21,6 @@ limits
memory
new
optional
-ranges
ratio
span
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
index deda945f1b575..29043403235fa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
@@ -1,6 +1,5 @@
climits
cstddef
cstdint
-ratio
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
index 76df207366621..4f3dd16a93887 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
@@ -29,7 +29,6 @@ mutex
new
optional
ratio
-regex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
index 22dcb319a5e67..f36910fde696d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
@@ -17,7 +17,6 @@ limits
memory
new
ratio
-scoped_allocator
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
index d6802e25aa70d..3e9917b3da1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
@@ -10,6 +10,5 @@ ctime
iosfwd
limits
ratio
-semaphore
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
index 849e87331b725..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-set
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
index fdea61e19bba8..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
@@ -27,7 +27,6 @@ memory
new
optional
ratio
-shared_mutex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.span b/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
index a46c30df88516..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-span
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
index 1724fbdde39ed..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
@@ -34,7 +34,6 @@ new
optional
ostream
ratio
-sstream
stdexcept
streambuf
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
index 1a7d18cb85f24..c26bdc7479b64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
@@ -23,7 +23,6 @@ memory
new
optional
ratio
-stack
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
index b8dd684ffcbbf..e9e1b1a3af1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
@@ -3,6 +3,5 @@ cstdint
cstdlib
exception
iosfwd
-stdexcept
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
index a3001ce44a1bb..6e7e5b2689767 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
@@ -30,7 +30,6 @@ new
optional
ratio
stdexcept
-streambuf
string
string_view
system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
index 0dacf739a7859..e814351725ef2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
@@ -27,7 +27,6 @@ new
optional
ratio
stdexcept
-string
string_view
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
index e814351725ef2..138c1f54d41bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
@@ -27,7 +27,6 @@ new
optional
ratio
stdexcept
-string_view
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
index 782153b595b63..fd0c4b4ca7361 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
@@ -38,7 +38,6 @@ stdexcept
streambuf
string
string_view
-strstream
system_error
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
index 4101ee5209a39..8598675317389 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
@@ -30,7 +30,6 @@ ratio
stdexcept
string
string_view
-system_error
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
index ab8c3c7c85ba2..4101ee5209a39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
@@ -31,7 +31,6 @@ stdexcept
string
string_view
system_error
-thread
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
index 69858dc888c3b..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
@@ -8,7 +8,6 @@ initializer_list
iosfwd
limits
new
-tuple
type_traits
typeinfo
utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
index 8448275a1728c..fa3e26219e865 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
@@ -1,4 +1,3 @@
cstddef
cstdint
-type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
index 8f1c652535378..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
@@ -9,7 +9,6 @@ iosfwd
limits
new
type_traits
-typeindex
typeinfo
utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
index 609a604805c9b..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
@@ -3,5 +3,4 @@ cstdint
cstdlib
exception
type_traits
-typeinfo
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
index 2250cf96690a3..ba220443ca812 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
@@ -24,7 +24,6 @@ stdexcept
tuple
type_traits
typeinfo
-unordered_map
utility
variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
index 9352f0b05b721..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
@@ -27,7 +27,6 @@ tuple
type_traits
typeinfo
unordered_map
-unordered_set
utility
variant
vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
index 799a14724cf41..2f34f998b4faa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
@@ -7,5 +7,4 @@ initializer_list
iosfwd
limits
type_traits
-utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
index a069f37119fa8..7625982373f82 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
@@ -28,7 +28,6 @@ type_traits
typeinfo
unordered_map
utility
-valarray
variant
vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
index d94d72974cb84..accc76242aff2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
@@ -13,5 +13,4 @@ tuple
type_traits
typeinfo
utility
-variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
index 5fb9d7d19cc12..944a3eeea2d64 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
@@ -25,5 +25,4 @@ type_traits
typeinfo
utility
variant
-vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.version b/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
index 088eda41aa61d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
index f8ccff41c2bb1..a7741dc30ad6c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
atomic
bit
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.any b/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
index 54d38834515bd..db28f1f58dd4c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
@@ -1,4 +1,3 @@
-any
atomic
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.array b/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
index ce0091420b9b0..f8ccff41c2bb1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
@@ -1,5 +1,4 @@
algorithm
-array
atomic
bit
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
index a211832b18bbe..cd11be843d912 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
@@ -1,4 +1,3 @@
-atomic
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
index 883919aa7d768..db28f1f58dd4c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
@@ -1,5 +1,4 @@
atomic
-barrier
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
index 4fb5285f8142e..e53db43d769bf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
@@ -1,4 +1,3 @@
-bit
cstddef
cstdint
cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
index a85bd53914e77..b90a8c85d103f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
@@ -2,7 +2,6 @@ algorithm
array
atomic
bit
-bitset
cctype
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
index 69b779ef2f206..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
index 498d5a1ff0795..7b2a43f3ec9f4 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
@@ -3,7 +3,6 @@ array
atomic
bit
bitset
-ccomplex
cctype
cerrno
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
index a82e62c088dce..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
index 24c00a9877c3b..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
index 9980586372456..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
index 3bb5aa14cfbfe..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
index 1ab0e5d37a401..458696c3a73ff 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
@@ -1,5 +1,4 @@
cerrno
-charconv
cmath
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
index fdb624bc1df42..9f1521d4d4835 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
@@ -1,4 +1,3 @@
-chrono
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
index 911d5dd27d082..37103a4f4b892 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
index 6c1d5458c9c9c..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
index 271e000221016..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
index 0ac42c4b403ed..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
index 7678c0e38802c..49fcbf44c5b21 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
@@ -1,4 +1,3 @@
-cmath
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
index 5c7efd549f69b..dcaffb654be30 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
@@ -6,7 +6,6 @@ cctype
cerrno
climits
cmath
-codecvt
compare
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
index df2d92f5d4b6c..7678c0e38802c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
@@ -1,5 +1,4 @@
cmath
-compare
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
index 7b2a43f3ec9f4..00e0758f4cced 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
@@ -8,7 +8,6 @@ cerrno
climits
cmath
compare
-complex
concepts
cstdarg
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
index 31e9f436e6cd3..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
@@ -1,4 +1,3 @@
-concepts
cstddef
cstdint
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
index c3a60ae3ae54a..1afa1e305c66d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
@@ -8,7 +8,6 @@ climits
cmath
compare
concepts
-condition_variable
cstddef
cstdint
cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
index 8dd332d472542..afddf59ae6bf5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
@@ -1,6 +1,5 @@
cmath
compare
-coroutine
cstddef
cstdint
cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
index 2f72e67f0324d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
index c17f2a3b99dfb..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
index ce71517eeb149..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
index f3a52bba86c16..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
index 7b45506ea14b3..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
@@ -1,2 +1 @@
-cstddef
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
index 37103a4f4b892..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
index 5b70aa3cf8d42..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
index b98a7237dde79..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
index 0fdbe597c9df1..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
index 727591312a69b..498d5a1ff0795 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
@@ -17,7 +17,6 @@ cstdint
cstdio
cstdlib
cstring
-ctgmath
ctime
cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
index ee049c40b25b3..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
index 588664ab50b3f..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
index 1e6c2091fa4a0..fa1b7f2569941 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
@@ -1,3 +1,2 @@
cctype
-cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
index fa1b7f2569941..a82e62c088dce 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
@@ -1,2 +1 @@
cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
index e3144557aa464..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
@@ -11,7 +11,6 @@ cstdint
cstdlib
cstring
ctime
-deque
exception
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
index c48f9ed9e744d..4c4515dcec7d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
@@ -1,6 +1,5 @@
cstddef
cstdint
cstdlib
-exception
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
index b42e7095b5800..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
@@ -1,2 +1 @@
-execution
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
index dfebf4878e7b7..f8ccff41c2bb1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
@@ -11,7 +11,6 @@ cstdlib
cstring
ctime
exception
-experimental/algorithm
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
index b7344ece8f952..db28f1f58dd4c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
@@ -9,7 +9,6 @@ cstdlib
cstring
ctime
exception
-experimental/coroutine
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
index 961599b9bc6c9..0a8b728b721f4 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
@@ -13,7 +13,6 @@ cstring
ctime
deque
exception
-experimental/deque
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
index fe3c906fa4808..d6d946b2aed23 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/forward_list
experimental/memory_resource
experimental/utility
forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
index 689ccf1c6a27e..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/functional
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
index 14d31c215ffb7..447087a3f6f96 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
@@ -6,7 +6,6 @@ cstdint
cstdlib
cstring
exception
-experimental/iterator
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
index 5adfb13181ecb..929912b655fee 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/list
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
index 880a23b98e427..e64065ee68abd 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/map
experimental/memory_resource
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
index b5ff253cbacfc..db18f2468bf18 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
@@ -9,7 +9,6 @@ cstdlib
cstring
ctime
exception
-experimental/memory_resource
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
index a78fa83bc983f..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
cstddef
cstdint
-experimental/propagate_const
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
index f91eef1d7a562..3c842a90ac617 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
@@ -19,7 +19,6 @@ cwctype
deque
exception
experimental/memory_resource
-experimental/regex
experimental/string
experimental/utility
functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
index 5558bc67e5d04..6bf895ce21b16 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
@@ -13,7 +13,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
index 74f77f65c7242..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-experimental/simd
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
index bb7e551ff70b7..4421b8822f8a6 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
@@ -17,7 +17,6 @@ cwchar
cwctype
exception
experimental/memory_resource
-experimental/string
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
index c1e83e731fbd2..5866e56e076ea 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
@@ -1,6 +1,5 @@
cstddef
cstdint
-experimental/type_traits
initializer_list
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
index 3614946ae032a..0565815fb0b3f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
@@ -13,7 +13,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_map
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
index 0a77898c1e0bf..8f0d104a4d699 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
@@ -13,7 +13,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_set
experimental/utility
functional
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
index a399b3ebb27c6..799a14724cf41 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
@@ -3,7 +3,6 @@ compare
cstddef
cstdint
cstdlib
-experimental/utility
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
index ffd37e1ee6740..96d5aa83534a4 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
@@ -13,7 +13,6 @@ ctime
exception
experimental/memory_resource
experimental/utility
-experimental/vector
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
index e199190cbfb00..b90a8c85d103f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
@@ -16,7 +16,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_map
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
index 2a3d11e6ff40c..b90a8c85d103f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
@@ -16,7 +16,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_set
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
index 02157ec5aa54d..fd992145bd1f3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
@@ -19,7 +19,6 @@ ctime
cwchar
cwctype
exception
-filesystem
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.format b/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
index 595b589ef93f0..d4526b941259f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
@@ -19,7 +19,6 @@ ctime
cwchar
cwctype
exception
-format
functional
initializer_list
ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
index dde7fba4779c2..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-forward_list
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
index 7b14b7cf4e9a4..02157ec5aa54d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
@@ -20,7 +20,6 @@ cwchar
cwctype
exception
filesystem
-fstream
functional
initializer_list
iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
index 243ba6b8ea533..b284e6329c390 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
@@ -12,7 +12,6 @@ cstdlib
cstring
ctime
exception
-functional
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.future b/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
index 148b1eabe0d8c..8409f6047f93b 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
@@ -18,7 +18,6 @@ cwchar
cwctype
exception
functional
-future
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
index 8b92a6553ca19..7b45506ea14b3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
@@ -1,3 +1,2 @@
cstddef
-initializer_list
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
index fd992145bd1f3..cd2a2f405afb9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
@@ -21,7 +21,6 @@ cwctype
exception
functional
initializer_list
-iomanip
ios
iosfwd
istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
index b2eec45518af9..dcaffb654be30 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
@@ -19,7 +19,6 @@ cwctype
exception
functional
initializer_list
-ios
iosfwd
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
index ff6e0e3d092b7..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
index c743a03d7f7b3..cd2a2f405afb9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
@@ -23,7 +23,6 @@ functional
initializer_list
ios
iosfwd
-iostream
istream
iterator
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
index cd2a2f405afb9..c5cea41f9f069 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
@@ -23,7 +23,6 @@ functional
initializer_list
ios
iosfwd
-istream
iterator
limits
locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
index 447087a3f6f96..f6043d7d3b1d4 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
@@ -8,7 +8,6 @@ cstring
exception
initializer_list
iosfwd
-iterator
limits
new
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
index ad8a92a309504..a211832b18bbe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
@@ -7,7 +7,6 @@ cstdint
cstring
ctime
iosfwd
-latch
limits
ratio
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
index 49fcbf44c5b21..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
@@ -1,5 +1,4 @@
cstddef
cstdint
-limits
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
index e13c604d6a1c3..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
@@ -17,7 +17,6 @@ initializer_list
iosfwd
iterator
limits
-list
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
index 456f5a21cd675..ecff294a2587b 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
@@ -24,7 +24,6 @@ ios
iosfwd
iterator
limits
-locale
memory
mutex
new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
index bc84d668429c7..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
@@ -17,7 +17,6 @@ initializer_list
iosfwd
iterator
limits
-map
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
index db28f1f58dd4c..f90c01f7a521d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
@@ -13,7 +13,6 @@ initializer_list
iosfwd
iterator
limits
-memory
new
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
index dcaffb654be30..1afa1e305c66d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
@@ -23,7 +23,6 @@ iosfwd
iterator
limits
memory
-mutex
new
optional
ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.new b/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
index 9fd8f6aabd0c9..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
@@ -2,6 +2,5 @@ cstddef
cstdint
cstdlib
exception
-new
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
index a8b65fc82096b..31e9f436e6cd3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
@@ -1,6 +1,5 @@
concepts
cstddef
cstdint
-numbers
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
index 2597d54ce83f2..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
@@ -19,7 +19,6 @@ iterator
limits
memory
new
-numeric
optional
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
index 6b236d30066e8..db28f1f58dd4c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
@@ -15,7 +15,6 @@ iterator
limits
memory
new
-optional
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
index c5cea41f9f069..06ee15d163d80 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
@@ -30,7 +30,6 @@ memory
mutex
new
optional
-ostream
ratio
stdexcept
streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
index a9915f611df68..e3144557aa464 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
@@ -21,7 +21,6 @@ limits
memory
new
optional
-queue
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.random b/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
index f61748b1a301c..c4cd48f6c6459 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
@@ -25,7 +25,6 @@ memory
new
numeric
optional
-random
ratio
stdexcept
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
index 228747c4026b8..96d634628cbfb 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
@@ -20,7 +20,6 @@ limits
memory
new
optional
-ranges
ratio
span
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
index deda945f1b575..29043403235fa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
@@ -1,6 +1,5 @@
climits
cstddef
cstdint
-ratio
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
index 7dfb8e6684618..fd34735b9a8d5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
@@ -28,7 +28,6 @@ mutex
new
optional
ratio
-regex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
index 22b72aa76685b..db28f1f58dd4c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
@@ -16,7 +16,6 @@ limits
memory
new
ratio
-scoped_allocator
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
index 5d6f0da391d0c..a211832b18bbe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
@@ -9,6 +9,5 @@ ctime
iosfwd
limits
ratio
-semaphore
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
index f41727fc4a568..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
@@ -21,7 +21,6 @@ memory
new
optional
ratio
-set
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
index 1372d40d24707..1afa1e305c66d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
@@ -26,7 +26,6 @@ memory
new
optional
ratio
-shared_mutex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.span b/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
index 96d634628cbfb..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
@@ -21,7 +21,6 @@ memory
new
optional
ratio
-span
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
index 00e0758f4cced..cd2a2f405afb9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
@@ -33,7 +33,6 @@ new
optional
ostream
ratio
-sstream
stdexcept
streambuf
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
index 21de647a7b6da..e3144557aa464 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
@@ -22,7 +22,6 @@ memory
new
optional
ratio
-stack
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
index b8dd684ffcbbf..e9e1b1a3af1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
@@ -3,6 +3,5 @@ cstdint
cstdlib
exception
iosfwd
-stdexcept
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
index fa7e9ba84a376..b2eec45518af9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
@@ -29,7 +29,6 @@ new
optional
ratio
stdexcept
-streambuf
string
string_view
system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
index b90a8c85d103f..8b80b5bc5be53 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
@@ -26,7 +26,6 @@ new
optional
ratio
stdexcept
-string
string_view
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
index 8b80b5bc5be53..f476d89a6f217 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
@@ -26,7 +26,6 @@ new
optional
ratio
stdexcept
-string_view
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
index 9ebf526c6ae56..cd2a2f405afb9 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
@@ -37,7 +37,6 @@ stdexcept
streambuf
string
string_view
-strstream
system_error
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
index 1afa1e305c66d..47bb23bb78ed8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
@@ -29,7 +29,6 @@ ratio
stdexcept
string
string_view
-system_error
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
index e314e55945371..1afa1e305c66d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
@@ -30,7 +30,6 @@ stdexcept
string
string_view
system_error
-thread
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
index 69858dc888c3b..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
@@ -8,7 +8,6 @@ initializer_list
iosfwd
limits
new
-tuple
type_traits
typeinfo
utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
index 8448275a1728c..fa3e26219e865 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
@@ -1,4 +1,3 @@
cstddef
cstdint
-type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
index 8f1c652535378..6b1d2d94efd6e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
@@ -9,7 +9,6 @@ iosfwd
limits
new
type_traits
-typeindex
typeinfo
utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
index 609a604805c9b..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
@@ -3,5 +3,4 @@ cstdint
cstdlib
exception
type_traits
-typeinfo
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
index 0d226147d5151..6ae4114122e1c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
@@ -23,7 +23,6 @@ stdexcept
tuple
type_traits
typeinfo
-unordered_map
utility
variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
index 44f4fd5840052..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
@@ -26,7 +26,6 @@ tuple
type_traits
typeinfo
unordered_map
-unordered_set
utility
variant
vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
index 799a14724cf41..2f34f998b4faa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
@@ -7,5 +7,4 @@ initializer_list
iosfwd
limits
type_traits
-utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
index 445b715ab6e90..243ba6b8ea533 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
@@ -27,7 +27,6 @@ type_traits
typeinfo
unordered_map
utility
-valarray
variant
vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
index d94d72974cb84..accc76242aff2 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
@@ -13,5 +13,4 @@ tuple
type_traits
typeinfo
utility
-variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
index 9fbca5e0516d4..f8ccff41c2bb1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
@@ -24,5 +24,4 @@ type_traits
typeinfo
utility
variant
-vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.version b/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
index 088eda41aa61d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
index 8e539be98cbcc..2ba3140287193 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
atomic
bit
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
index 4f3cff5c06341..3b7a13de63fe8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
@@ -1,4 +1,3 @@
-any
atomic
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
index 0fb1b67d13d02..f700e97efd767 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
@@ -1,4 +1,3 @@
-array
cmath
compare
concepts
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
index 42e3c191ac896..795fc62ff8451 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
@@ -1,4 +1,3 @@
-atomic
climits
cstddef
cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
index cb7845f45e0c1..3b7a13de63fe8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
@@ -1,5 +1,4 @@
atomic
-barrier
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
index 3f58643d60625..38ff6fba54f7c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
@@ -1,4 +1,3 @@
-bit
cstddef
cstdint
cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
index d3ee4af66e1b9..960707082bab5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
@@ -1,5 +1,4 @@
atomic
-bitset
cctype
climits
cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
index 69b779ef2f206..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
index cfc2d04436fef..eb5fe7c87bf7a 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
@@ -1,6 +1,5 @@
atomic
bitset
-ccomplex
cctype
cerrno
climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
index a82e62c088dce..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
index 24c00a9877c3b..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
index 9980586372456..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
index 3bb5aa14cfbfe..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
index 448fc06daf921..c76df9aef8465 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
@@ -1,5 +1,4 @@
cerrno
-charconv
cmath
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
index fdb624bc1df42..9f1521d4d4835 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
@@ -1,4 +1,3 @@
-chrono
climits
cmath
compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
index 911d5dd27d082..37103a4f4b892 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
index 6c1d5458c9c9c..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
index 271e000221016..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
index 0ac42c4b403ed..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
index 7678c0e38802c..49fcbf44c5b21 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
@@ -1,4 +1,3 @@
-cmath
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
index f846715edf800..1aa71f549fd49 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
@@ -3,7 +3,6 @@ cctype
cerrno
climits
cmath
-codecvt
compare
concepts
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
index df2d92f5d4b6c..7678c0e38802c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
@@ -1,5 +1,4 @@
cmath
-compare
cstddef
cstdint
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
index eb5fe7c87bf7a..1acc28a14008e 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
@@ -5,7 +5,6 @@ cerrno
climits
cmath
compare
-complex
concepts
cstdarg
cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
index 31e9f436e6cd3..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
@@ -1,4 +1,3 @@
-concepts
cstddef
cstdint
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
index 081849db56d28..30ca93cf23bdd 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
@@ -5,7 +5,6 @@ climits
cmath
compare
concepts
-condition_variable
cstddef
cstdint
cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
index 1f31012bf5be6..2443665e8d03f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
@@ -1,6 +1,5 @@
cmath
compare
-coroutine
cstddef
cstdint
cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
index 2f72e67f0324d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
index c17f2a3b99dfb..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
index ce71517eeb149..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
index f3a52bba86c16..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
index 7b45506ea14b3..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
@@ -1,2 +1 @@
-cstddef
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
index 37103a4f4b892..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
index 5b70aa3cf8d42..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
index b98a7237dde79..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
index 0fdbe597c9df1..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
index ac37b74ac56e2..cfc2d04436fef 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
@@ -14,7 +14,6 @@ cstdint
cstdio
cstdlib
cstring
-ctgmath
ctime
cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
index ee049c40b25b3..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
index 588664ab50b3f..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
index 1e6c2091fa4a0..fa1b7f2569941 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
@@ -1,3 +1,2 @@
cctype
-cwchar
cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
index fa1b7f2569941..a82e62c088dce 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
@@ -1,2 +1 @@
cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
index aa51131432eac..3b7a13de63fe8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
@@ -8,7 +8,6 @@ cstdint
cstdlib
cstring
ctime
-deque
exception
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
index c48f9ed9e744d..4c4515dcec7d1 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
@@ -1,6 +1,5 @@
cstddef
cstdint
cstdlib
-exception
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
index b42e7095b5800..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
@@ -1,2 +1 @@
-execution
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
index 7e307913a9fe4..8e539be98cbcc 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
@@ -11,7 +11,6 @@ cstdlib
cstring
ctime
exception
-experimental/algorithm
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
index 89fc3edcec46d..3b7a13de63fe8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
@@ -9,7 +9,6 @@ cstdlib
cstring
ctime
exception
-experimental/coroutine
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
index e1677c7dd843b..7ea4c318ba5d6 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
@@ -10,7 +10,6 @@ cstring
ctime
deque
exception
-experimental/deque
experimental/memory_resource
experimental/utility
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
index af433ce909496..345444b4dc748 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
@@ -9,7 +9,6 @@ cstdlib
cstring
ctime
exception
-experimental/forward_list
experimental/memory_resource
experimental/utility
forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
index ce502b5e98035..944f5a2cedd79 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-experimental/functional
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
index 83a9b8d93c65e..698f6cf9de2f0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
@@ -6,7 +6,6 @@ cstdint
cstdlib
cstring
exception
-experimental/iterator
initializer_list
iosfwd
iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
index aae9f23d08e97..794d13ed74656 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
@@ -9,7 +9,6 @@ cstdlib
cstring
ctime
exception
-experimental/list
experimental/memory_resource
experimental/utility
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
index cb76c7642ec9c..69067ff958d08 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
@@ -9,7 +9,6 @@ cstdlib
cstring
ctime
exception
-experimental/map
experimental/memory_resource
experimental/utility
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
index 67d2441ae3691..36bd21dbc0797 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
@@ -9,7 +9,6 @@ cstdlib
cstring
ctime
exception
-experimental/memory_resource
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
index a78fa83bc983f..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
cstddef
cstdint
-experimental/propagate_const
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
index 6490adb5a1b4e..a73c05437d8cb 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
@@ -16,7 +16,6 @@ cwctype
deque
exception
experimental/memory_resource
-experimental/regex
experimental/string
experimental/utility
initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
index 03a09aff0574b..1f0e829733282 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
@@ -10,7 +10,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/set
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
index 999b0aafb666a..9908a3e3ee370 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
@@ -6,7 +6,6 @@ cstddef
cstdint
cstdlib
exception
-experimental/simd
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
index 4fb05391c7b46..bb9f8892e4d2f 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
@@ -14,7 +14,6 @@ cwchar
cwctype
exception
experimental/memory_resource
-experimental/string
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
index c1e83e731fbd2..5866e56e076ea 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
@@ -1,6 +1,5 @@
cstddef
cstdint
-experimental/type_traits
initializer_list
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
index 04efa3377d816..c9efa53073e42 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
@@ -10,7 +10,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_map
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
index 798b920506cfa..1b34d3cfe7f83 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
@@ -10,7 +10,6 @@ cstring
ctime
exception
experimental/memory_resource
-experimental/unordered_set
experimental/utility
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
index 788283fb30b9c..30781fff93362 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
@@ -3,7 +3,6 @@ compare
cstddef
cstdint
cstdlib
-experimental/utility
initializer_list
limits
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
index 35355e4d3547e..0813d43655e70 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
@@ -11,7 +11,6 @@ ctime
exception
experimental/memory_resource
experimental/utility
-experimental/vector
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
index 238ba8fade717..5c77f4dd4955c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
@@ -16,7 +16,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_map
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
index 5e58c46663a50..5c77f4dd4955c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
@@ -16,7 +16,6 @@ ctime
cwchar
cwctype
exception
-ext/hash_set
functional
initializer_list
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
index adc5812121df0..86446ab031fbf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
@@ -16,7 +16,6 @@ ctime
cwchar
cwctype
exception
-filesystem
initializer_list
iomanip
ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
index d88f3f66919f8..e01e3c7db48cf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
@@ -18,7 +18,6 @@ ctime
cwchar
cwctype
exception
-format
initializer_list
ios
iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
index de184d39a0dae..3b7a13de63fe8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
@@ -9,7 +9,6 @@ cstdlib
cstring
ctime
exception
-forward_list
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
index 31ef4da046304..adc5812121df0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
@@ -17,7 +17,6 @@ cwchar
cwctype
exception
filesystem
-fstream
initializer_list
iomanip
ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
index 944f5a2cedd79..3079923e12766 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
@@ -10,7 +10,6 @@ cstdlib
cstring
ctime
exception
-functional
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
index 978baba9b8ecb..92035b6091105 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
@@ -14,7 +14,6 @@ ctime
cwchar
cwctype
exception
-future
initializer_list
iosfwd
limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
index 8b92a6553ca19..7b45506ea14b3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
@@ -1,3 +1,2 @@
cstddef
-initializer_list
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
index 86446ab031fbf..cbd4a87c16134 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
@@ -17,7 +17,6 @@ cwchar
cwctype
exception
initializer_list
-iomanip
ios
iosfwd
istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
index 3ecae9323ab41..1aa71f549fd49 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
@@ -15,7 +15,6 @@ cwchar
cwctype
exception
initializer_list
-ios
iosfwd
limits
memory
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
index ff6e0e3d092b7..088eda41aa61d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
index 2e4e74cc18b47..cbd4a87c16134 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
@@ -19,7 +19,6 @@ exception
initializer_list
ios
iosfwd
-iostream
istream
limits
locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
index cbd4a87c16134..1d7da3e2f96dc 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
@@ -19,7 +19,6 @@ exception
initializer_list
ios
iosfwd
-istream
limits
locale
memory
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
index 698f6cf9de2f0..dd2860cbf0bd7 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
@@ -8,7 +8,6 @@ cstring
exception
initializer_list
iosfwd
-iterator
limits
new
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
index 3d00941b92311..42e3c191ac896 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
@@ -5,7 +5,6 @@ cstdint
cstring
ctime
iosfwd
-latch
limits
ratio
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
index 49fcbf44c5b21..8448275a1728c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
@@ -1,5 +1,4 @@
cstddef
cstdint
-limits
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
index 96d4f33db7d4e..3b7a13de63fe8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
@@ -12,7 +12,6 @@ exception
initializer_list
iosfwd
limits
-list
memory
new
ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
index cdd6609f84403..4872956288ba7 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
@@ -19,7 +19,6 @@ initializer_list
ios
iosfwd
limits
-locale
memory
mutex
new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
index a6896289ab3fd..b319682ec3f58 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
@@ -12,7 +12,6 @@ exception
initializer_list
iosfwd
limits
-map
memory
new
optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
index 3b7a13de63fe8..626b4a41fe977 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
@@ -12,7 +12,6 @@ exception
initializer_list
iosfwd
limits
-memory
new
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
index 1aa71f549fd49..30ca93cf23bdd 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
@@ -18,7 +18,6 @@ initializer_list
iosfwd
limits
memory
-mutex
new
ratio
stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
index 9fd8f6aabd0c9..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
@@ -2,6 +2,5 @@ cstddef
cstdint
cstdlib
exception
-new
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
index a8b65fc82096b..31e9f436e6cd3 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
@@ -1,6 +1,5 @@
concepts
cstddef
cstdint
-numbers
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
index 843582958e10f..460bf6a8ee373 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
@@ -3,6 +3,5 @@ concepts
cstddef
cstdint
limits
-numeric
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
index e888c8f4e0bd4..cb2bf10d17ef0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
@@ -9,7 +9,6 @@ initializer_list
iosfwd
limits
new
-optional
stdexcept
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
index 1d7da3e2f96dc..2d9bbe970eb15 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
@@ -24,7 +24,6 @@ locale
memory
mutex
new
-ostream
ratio
stdexcept
streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
index 85fd646e834cf..97a5262217483 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
@@ -18,7 +18,6 @@ limits
memory
new
optional
-queue
ratio
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
index c8060db2909ac..0aae5eb71c7d7 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
@@ -20,7 +20,6 @@ limits
memory
new
numeric
-random
ratio
stdexcept
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
index f16d5e5d55052..c0faf1803c6a6 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
@@ -13,7 +13,6 @@ iterator
limits
new
optional
-ranges
span
stdexcept
tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
index deda945f1b575..29043403235fa 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
@@ -1,6 +1,5 @@
climits
cstddef
cstdint
-ratio
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
index 447e31831d8fc..da1e93138977a 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
@@ -22,7 +22,6 @@ memory
mutex
new
ratio
-regex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
index f4345de47a6ab..3b7a13de63fe8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
@@ -15,7 +15,6 @@ limits
memory
new
ratio
-scoped_allocator
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
index 6893d09955064..42e3c191ac896 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
@@ -7,6 +7,5 @@ ctime
iosfwd
limits
ratio
-semaphore
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
index 9b0f3cb52c187..b319682ec3f58 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
@@ -16,7 +16,6 @@ memory
new
optional
ratio
-set
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
index 2bd4140b3d11c..30ca93cf23bdd 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
@@ -20,7 +20,6 @@ limits
memory
new
ratio
-shared_mutex
stdexcept
string
string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
index 4ec98478d7ab6..0fb1b67d13d02 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
@@ -9,7 +9,6 @@ exception
initializer_list
iosfwd
limits
-span
stdexcept
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
index 1acc28a14008e..cbd4a87c16134 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
@@ -27,7 +27,6 @@ mutex
new
ostream
ratio
-sstream
stdexcept
streambuf
string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
index 17c8d991260c8..aa51131432eac 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
@@ -16,7 +16,6 @@ limits
memory
new
ratio
-stack
stdexcept
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
index b8dd684ffcbbf..e9e1b1a3af1a0 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
@@ -3,6 +3,5 @@ cstdint
cstdlib
exception
iosfwd
-stdexcept
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
index 5e8e278a70ff5..3ecae9323ab41 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
@@ -23,7 +23,6 @@ mutex
new
ratio
stdexcept
-streambuf
string
string_view
system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
index 960707082bab5..2cb394a387b20 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
@@ -20,7 +20,6 @@ memory
new
ratio
stdexcept
-string
string_view
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
index 6bb7edfd0bf09..e287602d83000 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
@@ -14,6 +14,5 @@ initializer_list
iosfwd
limits
stdexcept
-string_view
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
index ed208f4d5eb37..cbd4a87c16134 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
@@ -31,7 +31,6 @@ stdexcept
streambuf
string
string_view
-strstream
system_error
tuple
type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
index 30ca93cf23bdd..033d198c2bbe5 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
@@ -23,7 +23,6 @@ ratio
stdexcept
string
string_view
-system_error
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
index 102ca58917136..30ca93cf23bdd 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
@@ -24,7 +24,6 @@ stdexcept
string
string_view
system_error
-thread
tuple
type_traits
typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
index 2a4e44c6f4e91..df2d92f5d4b6c 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
@@ -3,6 +3,5 @@ compare
cstddef
cstdint
limits
-tuple
type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
index 8448275a1728c..fa3e26219e865 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
@@ -1,4 +1,3 @@
cstddef
cstdint
-type_traits
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
index 8ed579013db7c..9643f796f202a 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
@@ -6,6 +6,5 @@ cstdlib
exception
limits
type_traits
-typeindex
typeinfo
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
index 609a604805c9b..c48f9ed9e744d 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
@@ -3,5 +3,4 @@ cstdint
cstdlib
exception
type_traits
-typeinfo
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
index 4f2f2ff023885..b319682ec3f58 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
@@ -20,5 +20,4 @@ stdexcept
tuple
type_traits
typeinfo
-unordered_map
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
index 2c825fb58ac98..b319682ec3f58 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
@@ -20,5 +20,4 @@ stdexcept
tuple
type_traits
typeinfo
-unordered_set
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
index 30781fff93362..16f4b2e8c3213 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
@@ -6,5 +6,4 @@ cstdlib
initializer_list
limits
type_traits
-utility
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
index b5543ea5c701d..bdf7a26634297 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
@@ -11,5 +11,4 @@ limits
new
stdexcept
type_traits
-valarray
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
index 44553c77ce567..03c4103698fe7 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
@@ -10,5 +10,4 @@ limits
new
tuple
type_traits
-variant
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
index 9553eb0c04d73..3b7a13de63fe8 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
@@ -19,5 +19,4 @@ stdexcept
tuple
type_traits
typeinfo
-vector
version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
index 088eda41aa61d..8b137891791fe 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
@@ -1 +1 @@
-version
+
More information about the libcxx-commits
mailing list