[libcxx-commits] [libcxx] 34dfdd1 - [libc++][test] Improves transitive includes.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2022-09-25T13:20:27+02:00
New Revision: 34dfdd17af19488c80eacf10131f194498190b54

URL: https://github.com/llvm/llvm-project/commit/34dfdd17af19488c80eacf10131f194498190b54
DIFF: https://github.com/llvm/llvm-project/commit/34dfdd17af19488c80eacf10131f194498190b54.diff

LOG: [libc++][test] Improves transitive includes.

This test generates the include graph of the Standard headers of libc++ in
a CSV file. This was originally used to generate graphviz dot files. During
review it was noticed these files have all information needed to replace
the current transitive includes. Therefore the output, with the same information as the .dot file is stored in a .csv file. This removes
all the existing transitive include files.

The .cvs can be converted by a .dot file by the script in D134188.

Reviewed By: #libc, ldionne

Differential Revision: https://reviews.llvm.org/D133127

Added: 
    libcxx/test/libcxx/transitive_includes/cxx03.csv
    libcxx/test/libcxx/transitive_includes/cxx11.csv
    libcxx/test/libcxx/transitive_includes/cxx14.csv
    libcxx/test/libcxx/transitive_includes/cxx17.csv
    libcxx/test/libcxx/transitive_includes/cxx20.csv
    libcxx/test/libcxx/transitive_includes/cxx2b.csv
    libcxx/test/libcxx/transitive_includes_to_csv.py

Modified: 
    libcxx/test/libcxx/transitive_includes.sanitize.py
    libcxx/test/libcxx/transitive_includes.sh.cpp

Removed: 
    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


################################################################################
diff  --git a/libcxx/test/libcxx/transitive_includes.sanitize.py b/libcxx/test/libcxx/transitive_includes.sanitize.py
index 26dd4e2a23944..f528f8f95907e 100755
--- a/libcxx/test/libcxx/transitive_includes.sanitize.py
+++ b/libcxx/test/libcxx/transitive_includes.sanitize.py
@@ -1,76 +1,70 @@
 #!/usr/bin/env python
-#===----------------------------------------------------------------------===##
+# ===----------------------------------------------------------------------===##
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
-#===----------------------------------------------------------------------===##
+# ===----------------------------------------------------------------------===##
 
-# This script reads lines from standard input and looks for the names of public C++ headers.
-# 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.
+# This script reads lines from standard input and looks for the names of public
+# C++ headers. 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. (Note it keeps the libc++ implementation detail .h files.)
+
+# Note --trace-includes removes duplicates of included headers unless they are
+# part of a cycle.
 
 # 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
+# . ${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
+# .... ${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
+
+# The filtered output will be like:
 # type_traits
+# . algorithm
+# ... cstddef
+# .... __type_traits/enable_if.h
+# .... __type_traits/integral_constant.h
+# .... __type_traits/is_integral.h
+# ..... __type_traits/remove_cv.h
+# ...... __type_traits/remove_const.h
+# ...... __type_traits/remove_volatile.h
+# .... version
 
-import os
 import re
 import sys
 
-# Determine the top-level header in the input.
-top_level_header = None
-while True:
-    line = sys.stdin.readline()
+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.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():
-    match = re.search(r"c\+\+(?:/|\\\\)v[0-9]+(?:/|\\\\)(.+)", line)
+    match = re.match(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
-
-    if os.path.basename(header).startswith("__"):  # Skip internal headers
+    header = match.group(2)
+    # Skip C headers, but accept libc++ detail headers.
+    if header.startswith("__"):
+        if not header.endswith(".h"):
+            continue
+    elif header.endswith(".h"):
         continue
 
-    if header == top_level_header:
-        sys.exit(f"Cyclic dependency in header {header}")
-
-    headers.append(header)
-
-print("\n".join(sorted(set(headers))))
+    print(f"{match.group(1)} {match.group(2)}")

diff  --git a/libcxx/test/libcxx/transitive_includes.sh.cpp b/libcxx/test/libcxx/transitive_includes.sh.cpp
index a17a3fbd1dcff..a65a135bc48c0 100644
--- a/libcxx/test/libcxx/transitive_includes.sh.cpp
+++ b/libcxx/test/libcxx/transitive_includes.sh.cpp
@@ -50,629 +50,512 @@ import re
 # Note that this needs to be done for all supported language versions of libc++:
 # for std in c++03 c++11 c++14 c++17 c++20 c++2b; do <build>/bin/llvm-lit --param std=$std ${path_to_this_file}; done
 regenerate_expected_results = False
-
 # Used because the sequence of tokens RUN : can't appear anywhere or it'll confuse Lit.
 RUN = "RUN"
 
-if regenerate_expected_results:
-  print(f"// {RUN}: rm -rf %S/transitive_includes/%{{cxx_std}}")
-  print(f"// {RUN}: mkdir %S/transitive_includes/%{{cxx_std}}")
+print(f"// {RUN}: mkdir %t")
 
 for i, header in enumerate(public_headers):
-  if header.endswith('.h'): # Skip C compatibility headers
+  if header.endswith('.h'): # Skip C compatibility or detail headers
     continue
 
   normalized_header = re.sub('/', '_', header)
   trace_includes = "%{{cxx}} %s %{{flags}} %{{compile_flags}} --trace-includes -fsyntax-only -DTEST_{} 2>&1".format(i)
 
-  if regenerate_expected_results:
-    print(f"// {RUN}: {trace_includes} | %{{python}} %S/transitive_includes.sanitize.py > %S/transitive_includes/%{{cxx_std}}/expected.{normalized_header}")
-  else:
-    print(f"// {RUN}: {trace_includes} | %{{python}} %S/transitive_includes.sanitize.py > %t.actual.{normalized_header}")
-    print(f"// {RUN}: 
diff  -w %S/transitive_includes/%{{cxx_std}}/expected.{normalized_header} %t.actual.{normalized_header}")
+  print(f"// {RUN}: {trace_includes} | %{{python}} %S/transitive_includes.sanitize.py > %t/header.{normalized_header}")
 
   print(f"#if defined(TEST_{i})")
   print(f"#include <{header}>")
   print("#endif")
 
+if regenerate_expected_results:
+  print(f"// {RUN}: %{{python}} %S/transitive_includes_to_csv.py %t > %S/transitive_includes/%{{cxx_std}}.csv")
+else:
+  print(f"// {RUN}: %{{python}} %S/transitive_includes_to_csv.py %t > %t/transitive_includes.csv")
+  print(f"// {RUN}: 
diff  -w %S/transitive_includes/%{{cxx_std}}.csv %t/transitive_includes.csv")
+
 END-SCRIPT
 */
 
 // DO NOT MANUALLY EDIT ANYTHING BETWEEN THE MARKERS BELOW
 // GENERATED-MARKER
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_0 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.algorithm
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.algorithm %t.actual.algorithm
+// RUN: mkdir %t
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_0 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.algorithm
 #if defined(TEST_0)
 #include <algorithm>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_1 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.any
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.any %t.actual.any
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_1 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.any
 #if defined(TEST_1)
 #include <any>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_2 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.array
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.array %t.actual.array
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_2 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.array
 #if defined(TEST_2)
 #include <array>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_3 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.atomic
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.atomic %t.actual.atomic
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_3 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.atomic
 #if defined(TEST_3)
 #include <atomic>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_4 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.barrier
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.barrier %t.actual.barrier
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_4 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.barrier
 #if defined(TEST_4)
 #include <barrier>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_5 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.bit
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.bit %t.actual.bit
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_5 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.bit
 #if defined(TEST_5)
 #include <bit>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_6 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.bitset
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.bitset %t.actual.bitset
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_6 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.bitset
 #if defined(TEST_6)
 #include <bitset>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_7 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cassert
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cassert %t.actual.cassert
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_7 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cassert
 #if defined(TEST_7)
 #include <cassert>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_8 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ccomplex
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ccomplex %t.actual.ccomplex
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_8 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ccomplex
 #if defined(TEST_8)
 #include <ccomplex>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_9 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cctype
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cctype %t.actual.cctype
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_9 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cctype
 #if defined(TEST_9)
 #include <cctype>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_10 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cerrno
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cerrno %t.actual.cerrno
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_10 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cerrno
 #if defined(TEST_10)
 #include <cerrno>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_11 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cfenv
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cfenv %t.actual.cfenv
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_11 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cfenv
 #if defined(TEST_11)
 #include <cfenv>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_12 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cfloat
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cfloat %t.actual.cfloat
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_12 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cfloat
 #if defined(TEST_12)
 #include <cfloat>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_13 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.charconv
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.charconv %t.actual.charconv
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_13 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.charconv
 #if defined(TEST_13)
 #include <charconv>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_14 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.chrono
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.chrono %t.actual.chrono
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_14 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.chrono
 #if defined(TEST_14)
 #include <chrono>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_15 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cinttypes
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cinttypes %t.actual.cinttypes
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_15 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cinttypes
 #if defined(TEST_15)
 #include <cinttypes>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_16 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ciso646
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ciso646 %t.actual.ciso646
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_16 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ciso646
 #if defined(TEST_16)
 #include <ciso646>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_17 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.climits
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.climits %t.actual.climits
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_17 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.climits
 #if defined(TEST_17)
 #include <climits>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_18 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.clocale
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.clocale %t.actual.clocale
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_18 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.clocale
 #if defined(TEST_18)
 #include <clocale>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_19 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cmath
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cmath %t.actual.cmath
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_19 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cmath
 #if defined(TEST_19)
 #include <cmath>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_20 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.codecvt
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.codecvt %t.actual.codecvt
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_20 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.codecvt
 #if defined(TEST_20)
 #include <codecvt>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_21 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.compare
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.compare %t.actual.compare
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_21 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.compare
 #if defined(TEST_21)
 #include <compare>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_22 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.complex
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.complex %t.actual.complex
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_22 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.complex
 #if defined(TEST_22)
 #include <complex>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_24 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.concepts
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.concepts %t.actual.concepts
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_24 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.concepts
 #if defined(TEST_24)
 #include <concepts>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_25 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.condition_variable
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.condition_variable %t.actual.condition_variable
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_25 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.condition_variable
 #if defined(TEST_25)
 #include <condition_variable>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_26 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.coroutine
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.coroutine %t.actual.coroutine
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_26 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.coroutine
 #if defined(TEST_26)
 #include <coroutine>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_27 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.csetjmp
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.csetjmp %t.actual.csetjmp
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_27 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.csetjmp
 #if defined(TEST_27)
 #include <csetjmp>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_28 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.csignal
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.csignal %t.actual.csignal
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_28 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.csignal
 #if defined(TEST_28)
 #include <csignal>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_29 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdarg
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cstdarg %t.actual.cstdarg
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_29 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cstdarg
 #if defined(TEST_29)
 #include <cstdarg>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_30 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdbool
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cstdbool %t.actual.cstdbool
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_30 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cstdbool
 #if defined(TEST_30)
 #include <cstdbool>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_31 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstddef
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cstddef %t.actual.cstddef
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_31 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cstddef
 #if defined(TEST_31)
 #include <cstddef>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_32 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdint
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cstdint %t.actual.cstdint
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_32 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cstdint
 #if defined(TEST_32)
 #include <cstdint>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_33 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdio
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cstdio %t.actual.cstdio
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_33 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cstdio
 #if defined(TEST_33)
 #include <cstdio>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_34 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdlib
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cstdlib %t.actual.cstdlib
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_34 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cstdlib
 #if defined(TEST_34)
 #include <cstdlib>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_35 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstring
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cstring %t.actual.cstring
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_35 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cstring
 #if defined(TEST_35)
 #include <cstring>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_36 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ctgmath
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ctgmath %t.actual.ctgmath
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_36 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ctgmath
 #if defined(TEST_36)
 #include <ctgmath>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_37 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ctime
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ctime %t.actual.ctime
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_37 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ctime
 #if defined(TEST_37)
 #include <ctime>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_39 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cuchar
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cuchar %t.actual.cuchar
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_39 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cuchar
 #if defined(TEST_39)
 #include <cuchar>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_40 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cwchar
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cwchar %t.actual.cwchar
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_40 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cwchar
 #if defined(TEST_40)
 #include <cwchar>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_41 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cwctype
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.cwctype %t.actual.cwctype
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_41 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.cwctype
 #if defined(TEST_41)
 #include <cwctype>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_42 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.deque
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.deque %t.actual.deque
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_42 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.deque
 #if defined(TEST_42)
 #include <deque>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_44 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.exception
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.exception %t.actual.exception
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_44 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.exception
 #if defined(TEST_44)
 #include <exception>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_45 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.execution
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.execution %t.actual.execution
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_45 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.execution
 #if defined(TEST_45)
 #include <execution>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_47 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.filesystem
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.filesystem %t.actual.filesystem
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_47 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.filesystem
 #if defined(TEST_47)
 #include <filesystem>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_49 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.format
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.format %t.actual.format
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_49 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.format
 #if defined(TEST_49)
 #include <format>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_50 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.forward_list
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.forward_list %t.actual.forward_list
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_50 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.forward_list
 #if defined(TEST_50)
 #include <forward_list>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_51 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.fstream
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.fstream %t.actual.fstream
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_51 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.fstream
 #if defined(TEST_51)
 #include <fstream>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_52 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.functional
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.functional %t.actual.functional
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_52 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.functional
 #if defined(TEST_52)
 #include <functional>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_53 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.future
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.future %t.actual.future
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_53 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.future
 #if defined(TEST_53)
 #include <future>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_54 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.initializer_list
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.initializer_list %t.actual.initializer_list
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_54 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.initializer_list
 #if defined(TEST_54)
 #include <initializer_list>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_56 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.iomanip
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.iomanip %t.actual.iomanip
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_56 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.iomanip
 #if defined(TEST_56)
 #include <iomanip>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_57 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ios
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ios %t.actual.ios
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_57 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ios
 #if defined(TEST_57)
 #include <ios>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_58 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.iosfwd
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.iosfwd %t.actual.iosfwd
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_58 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.iosfwd
 #if defined(TEST_58)
 #include <iosfwd>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_59 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.iostream
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.iostream %t.actual.iostream
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_59 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.iostream
 #if defined(TEST_59)
 #include <iostream>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_60 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.istream
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.istream %t.actual.istream
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_60 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.istream
 #if defined(TEST_60)
 #include <istream>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_61 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.iterator
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.iterator %t.actual.iterator
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_61 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.iterator
 #if defined(TEST_61)
 #include <iterator>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_62 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.latch
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.latch %t.actual.latch
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_62 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.latch
 #if defined(TEST_62)
 #include <latch>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_63 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.limits
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.limits %t.actual.limits
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_63 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.limits
 #if defined(TEST_63)
 #include <limits>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_65 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.list
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.list %t.actual.list
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_65 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.list
 #if defined(TEST_65)
 #include <list>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_66 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.locale
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.locale %t.actual.locale
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_66 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.locale
 #if defined(TEST_66)
 #include <locale>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_68 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.map
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.map %t.actual.map
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_68 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.map
 #if defined(TEST_68)
 #include <map>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_70 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.memory
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.memory %t.actual.memory
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_70 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.memory
 #if defined(TEST_70)
 #include <memory>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_71 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.mutex
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.mutex %t.actual.mutex
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_71 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.mutex
 #if defined(TEST_71)
 #include <mutex>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_72 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.new
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.new %t.actual.new
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_72 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.new
 #if defined(TEST_72)
 #include <new>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_73 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.numbers
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.numbers %t.actual.numbers
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_73 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.numbers
 #if defined(TEST_73)
 #include <numbers>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_74 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.numeric
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.numeric %t.actual.numeric
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_74 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.numeric
 #if defined(TEST_74)
 #include <numeric>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_75 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.optional
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.optional %t.actual.optional
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_75 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.optional
 #if defined(TEST_75)
 #include <optional>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_76 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ostream
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ostream %t.actual.ostream
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_76 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ostream
 #if defined(TEST_76)
 #include <ostream>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_77 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.queue
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.queue %t.actual.queue
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_77 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.queue
 #if defined(TEST_77)
 #include <queue>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_78 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.random
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.random %t.actual.random
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_78 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.random
 #if defined(TEST_78)
 #include <random>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_79 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ranges
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ranges %t.actual.ranges
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_79 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ranges
 #if defined(TEST_79)
 #include <ranges>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_80 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ratio
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ratio %t.actual.ratio
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_80 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ratio
 #if defined(TEST_80)
 #include <ratio>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_81 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.regex
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.regex %t.actual.regex
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_81 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.regex
 #if defined(TEST_81)
 #include <regex>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_82 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.scoped_allocator
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.scoped_allocator %t.actual.scoped_allocator
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_82 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.scoped_allocator
 #if defined(TEST_82)
 #include <scoped_allocator>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_83 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.semaphore
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.semaphore %t.actual.semaphore
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_83 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.semaphore
 #if defined(TEST_83)
 #include <semaphore>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_84 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.set
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.set %t.actual.set
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_84 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.set
 #if defined(TEST_84)
 #include <set>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_86 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.shared_mutex
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.shared_mutex %t.actual.shared_mutex
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_86 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.shared_mutex
 #if defined(TEST_86)
 #include <shared_mutex>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_87 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.span
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.span %t.actual.span
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_87 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.span
 #if defined(TEST_87)
 #include <span>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_88 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.sstream
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.sstream %t.actual.sstream
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_88 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.sstream
 #if defined(TEST_88)
 #include <sstream>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_89 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.stack
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.stack %t.actual.stack
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_89 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.stack
 #if defined(TEST_89)
 #include <stack>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_93 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.stdexcept
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.stdexcept %t.actual.stdexcept
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_93 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.stdexcept
 #if defined(TEST_93)
 #include <stdexcept>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_97 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.streambuf
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.streambuf %t.actual.streambuf
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_97 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.streambuf
 #if defined(TEST_97)
 #include <streambuf>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_98 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.string
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.string %t.actual.string
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_98 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.string
 #if defined(TEST_98)
 #include <string>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_100 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.string_view
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.string_view %t.actual.string_view
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_100 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.string_view
 #if defined(TEST_100)
 #include <string_view>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_101 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.strstream
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.strstream %t.actual.strstream
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_101 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.strstream
 #if defined(TEST_101)
 #include <strstream>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_102 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.system_error
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.system_error %t.actual.system_error
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_102 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.system_error
 #if defined(TEST_102)
 #include <system_error>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_104 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.thread
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.thread %t.actual.thread
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_104 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.thread
 #if defined(TEST_104)
 #include <thread>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_105 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.tuple
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.tuple %t.actual.tuple
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_105 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.tuple
 #if defined(TEST_105)
 #include <tuple>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_106 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.type_traits
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.type_traits %t.actual.type_traits
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_106 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.type_traits
 #if defined(TEST_106)
 #include <type_traits>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_107 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.typeindex
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.typeindex %t.actual.typeindex
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_107 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.typeindex
 #if defined(TEST_107)
 #include <typeindex>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_108 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.typeinfo
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.typeinfo %t.actual.typeinfo
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_108 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.typeinfo
 #if defined(TEST_108)
 #include <typeinfo>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_110 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.unordered_map
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.unordered_map %t.actual.unordered_map
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_110 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.unordered_map
 #if defined(TEST_110)
 #include <unordered_map>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_111 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.unordered_set
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.unordered_set %t.actual.unordered_set
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_111 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.unordered_set
 #if defined(TEST_111)
 #include <unordered_set>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_112 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.utility
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.utility %t.actual.utility
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_112 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.utility
 #if defined(TEST_112)
 #include <utility>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_113 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.valarray
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.valarray %t.actual.valarray
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_113 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.valarray
 #if defined(TEST_113)
 #include <valarray>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_114 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.variant
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.variant %t.actual.variant
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_114 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.variant
 #if defined(TEST_114)
 #include <variant>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_115 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.vector
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.vector %t.actual.vector
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_115 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.vector
 #if defined(TEST_115)
 #include <vector>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_116 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.version
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.version %t.actual.version
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_116 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.version
 #if defined(TEST_116)
 #include <version>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_119 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_algorithm
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_algorithm %t.actual.experimental_algorithm
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_119 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_algorithm
 #if defined(TEST_119)
 #include <experimental/algorithm>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_120 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_coroutine
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_coroutine %t.actual.experimental_coroutine
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_120 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_coroutine
 #if defined(TEST_120)
 #include <experimental/coroutine>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_121 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_deque
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_deque %t.actual.experimental_deque
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_121 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_deque
 #if defined(TEST_121)
 #include <experimental/deque>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_122 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_forward_list
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_forward_list %t.actual.experimental_forward_list
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_122 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_forward_list
 #if defined(TEST_122)
 #include <experimental/forward_list>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_123 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_functional
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_functional %t.actual.experimental_functional
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_123 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_functional
 #if defined(TEST_123)
 #include <experimental/functional>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_124 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_iterator
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_iterator %t.actual.experimental_iterator
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_124 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_iterator
 #if defined(TEST_124)
 #include <experimental/iterator>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_125 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_list
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_list %t.actual.experimental_list
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_125 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_list
 #if defined(TEST_125)
 #include <experimental/list>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_126 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_map
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_map %t.actual.experimental_map
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_126 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_map
 #if defined(TEST_126)
 #include <experimental/map>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_127 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_memory_resource
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_memory_resource %t.actual.experimental_memory_resource
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_127 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_memory_resource
 #if defined(TEST_127)
 #include <experimental/memory_resource>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_128 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_propagate_const
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_propagate_const %t.actual.experimental_propagate_const
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_128 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_propagate_const
 #if defined(TEST_128)
 #include <experimental/propagate_const>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_129 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_regex
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_regex %t.actual.experimental_regex
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_129 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_regex
 #if defined(TEST_129)
 #include <experimental/regex>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_130 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_set
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_set %t.actual.experimental_set
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_130 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_set
 #if defined(TEST_130)
 #include <experimental/set>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_131 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_simd
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_simd %t.actual.experimental_simd
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_131 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_simd
 #if defined(TEST_131)
 #include <experimental/simd>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_132 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_string
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_string %t.actual.experimental_string
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_132 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_string
 #if defined(TEST_132)
 #include <experimental/string>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_133 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_type_traits
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_type_traits %t.actual.experimental_type_traits
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_133 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_type_traits
 #if defined(TEST_133)
 #include <experimental/type_traits>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_134 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_unordered_map
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_unordered_map %t.actual.experimental_unordered_map
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_134 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_unordered_map
 #if defined(TEST_134)
 #include <experimental/unordered_map>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_135 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_unordered_set
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_unordered_set %t.actual.experimental_unordered_set
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_135 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_unordered_set
 #if defined(TEST_135)
 #include <experimental/unordered_set>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_136 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_utility
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_utility %t.actual.experimental_utility
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_136 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_utility
 #if defined(TEST_136)
 #include <experimental/utility>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_137 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_vector
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.experimental_vector %t.actual.experimental_vector
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_137 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.experimental_vector
 #if defined(TEST_137)
 #include <experimental/vector>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_138 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ext_hash_map
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ext_hash_map %t.actual.ext_hash_map
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_138 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ext_hash_map
 #if defined(TEST_138)
 #include <ext/hash_map>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_139 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ext_hash_set
-// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}/expected.ext_hash_set %t.actual.ext_hash_set
+// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_139 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t/header.ext_hash_set
 #if defined(TEST_139)
 #include <ext/hash_set>
 #endif
+// RUN: %{python} %S/transitive_includes_to_csv.py %t > %t/transitive_includes.csv
+// RUN: 
diff  -w %S/transitive_includes/%{cxx_std}.csv %t/transitive_includes.csv
 // GENERATED-MARKER

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03.csv b/libcxx/test/libcxx/transitive_includes/cxx03.csv
new file mode 100644
index 0000000000000..a13f235475828
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes/cxx03.csv
@@ -0,0 +1,586 @@
+algorithm atomic
+algorithm bit
+algorithm chrono
+algorithm climits
+algorithm concepts
+algorithm cstddef
+algorithm cstdlib
+algorithm cstring
+algorithm initializer_list
+algorithm iterator
+algorithm limits
+algorithm memory
+algorithm new
+algorithm type_traits
+any atomic
+any concepts
+any cstddef
+any cstring
+any initializer_list
+any iterator
+any limits
+any memory
+any new
+any stdexcept
+any type_traits
+any typeinfo
+array algorithm
+array compare
+array concepts
+array cstdlib
+array initializer_list
+array limits
+array stdexcept
+atomic chrono
+atomic cstring
+atomic ctime
+atomic iosfwd
+atomic limits
+atomic ratio
+barrier atomic
+barrier concepts
+barrier cstring
+barrier ctime
+barrier iosfwd
+barrier iterator
+barrier limits
+barrier memory
+barrier new
+barrier ratio
+barrier type_traits
+bit cstdlib
+bit iosfwd
+bit limits
+bit type_traits
+bitset climits
+bitset concepts
+bitset cstdlib
+bitset cstring
+bitset initializer_list
+bitset limits
+bitset new
+bitset stdexcept
+bitset string
+ccomplex complex
+charconv cerrno
+charconv cmath
+charconv concepts
+charconv cstdlib
+charconv cstring
+charconv initializer_list
+charconv iosfwd
+charconv limits
+charconv type_traits
+chrono compare
+chrono ctime
+chrono limits
+chrono ratio
+cinttypes cstdint
+cmath type_traits
+codecvt atomic
+codecvt cctype
+codecvt concepts
+codecvt cstring
+codecvt initializer_list
+codecvt limits
+codecvt mutex
+codecvt new
+codecvt stdexcept
+codecvt type_traits
+codecvt typeinfo
+compare cmath
+compare type_traits
+complex cmath
+complex iosfwd
+complex sstream
+complex stdexcept
+concepts type_traits
+condition_variable atomic
+condition_variable concepts
+condition_variable cstring
+condition_variable initializer_list
+condition_variable limits
+condition_variable new
+condition_variable stdexcept
+condition_variable system_error
+condition_variable type_traits
+condition_variable typeinfo
+coroutine compare
+coroutine cstddef
+coroutine cstring
+coroutine iosfwd
+coroutine limits
+coroutine type_traits
+cstddef version
+ctgmath ccomplex
+cwchar cwctype
+cwctype cctype
+deque algorithm
+deque atomic
+deque concepts
+deque cstdlib
+deque cstring
+deque functional
+deque initializer_list
+deque limits
+deque new
+deque stdexcept
+deque typeinfo
+exception cstddef
+exception cstdlib
+exception type_traits
+execution version
+experimental/algorithm algorithm
+experimental/algorithm cstddef
+experimental/algorithm type_traits
+experimental/coroutine atomic
+experimental/coroutine concepts
+experimental/coroutine cstddef
+experimental/coroutine cstring
+experimental/coroutine initializer_list
+experimental/coroutine iterator
+experimental/coroutine limits
+experimental/coroutine memory
+experimental/coroutine new
+experimental/coroutine type_traits
+experimental/deque deque
+experimental/deque experimental/memory_resource
+experimental/forward_list experimental/memory_resource
+experimental/forward_list forward_list
+experimental/functional array
+experimental/functional cstddef
+experimental/functional functional
+experimental/functional type_traits
+experimental/iterator cstddef
+experimental/iterator iosfwd
+experimental/iterator iterator
+experimental/iterator type_traits
+experimental/list experimental/memory_resource
+experimental/list list
+experimental/map experimental/memory_resource
+experimental/map map
+experimental/memory_resource atomic
+experimental/memory_resource concepts
+experimental/memory_resource cstddef
+experimental/memory_resource experimental/utility
+experimental/memory_resource iterator
+experimental/memory_resource limits
+experimental/memory_resource memory
+experimental/memory_resource new
+experimental/memory_resource stdexcept
+experimental/memory_resource tuple
+experimental/memory_resource type_traits
+experimental/propagate_const cstddef
+experimental/propagate_const type_traits
+experimental/regex experimental/memory_resource
+experimental/regex experimental/string
+experimental/regex regex
+experimental/set experimental/memory_resource
+experimental/set set
+experimental/simd array
+experimental/simd cstddef
+experimental/simd functional
+experimental/string experimental/memory_resource
+experimental/string string
+experimental/unordered_map array
+experimental/unordered_map experimental/memory_resource
+experimental/unordered_map functional
+experimental/unordered_map unordered_map
+experimental/unordered_set experimental/memory_resource
+experimental/unordered_set unordered_set
+experimental/utility utility
+experimental/vector experimental/memory_resource
+experimental/vector vector
+ext/hash_map algorithm
+ext/hash_map cmath
+ext/hash_map concepts
+ext/hash_map cstddef
+ext/hash_map cstring
+ext/hash_map initializer_list
+ext/hash_map limits
+ext/hash_map new
+ext/hash_map string
+ext/hash_map type_traits
+ext/hash_set algorithm
+ext/hash_set cmath
+ext/hash_set concepts
+ext/hash_set cstddef
+ext/hash_set cstring
+ext/hash_set initializer_list
+ext/hash_set limits
+ext/hash_set new
+ext/hash_set string
+ext/hash_set type_traits
+filesystem cerrno
+filesystem concepts
+filesystem ctime
+filesystem iomanip
+filesystem limits
+filesystem ratio
+filesystem string
+format charconv
+format concepts
+format cstdlib
+format cstring
+format initializer_list
+format limits
+format locale
+format stdexcept
+format string
+format string_view
+format version
+forward_list algorithm
+forward_list atomic
+forward_list concepts
+forward_list cstddef
+forward_list cstdlib
+forward_list cstring
+forward_list functional
+forward_list initializer_list
+forward_list limits
+forward_list new
+forward_list stdexcept
+forward_list type_traits
+forward_list typeinfo
+fstream atomic
+fstream cctype
+fstream concepts
+fstream cstddef
+fstream cstring
+fstream filesystem
+fstream initializer_list
+fstream istream
+fstream limits
+fstream mutex
+fstream new
+fstream stdexcept
+fstream type_traits
+fstream typeinfo
+functional array
+functional atomic
+functional concepts
+functional cstdlib
+functional cstring
+functional initializer_list
+functional limits
+functional stdexcept
+functional tuple
+functional type_traits
+functional unordered_map
+functional vector
+future exception
+future limits
+future mutex
+future ratio
+future thread
+initializer_list cstddef
+iomanip istream
+ios atomic
+ios cctype
+ios concepts
+ios cstring
+ios initializer_list
+ios iosfwd
+ios limits
+ios mutex
+ios new
+ios stdexcept
+ios type_traits
+ios typeinfo
+iosfwd version
+iostream ios
+iostream istream
+iostream version
+istream concepts
+istream cstddef
+istream iosfwd
+istream ostream
+iterator concepts
+iterator cstddef
+iterator cstdlib
+iterator limits
+iterator type_traits
+iterator variant
+latch atomic
+limits type_traits
+list algorithm
+list atomic
+list concepts
+list cstdlib
+list cstring
+list functional
+list initializer_list
+list limits
+list new
+list stdexcept
+list typeinfo
+locale atomic
+locale cctype
+locale concepts
+locale cstdarg
+locale cstdlib
+locale cstring
+locale initializer_list
+locale ios
+locale iosfwd
+locale limits
+locale mutex
+locale new
+locale stdexcept
+locale streambuf
+locale typeinfo
+map concepts
+map cstdlib
+map functional
+map initializer_list
+map limits
+map new
+map optional
+map stdexcept
+memory atomic
+memory concepts
+memory cstddef
+memory cstring
+memory initializer_list
+memory iterator
+memory limits
+memory new
+memory stdexcept
+memory type_traits
+memory typeinfo
+mutex atomic
+mutex concepts
+mutex cstring
+mutex initializer_list
+mutex limits
+mutex new
+mutex stdexcept
+mutex system_error
+mutex type_traits
+mutex typeinfo
+new cstddef
+new cstdlib
+new exception
+numbers concepts
+numeric cmath
+numeric concepts
+numeric functional
+optional atomic
+optional chrono
+optional compare
+optional concepts
+optional cstddef
+optional cstring
+optional initializer_list
+optional iterator
+optional limits
+optional memory
+optional new
+optional stdexcept
+optional type_traits
+ostream bitset
+ostream cstring
+ostream ios
+ostream limits
+ostream locale
+ostream new
+ostream type_traits
+queue concepts
+queue cstddef
+queue cstdlib
+queue deque
+queue initializer_list
+queue limits
+queue type_traits
+random climits
+random cmath
+random concepts
+random cstdint
+random cstdlib
+random initializer_list
+random iosfwd
+random limits
+random numeric
+random string
+random type_traits
+ranges concepts
+ranges cstdlib
+ranges initializer_list
+ranges limits
+ranges span
+ranges tuple
+ranges type_traits
+ranges variant
+ratio climits
+ratio cstdint
+ratio type_traits
+regex atomic
+regex cctype
+regex concepts
+regex cstdlib
+regex cstring
+regex deque
+regex initializer_list
+regex limits
+regex mutex
+regex new
+regex stdexcept
+regex type_traits
+regex typeinfo
+scoped_allocator atomic
+scoped_allocator concepts
+scoped_allocator cstddef
+scoped_allocator iterator
+scoped_allocator limits
+scoped_allocator memory
+scoped_allocator new
+scoped_allocator tuple
+scoped_allocator type_traits
+semaphore atomic
+semaphore ctime
+semaphore iosfwd
+semaphore limits
+semaphore ratio
+set concepts
+set cstdlib
+set functional
+set initializer_list
+set limits
+set new
+set optional
+set stdexcept
+shared_mutex version
+span array
+span concepts
+span cstddef
+span functional
+span initializer_list
+span limits
+span type_traits
+sstream istream
+sstream type_traits
+stack concepts
+stack deque
+stdexcept cstdlib
+stdexcept exception
+stdexcept iosfwd
+streambuf cstdint
+streambuf ios
+string climits
+string concepts
+string cstddef
+string cstdio
+string cstdlib
+string cstring
+string cwchar
+string initializer_list
+string iosfwd
+string limits
+string new
+string stdexcept
+string string_view
+string type_traits
+string_view algorithm
+string_view compare
+string_view concepts
+string_view cstddef
+string_view cstdio
+string_view cstdlib
+string_view cstring
+string_view cwchar
+string_view functional
+string_view initializer_list
+string_view iosfwd
+string_view limits
+string_view stdexcept
+string_view type_traits
+strstream istream
+system_error cerrno
+system_error cstddef
+system_error cstring
+system_error limits
+system_error stdexcept
+system_error string
+system_error type_traits
+thread cstddef
+thread cstring
+thread ctime
+thread iosfwd
+thread limits
+thread new
+thread ratio
+thread system_error
+thread type_traits
+tuple compare
+tuple exception
+tuple iosfwd
+tuple new
+tuple type_traits
+tuple typeinfo
+tuple utility
+type_traits cstddef
+type_traits cstdint
+typeindex compare
+typeindex iosfwd
+typeindex new
+typeindex typeinfo
+typeindex utility
+typeinfo cstddef
+typeinfo cstdint
+typeinfo exception
+unordered_map algorithm
+unordered_map cmath
+unordered_map concepts
+unordered_map cstdlib
+unordered_map cstring
+unordered_map initializer_list
+unordered_map limits
+unordered_map new
+unordered_map optional
+unordered_map stdexcept
+unordered_map type_traits
+unordered_set cmath
+unordered_set concepts
+unordered_set cstdlib
+unordered_set cstring
+unordered_set functional
+unordered_set initializer_list
+unordered_set limits
+unordered_set new
+unordered_set optional
+unordered_set stdexcept
+unordered_set type_traits
+utility compare
+utility cstddef
+utility cstdlib
+utility initializer_list
+utility iosfwd
+utility limits
+utility type_traits
+valarray algorithm
+valarray cmath
+valarray concepts
+valarray cstdlib
+valarray cstring
+valarray functional
+valarray initializer_list
+valarray limits
+valarray new
+valarray stdexcept
+variant cstring
+variant exception
+variant initializer_list
+variant limits
+variant new
+variant tuple
+variant type_traits
+vector algorithm
+vector atomic
+vector concepts
+vector cstdlib
+vector cstring
+vector initializer_list
+vector limits
+vector new
+vector stdexcept
+vector typeinfo

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
deleted file mode 100644
index ece47497507b2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
+++ /dev/null
@@ -1,27 +0,0 @@
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.any b/libcxx/test/libcxx/transitive_includes/cxx03/expected.any
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.any
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.array b/libcxx/test/libcxx/transitive_includes/cxx03/expected.array
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.array
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
deleted file mode 100644
index 4206ba1eee44e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
+++ /dev/null
@@ -1,13 +0,0 @@
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
deleted file mode 100644
index e53db43d769bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
deleted file mode 100644
index 64161c1d331fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
deleted file mode 100644
index 458696c3a73ff..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
+++ /dev/null
@@ -1,12 +0,0 @@
-cerrno
-cmath
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
deleted file mode 100644
index 9f1521d4d4835..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
+++ /dev/null
@@ -1,10 +0,0 @@
-climits
-cmath
-compare
-cstddef
-cstdint
-ctime
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
deleted file mode 100644
index 37103a4f4b892..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
+++ /dev/null
@@ -1 +0,0 @@
-cstdint

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
deleted file mode 100644
index 49fcbf44c5b21..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
deleted file mode 100644
index 4d101cb290c16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
deleted file mode 100644
index 7678c0e38802c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
+++ /dev/null
@@ -1,6 +0,0 @@
-cmath
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
deleted file mode 100644
index 1724fbdde39ed..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
deleted file mode 100644
index afddf59ae6bf5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
+++ /dev/null
@@ -1,9 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstring
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
deleted file mode 100644
index 98bf9a8010e40..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
+++ /dev/null
@@ -1,52 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-ccomplex
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
deleted file mode 100644
index fa1b7f2569941..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
+++ /dev/null
@@ -1,2 +0,0 @@
-cctype
-cwctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
deleted file mode 100644
index a82e62c088dce..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
+++ /dev/null
@@ -1 +0,0 @@
-cctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
deleted file mode 100644
index 4c4515dcec7d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-cstdlib
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
deleted file mode 100644
index e9b93fcc7c91e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
deleted file mode 100644
index e1ba276ab7ef9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-forward_list
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
deleted file mode 100644
index 447087a3f6f96..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
+++ /dev/null
@@ -1,19 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
deleted file mode 100644
index ed186faf929c5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-list
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
deleted file mode 100644
index 179b5b76d6f6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-map
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
deleted file mode 100644
index 064d3eab47aef..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
+++ /dev/null
@@ -1,27 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 3c525e1b4a9d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-experimental/memory_resource
-experimental/string
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-regex
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
deleted file mode 100644
index 21d59c287aca1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-set
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
deleted file mode 100644
index 46dcb1d1a6282..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
deleted file mode 100644
index 251dd7013fd2f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
deleted file mode 100644
index c678f3985291a..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-unordered_set
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
deleted file mode 100644
index 799a14724cf41..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
+++ /dev/null
@@ -1,11 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
deleted file mode 100644
index a97f08e050a8f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
+++ /dev/null
@@ -1,31 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
deleted file mode 100644
index 39829086f4cb1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.format b/libcxx/test/libcxx/transitive_includes/cxx03/expected.format
deleted file mode 100644
index efe2c926890e3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.format
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-charconv
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
deleted file mode 100644
index 22e80bc111922..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-filesystem
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
deleted file mode 100644
index a202e549334ae..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.future b/libcxx/test/libcxx/transitive_includes/cxx03/expected.future
deleted file mode 100644
index 0bffec1c88f36..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.future
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-thread
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
deleted file mode 100644
index 7b45506ea14b3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
+++ /dev/null
@@ -1,2 +0,0 @@
-cstddef
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
deleted file mode 100644
index 4d101cb290c16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
deleted file mode 100644
index 762d13c26ac3c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
+++ /dev/null
@@ -1,48 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
deleted file mode 100644
index f6043d7d3b1d4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
+++ /dev/null
@@ -1,18 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
deleted file mode 100644
index 3e9917b3da1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.list
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.list
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
deleted file mode 100644
index a5ac726129c05..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
+++ /dev/null
@@ -1,45 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.map
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.map
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
deleted file mode 100644
index 9af31ba1b625d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.new b/libcxx/test/libcxx/transitive_includes/cxx03/expected.new
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.new
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
deleted file mode 100644
index 31e9f436e6cd3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
+++ /dev/null
@@ -1,5 +0,0 @@
-concepts
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
deleted file mode 100644
index 63afc93662e2e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
deleted file mode 100644
index c26bdc7479b64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.random b/libcxx/test/libcxx/transitive_includes/cxx03/expected.random
deleted file mode 100644
index 67c6aa6723acf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.random
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-numeric
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
deleted file mode 100644
index a46c30df88516..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-span
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
deleted file mode 100644
index 29043403235fa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
+++ /dev/null
@@ -1,5 +0,0 @@
-climits
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
deleted file mode 100644
index 4f3dd16a93887..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
deleted file mode 100644
index 3e9917b3da1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.set
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.set
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.span b/libcxx/test/libcxx/transitive_includes/cxx03/expected.span
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.span
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
deleted file mode 100644
index c26bdc7479b64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
deleted file mode 100644
index e9e1b1a3af1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-iosfwd
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
deleted file mode 100644
index 6e7e5b2689767..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string
deleted file mode 100644
index e814351725ef2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string
+++ /dev/null
@@ -1,38 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
deleted file mode 100644
index 138c1f54d41bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
+++ /dev/null
@@ -1,37 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
deleted file mode 100644
index 8598675317389..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
deleted file mode 100644
index fa3e26219e865..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
+++ /dev/null
@@ -1,3 +0,0 @@
-cstddef
-cstdint
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
deleted file mode 100644
index ba220443ca812..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
+++ /dev/null
@@ -1,29 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-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
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
deleted file mode 100644
index 2f34f998b4faa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
+++ /dev/null
@@ -1,10 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
deleted file mode 100644
index accc76242aff2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.version b/libcxx/test/libcxx/transitive_includes/cxx03/expected.version
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.version
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11.csv b/libcxx/test/libcxx/transitive_includes/cxx11.csv
new file mode 100644
index 0000000000000..a13f235475828
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes/cxx11.csv
@@ -0,0 +1,586 @@
+algorithm atomic
+algorithm bit
+algorithm chrono
+algorithm climits
+algorithm concepts
+algorithm cstddef
+algorithm cstdlib
+algorithm cstring
+algorithm initializer_list
+algorithm iterator
+algorithm limits
+algorithm memory
+algorithm new
+algorithm type_traits
+any atomic
+any concepts
+any cstddef
+any cstring
+any initializer_list
+any iterator
+any limits
+any memory
+any new
+any stdexcept
+any type_traits
+any typeinfo
+array algorithm
+array compare
+array concepts
+array cstdlib
+array initializer_list
+array limits
+array stdexcept
+atomic chrono
+atomic cstring
+atomic ctime
+atomic iosfwd
+atomic limits
+atomic ratio
+barrier atomic
+barrier concepts
+barrier cstring
+barrier ctime
+barrier iosfwd
+barrier iterator
+barrier limits
+barrier memory
+barrier new
+barrier ratio
+barrier type_traits
+bit cstdlib
+bit iosfwd
+bit limits
+bit type_traits
+bitset climits
+bitset concepts
+bitset cstdlib
+bitset cstring
+bitset initializer_list
+bitset limits
+bitset new
+bitset stdexcept
+bitset string
+ccomplex complex
+charconv cerrno
+charconv cmath
+charconv concepts
+charconv cstdlib
+charconv cstring
+charconv initializer_list
+charconv iosfwd
+charconv limits
+charconv type_traits
+chrono compare
+chrono ctime
+chrono limits
+chrono ratio
+cinttypes cstdint
+cmath type_traits
+codecvt atomic
+codecvt cctype
+codecvt concepts
+codecvt cstring
+codecvt initializer_list
+codecvt limits
+codecvt mutex
+codecvt new
+codecvt stdexcept
+codecvt type_traits
+codecvt typeinfo
+compare cmath
+compare type_traits
+complex cmath
+complex iosfwd
+complex sstream
+complex stdexcept
+concepts type_traits
+condition_variable atomic
+condition_variable concepts
+condition_variable cstring
+condition_variable initializer_list
+condition_variable limits
+condition_variable new
+condition_variable stdexcept
+condition_variable system_error
+condition_variable type_traits
+condition_variable typeinfo
+coroutine compare
+coroutine cstddef
+coroutine cstring
+coroutine iosfwd
+coroutine limits
+coroutine type_traits
+cstddef version
+ctgmath ccomplex
+cwchar cwctype
+cwctype cctype
+deque algorithm
+deque atomic
+deque concepts
+deque cstdlib
+deque cstring
+deque functional
+deque initializer_list
+deque limits
+deque new
+deque stdexcept
+deque typeinfo
+exception cstddef
+exception cstdlib
+exception type_traits
+execution version
+experimental/algorithm algorithm
+experimental/algorithm cstddef
+experimental/algorithm type_traits
+experimental/coroutine atomic
+experimental/coroutine concepts
+experimental/coroutine cstddef
+experimental/coroutine cstring
+experimental/coroutine initializer_list
+experimental/coroutine iterator
+experimental/coroutine limits
+experimental/coroutine memory
+experimental/coroutine new
+experimental/coroutine type_traits
+experimental/deque deque
+experimental/deque experimental/memory_resource
+experimental/forward_list experimental/memory_resource
+experimental/forward_list forward_list
+experimental/functional array
+experimental/functional cstddef
+experimental/functional functional
+experimental/functional type_traits
+experimental/iterator cstddef
+experimental/iterator iosfwd
+experimental/iterator iterator
+experimental/iterator type_traits
+experimental/list experimental/memory_resource
+experimental/list list
+experimental/map experimental/memory_resource
+experimental/map map
+experimental/memory_resource atomic
+experimental/memory_resource concepts
+experimental/memory_resource cstddef
+experimental/memory_resource experimental/utility
+experimental/memory_resource iterator
+experimental/memory_resource limits
+experimental/memory_resource memory
+experimental/memory_resource new
+experimental/memory_resource stdexcept
+experimental/memory_resource tuple
+experimental/memory_resource type_traits
+experimental/propagate_const cstddef
+experimental/propagate_const type_traits
+experimental/regex experimental/memory_resource
+experimental/regex experimental/string
+experimental/regex regex
+experimental/set experimental/memory_resource
+experimental/set set
+experimental/simd array
+experimental/simd cstddef
+experimental/simd functional
+experimental/string experimental/memory_resource
+experimental/string string
+experimental/unordered_map array
+experimental/unordered_map experimental/memory_resource
+experimental/unordered_map functional
+experimental/unordered_map unordered_map
+experimental/unordered_set experimental/memory_resource
+experimental/unordered_set unordered_set
+experimental/utility utility
+experimental/vector experimental/memory_resource
+experimental/vector vector
+ext/hash_map algorithm
+ext/hash_map cmath
+ext/hash_map concepts
+ext/hash_map cstddef
+ext/hash_map cstring
+ext/hash_map initializer_list
+ext/hash_map limits
+ext/hash_map new
+ext/hash_map string
+ext/hash_map type_traits
+ext/hash_set algorithm
+ext/hash_set cmath
+ext/hash_set concepts
+ext/hash_set cstddef
+ext/hash_set cstring
+ext/hash_set initializer_list
+ext/hash_set limits
+ext/hash_set new
+ext/hash_set string
+ext/hash_set type_traits
+filesystem cerrno
+filesystem concepts
+filesystem ctime
+filesystem iomanip
+filesystem limits
+filesystem ratio
+filesystem string
+format charconv
+format concepts
+format cstdlib
+format cstring
+format initializer_list
+format limits
+format locale
+format stdexcept
+format string
+format string_view
+format version
+forward_list algorithm
+forward_list atomic
+forward_list concepts
+forward_list cstddef
+forward_list cstdlib
+forward_list cstring
+forward_list functional
+forward_list initializer_list
+forward_list limits
+forward_list new
+forward_list stdexcept
+forward_list type_traits
+forward_list typeinfo
+fstream atomic
+fstream cctype
+fstream concepts
+fstream cstddef
+fstream cstring
+fstream filesystem
+fstream initializer_list
+fstream istream
+fstream limits
+fstream mutex
+fstream new
+fstream stdexcept
+fstream type_traits
+fstream typeinfo
+functional array
+functional atomic
+functional concepts
+functional cstdlib
+functional cstring
+functional initializer_list
+functional limits
+functional stdexcept
+functional tuple
+functional type_traits
+functional unordered_map
+functional vector
+future exception
+future limits
+future mutex
+future ratio
+future thread
+initializer_list cstddef
+iomanip istream
+ios atomic
+ios cctype
+ios concepts
+ios cstring
+ios initializer_list
+ios iosfwd
+ios limits
+ios mutex
+ios new
+ios stdexcept
+ios type_traits
+ios typeinfo
+iosfwd version
+iostream ios
+iostream istream
+iostream version
+istream concepts
+istream cstddef
+istream iosfwd
+istream ostream
+iterator concepts
+iterator cstddef
+iterator cstdlib
+iterator limits
+iterator type_traits
+iterator variant
+latch atomic
+limits type_traits
+list algorithm
+list atomic
+list concepts
+list cstdlib
+list cstring
+list functional
+list initializer_list
+list limits
+list new
+list stdexcept
+list typeinfo
+locale atomic
+locale cctype
+locale concepts
+locale cstdarg
+locale cstdlib
+locale cstring
+locale initializer_list
+locale ios
+locale iosfwd
+locale limits
+locale mutex
+locale new
+locale stdexcept
+locale streambuf
+locale typeinfo
+map concepts
+map cstdlib
+map functional
+map initializer_list
+map limits
+map new
+map optional
+map stdexcept
+memory atomic
+memory concepts
+memory cstddef
+memory cstring
+memory initializer_list
+memory iterator
+memory limits
+memory new
+memory stdexcept
+memory type_traits
+memory typeinfo
+mutex atomic
+mutex concepts
+mutex cstring
+mutex initializer_list
+mutex limits
+mutex new
+mutex stdexcept
+mutex system_error
+mutex type_traits
+mutex typeinfo
+new cstddef
+new cstdlib
+new exception
+numbers concepts
+numeric cmath
+numeric concepts
+numeric functional
+optional atomic
+optional chrono
+optional compare
+optional concepts
+optional cstddef
+optional cstring
+optional initializer_list
+optional iterator
+optional limits
+optional memory
+optional new
+optional stdexcept
+optional type_traits
+ostream bitset
+ostream cstring
+ostream ios
+ostream limits
+ostream locale
+ostream new
+ostream type_traits
+queue concepts
+queue cstddef
+queue cstdlib
+queue deque
+queue initializer_list
+queue limits
+queue type_traits
+random climits
+random cmath
+random concepts
+random cstdint
+random cstdlib
+random initializer_list
+random iosfwd
+random limits
+random numeric
+random string
+random type_traits
+ranges concepts
+ranges cstdlib
+ranges initializer_list
+ranges limits
+ranges span
+ranges tuple
+ranges type_traits
+ranges variant
+ratio climits
+ratio cstdint
+ratio type_traits
+regex atomic
+regex cctype
+regex concepts
+regex cstdlib
+regex cstring
+regex deque
+regex initializer_list
+regex limits
+regex mutex
+regex new
+regex stdexcept
+regex type_traits
+regex typeinfo
+scoped_allocator atomic
+scoped_allocator concepts
+scoped_allocator cstddef
+scoped_allocator iterator
+scoped_allocator limits
+scoped_allocator memory
+scoped_allocator new
+scoped_allocator tuple
+scoped_allocator type_traits
+semaphore atomic
+semaphore ctime
+semaphore iosfwd
+semaphore limits
+semaphore ratio
+set concepts
+set cstdlib
+set functional
+set initializer_list
+set limits
+set new
+set optional
+set stdexcept
+shared_mutex version
+span array
+span concepts
+span cstddef
+span functional
+span initializer_list
+span limits
+span type_traits
+sstream istream
+sstream type_traits
+stack concepts
+stack deque
+stdexcept cstdlib
+stdexcept exception
+stdexcept iosfwd
+streambuf cstdint
+streambuf ios
+string climits
+string concepts
+string cstddef
+string cstdio
+string cstdlib
+string cstring
+string cwchar
+string initializer_list
+string iosfwd
+string limits
+string new
+string stdexcept
+string string_view
+string type_traits
+string_view algorithm
+string_view compare
+string_view concepts
+string_view cstddef
+string_view cstdio
+string_view cstdlib
+string_view cstring
+string_view cwchar
+string_view functional
+string_view initializer_list
+string_view iosfwd
+string_view limits
+string_view stdexcept
+string_view type_traits
+strstream istream
+system_error cerrno
+system_error cstddef
+system_error cstring
+system_error limits
+system_error stdexcept
+system_error string
+system_error type_traits
+thread cstddef
+thread cstring
+thread ctime
+thread iosfwd
+thread limits
+thread new
+thread ratio
+thread system_error
+thread type_traits
+tuple compare
+tuple exception
+tuple iosfwd
+tuple new
+tuple type_traits
+tuple typeinfo
+tuple utility
+type_traits cstddef
+type_traits cstdint
+typeindex compare
+typeindex iosfwd
+typeindex new
+typeindex typeinfo
+typeindex utility
+typeinfo cstddef
+typeinfo cstdint
+typeinfo exception
+unordered_map algorithm
+unordered_map cmath
+unordered_map concepts
+unordered_map cstdlib
+unordered_map cstring
+unordered_map initializer_list
+unordered_map limits
+unordered_map new
+unordered_map optional
+unordered_map stdexcept
+unordered_map type_traits
+unordered_set cmath
+unordered_set concepts
+unordered_set cstdlib
+unordered_set cstring
+unordered_set functional
+unordered_set initializer_list
+unordered_set limits
+unordered_set new
+unordered_set optional
+unordered_set stdexcept
+unordered_set type_traits
+utility compare
+utility cstddef
+utility cstdlib
+utility initializer_list
+utility iosfwd
+utility limits
+utility type_traits
+valarray algorithm
+valarray cmath
+valarray concepts
+valarray cstdlib
+valarray cstring
+valarray functional
+valarray initializer_list
+valarray limits
+valarray new
+valarray stdexcept
+variant cstring
+variant exception
+variant initializer_list
+variant limits
+variant new
+variant tuple
+variant type_traits
+vector algorithm
+vector atomic
+vector concepts
+vector cstdlib
+vector cstring
+vector initializer_list
+vector limits
+vector new
+vector stdexcept
+vector typeinfo

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
deleted file mode 100644
index ece47497507b2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
+++ /dev/null
@@ -1,27 +0,0 @@
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.any b/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.array b/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
deleted file mode 100644
index 4206ba1eee44e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
+++ /dev/null
@@ -1,13 +0,0 @@
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
deleted file mode 100644
index e53db43d769bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
deleted file mode 100644
index 64161c1d331fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
deleted file mode 100644
index 458696c3a73ff..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
+++ /dev/null
@@ -1,12 +0,0 @@
-cerrno
-cmath
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
deleted file mode 100644
index 9f1521d4d4835..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
+++ /dev/null
@@ -1,10 +0,0 @@
-climits
-cmath
-compare
-cstddef
-cstdint
-ctime
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
deleted file mode 100644
index 37103a4f4b892..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
+++ /dev/null
@@ -1 +0,0 @@
-cstdint

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
deleted file mode 100644
index 49fcbf44c5b21..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
deleted file mode 100644
index 4d101cb290c16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
deleted file mode 100644
index 7678c0e38802c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
+++ /dev/null
@@ -1,6 +0,0 @@
-cmath
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
deleted file mode 100644
index 1724fbdde39ed..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
deleted file mode 100644
index afddf59ae6bf5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
+++ /dev/null
@@ -1,9 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstring
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
deleted file mode 100644
index 98bf9a8010e40..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
+++ /dev/null
@@ -1,52 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-ccomplex
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
deleted file mode 100644
index fa1b7f2569941..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
+++ /dev/null
@@ -1,2 +0,0 @@
-cctype
-cwctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
deleted file mode 100644
index a82e62c088dce..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
+++ /dev/null
@@ -1 +0,0 @@
-cctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
deleted file mode 100644
index 4c4515dcec7d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-cstdlib
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
deleted file mode 100644
index e9b93fcc7c91e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
deleted file mode 100644
index e1ba276ab7ef9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-forward_list
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
deleted file mode 100644
index 447087a3f6f96..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
+++ /dev/null
@@ -1,19 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
deleted file mode 100644
index ed186faf929c5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-list
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
deleted file mode 100644
index 179b5b76d6f6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-map
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
deleted file mode 100644
index 064d3eab47aef..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
+++ /dev/null
@@ -1,27 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 3c525e1b4a9d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-experimental/memory_resource
-experimental/string
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-regex
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
deleted file mode 100644
index 21d59c287aca1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-set
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
deleted file mode 100644
index 46dcb1d1a6282..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
deleted file mode 100644
index 251dd7013fd2f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
deleted file mode 100644
index c678f3985291a..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-unordered_set
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
deleted file mode 100644
index 799a14724cf41..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
+++ /dev/null
@@ -1,11 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
deleted file mode 100644
index a97f08e050a8f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
+++ /dev/null
@@ -1,31 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
deleted file mode 100644
index 39829086f4cb1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.format b/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
deleted file mode 100644
index efe2c926890e3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-charconv
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
deleted file mode 100644
index 22e80bc111922..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-filesystem
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
deleted file mode 100644
index a202e549334ae..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.future b/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
deleted file mode 100644
index 0bffec1c88f36..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-thread
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
deleted file mode 100644
index 7b45506ea14b3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
+++ /dev/null
@@ -1,2 +0,0 @@
-cstddef
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
deleted file mode 100644
index 4d101cb290c16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
deleted file mode 100644
index 762d13c26ac3c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
+++ /dev/null
@@ -1,48 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
deleted file mode 100644
index f6043d7d3b1d4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
+++ /dev/null
@@ -1,18 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
deleted file mode 100644
index 3e9917b3da1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
deleted file mode 100644
index a5ac726129c05..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
+++ /dev/null
@@ -1,45 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
deleted file mode 100644
index 9af31ba1b625d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.new b/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
deleted file mode 100644
index 31e9f436e6cd3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
+++ /dev/null
@@ -1,5 +0,0 @@
-concepts
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
deleted file mode 100644
index 63afc93662e2e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
deleted file mode 100644
index c26bdc7479b64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.random b/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
deleted file mode 100644
index 67c6aa6723acf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-numeric
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
deleted file mode 100644
index a46c30df88516..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-span
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
deleted file mode 100644
index 29043403235fa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
+++ /dev/null
@@ -1,5 +0,0 @@
-climits
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
deleted file mode 100644
index 4f3dd16a93887..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
deleted file mode 100644
index 3e9917b3da1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.span b/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
deleted file mode 100644
index c26bdc7479b64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
deleted file mode 100644
index e9e1b1a3af1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-iosfwd
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
deleted file mode 100644
index 6e7e5b2689767..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
deleted file mode 100644
index e814351725ef2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
+++ /dev/null
@@ -1,38 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
deleted file mode 100644
index 138c1f54d41bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
+++ /dev/null
@@ -1,37 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
deleted file mode 100644
index 8598675317389..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
deleted file mode 100644
index fa3e26219e865..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
+++ /dev/null
@@ -1,3 +0,0 @@
-cstddef
-cstdint
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
deleted file mode 100644
index ba220443ca812..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
+++ /dev/null
@@ -1,29 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-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
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
deleted file mode 100644
index 2f34f998b4faa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
+++ /dev/null
@@ -1,10 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
deleted file mode 100644
index accc76242aff2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.version b/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14.csv b/libcxx/test/libcxx/transitive_includes/cxx14.csv
new file mode 100644
index 0000000000000..3b2c1414e5477
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes/cxx14.csv
@@ -0,0 +1,588 @@
+algorithm atomic
+algorithm bit
+algorithm chrono
+algorithm climits
+algorithm concepts
+algorithm cstddef
+algorithm cstdlib
+algorithm cstring
+algorithm initializer_list
+algorithm iterator
+algorithm limits
+algorithm memory
+algorithm new
+algorithm type_traits
+any atomic
+any concepts
+any cstddef
+any cstring
+any initializer_list
+any iterator
+any limits
+any memory
+any new
+any stdexcept
+any type_traits
+any typeinfo
+array algorithm
+array compare
+array concepts
+array cstdlib
+array initializer_list
+array limits
+array stdexcept
+atomic chrono
+atomic cstring
+atomic ctime
+atomic iosfwd
+atomic limits
+atomic ratio
+barrier atomic
+barrier concepts
+barrier cstring
+barrier ctime
+barrier iosfwd
+barrier iterator
+barrier limits
+barrier memory
+barrier new
+barrier ratio
+barrier type_traits
+bit cstdlib
+bit iosfwd
+bit limits
+bit type_traits
+bitset climits
+bitset concepts
+bitset cstdlib
+bitset cstring
+bitset initializer_list
+bitset limits
+bitset new
+bitset stdexcept
+bitset string
+ccomplex complex
+charconv cerrno
+charconv cmath
+charconv concepts
+charconv cstdlib
+charconv cstring
+charconv initializer_list
+charconv iosfwd
+charconv limits
+charconv type_traits
+chrono compare
+chrono ctime
+chrono limits
+chrono ratio
+cinttypes cstdint
+cmath type_traits
+codecvt atomic
+codecvt cctype
+codecvt concepts
+codecvt cstring
+codecvt initializer_list
+codecvt limits
+codecvt mutex
+codecvt new
+codecvt stdexcept
+codecvt type_traits
+codecvt typeinfo
+compare cmath
+compare type_traits
+complex cmath
+complex iosfwd
+complex sstream
+complex stdexcept
+concepts type_traits
+condition_variable atomic
+condition_variable concepts
+condition_variable cstring
+condition_variable initializer_list
+condition_variable limits
+condition_variable new
+condition_variable stdexcept
+condition_variable system_error
+condition_variable type_traits
+condition_variable typeinfo
+coroutine compare
+coroutine cstddef
+coroutine cstring
+coroutine iosfwd
+coroutine limits
+coroutine type_traits
+cstddef version
+ctgmath ccomplex
+cwchar cwctype
+cwctype cctype
+deque algorithm
+deque atomic
+deque concepts
+deque cstdlib
+deque cstring
+deque functional
+deque initializer_list
+deque limits
+deque new
+deque stdexcept
+deque typeinfo
+exception cstddef
+exception cstdlib
+exception type_traits
+execution version
+experimental/algorithm algorithm
+experimental/algorithm cstddef
+experimental/algorithm type_traits
+experimental/coroutine atomic
+experimental/coroutine concepts
+experimental/coroutine cstddef
+experimental/coroutine cstring
+experimental/coroutine initializer_list
+experimental/coroutine iterator
+experimental/coroutine limits
+experimental/coroutine memory
+experimental/coroutine new
+experimental/coroutine type_traits
+experimental/deque deque
+experimental/deque experimental/memory_resource
+experimental/forward_list experimental/memory_resource
+experimental/forward_list forward_list
+experimental/functional array
+experimental/functional cstddef
+experimental/functional functional
+experimental/functional type_traits
+experimental/iterator cstddef
+experimental/iterator iosfwd
+experimental/iterator iterator
+experimental/iterator type_traits
+experimental/list experimental/memory_resource
+experimental/list list
+experimental/map experimental/memory_resource
+experimental/map map
+experimental/memory_resource atomic
+experimental/memory_resource concepts
+experimental/memory_resource cstddef
+experimental/memory_resource experimental/utility
+experimental/memory_resource iterator
+experimental/memory_resource limits
+experimental/memory_resource memory
+experimental/memory_resource new
+experimental/memory_resource stdexcept
+experimental/memory_resource tuple
+experimental/memory_resource type_traits
+experimental/propagate_const cstddef
+experimental/propagate_const type_traits
+experimental/regex experimental/memory_resource
+experimental/regex experimental/string
+experimental/regex regex
+experimental/set experimental/memory_resource
+experimental/set set
+experimental/simd array
+experimental/simd cstddef
+experimental/simd functional
+experimental/string experimental/memory_resource
+experimental/string string
+experimental/type_traits initializer_list
+experimental/type_traits type_traits
+experimental/unordered_map array
+experimental/unordered_map experimental/memory_resource
+experimental/unordered_map functional
+experimental/unordered_map unordered_map
+experimental/unordered_set experimental/memory_resource
+experimental/unordered_set unordered_set
+experimental/utility utility
+experimental/vector experimental/memory_resource
+experimental/vector vector
+ext/hash_map algorithm
+ext/hash_map cmath
+ext/hash_map concepts
+ext/hash_map cstddef
+ext/hash_map cstring
+ext/hash_map initializer_list
+ext/hash_map limits
+ext/hash_map new
+ext/hash_map string
+ext/hash_map type_traits
+ext/hash_set algorithm
+ext/hash_set cmath
+ext/hash_set concepts
+ext/hash_set cstddef
+ext/hash_set cstring
+ext/hash_set initializer_list
+ext/hash_set limits
+ext/hash_set new
+ext/hash_set string
+ext/hash_set type_traits
+filesystem cerrno
+filesystem concepts
+filesystem ctime
+filesystem iomanip
+filesystem limits
+filesystem ratio
+filesystem string
+format charconv
+format concepts
+format cstdlib
+format cstring
+format initializer_list
+format limits
+format locale
+format stdexcept
+format string
+format string_view
+format version
+forward_list algorithm
+forward_list atomic
+forward_list concepts
+forward_list cstddef
+forward_list cstdlib
+forward_list cstring
+forward_list functional
+forward_list initializer_list
+forward_list limits
+forward_list new
+forward_list stdexcept
+forward_list type_traits
+forward_list typeinfo
+fstream atomic
+fstream cctype
+fstream concepts
+fstream cstddef
+fstream cstring
+fstream filesystem
+fstream initializer_list
+fstream istream
+fstream limits
+fstream mutex
+fstream new
+fstream stdexcept
+fstream type_traits
+fstream typeinfo
+functional array
+functional atomic
+functional concepts
+functional cstdlib
+functional cstring
+functional initializer_list
+functional limits
+functional stdexcept
+functional tuple
+functional type_traits
+functional unordered_map
+functional vector
+future exception
+future limits
+future mutex
+future ratio
+future thread
+initializer_list cstddef
+iomanip istream
+ios atomic
+ios cctype
+ios concepts
+ios cstring
+ios initializer_list
+ios iosfwd
+ios limits
+ios mutex
+ios new
+ios stdexcept
+ios type_traits
+ios typeinfo
+iosfwd version
+iostream ios
+iostream istream
+iostream version
+istream concepts
+istream cstddef
+istream iosfwd
+istream ostream
+iterator concepts
+iterator cstddef
+iterator cstdlib
+iterator limits
+iterator type_traits
+iterator variant
+latch atomic
+limits type_traits
+list algorithm
+list atomic
+list concepts
+list cstdlib
+list cstring
+list functional
+list initializer_list
+list limits
+list new
+list stdexcept
+list typeinfo
+locale atomic
+locale cctype
+locale concepts
+locale cstdarg
+locale cstdlib
+locale cstring
+locale initializer_list
+locale ios
+locale iosfwd
+locale limits
+locale mutex
+locale new
+locale stdexcept
+locale streambuf
+locale typeinfo
+map concepts
+map cstdlib
+map functional
+map initializer_list
+map limits
+map new
+map optional
+map stdexcept
+memory atomic
+memory concepts
+memory cstddef
+memory cstring
+memory initializer_list
+memory iterator
+memory limits
+memory new
+memory stdexcept
+memory type_traits
+memory typeinfo
+mutex atomic
+mutex concepts
+mutex cstring
+mutex initializer_list
+mutex limits
+mutex new
+mutex stdexcept
+mutex system_error
+mutex type_traits
+mutex typeinfo
+new cstddef
+new cstdlib
+new exception
+numbers concepts
+numeric cmath
+numeric concepts
+numeric functional
+optional atomic
+optional chrono
+optional compare
+optional concepts
+optional cstddef
+optional cstring
+optional initializer_list
+optional iterator
+optional limits
+optional memory
+optional new
+optional stdexcept
+optional type_traits
+ostream bitset
+ostream cstring
+ostream ios
+ostream limits
+ostream locale
+ostream new
+ostream type_traits
+queue concepts
+queue cstddef
+queue cstdlib
+queue deque
+queue initializer_list
+queue limits
+queue type_traits
+random climits
+random cmath
+random concepts
+random cstdint
+random cstdlib
+random initializer_list
+random iosfwd
+random limits
+random numeric
+random string
+random type_traits
+ranges concepts
+ranges cstdlib
+ranges initializer_list
+ranges limits
+ranges span
+ranges tuple
+ranges type_traits
+ranges variant
+ratio climits
+ratio cstdint
+ratio type_traits
+regex atomic
+regex cctype
+regex concepts
+regex cstdlib
+regex cstring
+regex deque
+regex initializer_list
+regex limits
+regex mutex
+regex new
+regex stdexcept
+regex type_traits
+regex typeinfo
+scoped_allocator atomic
+scoped_allocator concepts
+scoped_allocator cstddef
+scoped_allocator iterator
+scoped_allocator limits
+scoped_allocator memory
+scoped_allocator new
+scoped_allocator tuple
+scoped_allocator type_traits
+semaphore atomic
+semaphore ctime
+semaphore iosfwd
+semaphore limits
+semaphore ratio
+set concepts
+set cstdlib
+set functional
+set initializer_list
+set limits
+set new
+set optional
+set stdexcept
+shared_mutex version
+span array
+span concepts
+span cstddef
+span functional
+span initializer_list
+span limits
+span type_traits
+sstream istream
+sstream type_traits
+stack concepts
+stack deque
+stdexcept cstdlib
+stdexcept exception
+stdexcept iosfwd
+streambuf cstdint
+streambuf ios
+string climits
+string concepts
+string cstddef
+string cstdio
+string cstdlib
+string cstring
+string cwchar
+string initializer_list
+string iosfwd
+string limits
+string new
+string stdexcept
+string string_view
+string type_traits
+string_view algorithm
+string_view compare
+string_view concepts
+string_view cstddef
+string_view cstdio
+string_view cstdlib
+string_view cstring
+string_view cwchar
+string_view functional
+string_view initializer_list
+string_view iosfwd
+string_view limits
+string_view stdexcept
+string_view type_traits
+strstream istream
+system_error cerrno
+system_error cstddef
+system_error cstring
+system_error limits
+system_error stdexcept
+system_error string
+system_error type_traits
+thread cstddef
+thread cstring
+thread ctime
+thread iosfwd
+thread limits
+thread new
+thread ratio
+thread system_error
+thread type_traits
+tuple compare
+tuple exception
+tuple iosfwd
+tuple new
+tuple type_traits
+tuple typeinfo
+tuple utility
+type_traits cstddef
+type_traits cstdint
+typeindex compare
+typeindex iosfwd
+typeindex new
+typeindex typeinfo
+typeindex utility
+typeinfo cstddef
+typeinfo cstdint
+typeinfo exception
+unordered_map algorithm
+unordered_map cmath
+unordered_map concepts
+unordered_map cstdlib
+unordered_map cstring
+unordered_map initializer_list
+unordered_map limits
+unordered_map new
+unordered_map optional
+unordered_map stdexcept
+unordered_map type_traits
+unordered_set cmath
+unordered_set concepts
+unordered_set cstdlib
+unordered_set cstring
+unordered_set functional
+unordered_set initializer_list
+unordered_set limits
+unordered_set new
+unordered_set optional
+unordered_set stdexcept
+unordered_set type_traits
+utility compare
+utility cstddef
+utility cstdlib
+utility initializer_list
+utility iosfwd
+utility limits
+utility type_traits
+valarray algorithm
+valarray cmath
+valarray concepts
+valarray cstdlib
+valarray cstring
+valarray functional
+valarray initializer_list
+valarray limits
+valarray new
+valarray stdexcept
+variant cstring
+variant exception
+variant initializer_list
+variant limits
+variant new
+variant tuple
+variant type_traits
+vector algorithm
+vector atomic
+vector concepts
+vector cstdlib
+vector cstring
+vector initializer_list
+vector limits
+vector new
+vector stdexcept
+vector typeinfo

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
deleted file mode 100644
index ece47497507b2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
+++ /dev/null
@@ -1,27 +0,0 @@
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.any b/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.array b/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
deleted file mode 100644
index 4206ba1eee44e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
+++ /dev/null
@@ -1,13 +0,0 @@
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
deleted file mode 100644
index e53db43d769bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
deleted file mode 100644
index 64161c1d331fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
deleted file mode 100644
index 458696c3a73ff..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
+++ /dev/null
@@ -1,12 +0,0 @@
-cerrno
-cmath
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
deleted file mode 100644
index 9f1521d4d4835..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
+++ /dev/null
@@ -1,10 +0,0 @@
-climits
-cmath
-compare
-cstddef
-cstdint
-ctime
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
deleted file mode 100644
index 37103a4f4b892..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
+++ /dev/null
@@ -1 +0,0 @@
-cstdint

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
deleted file mode 100644
index 49fcbf44c5b21..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
deleted file mode 100644
index 4d101cb290c16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
deleted file mode 100644
index 7678c0e38802c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
+++ /dev/null
@@ -1,6 +0,0 @@
-cmath
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
deleted file mode 100644
index 1724fbdde39ed..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
deleted file mode 100644
index afddf59ae6bf5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
+++ /dev/null
@@ -1,9 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstring
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
deleted file mode 100644
index 98bf9a8010e40..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
+++ /dev/null
@@ -1,52 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-ccomplex
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
deleted file mode 100644
index fa1b7f2569941..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
+++ /dev/null
@@ -1,2 +0,0 @@
-cctype
-cwctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
deleted file mode 100644
index a82e62c088dce..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
+++ /dev/null
@@ -1 +0,0 @@
-cctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
deleted file mode 100644
index 4c4515dcec7d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-cstdlib
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
deleted file mode 100644
index e9b93fcc7c91e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
deleted file mode 100644
index e1ba276ab7ef9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-forward_list
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
deleted file mode 100644
index 447087a3f6f96..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
+++ /dev/null
@@ -1,19 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
deleted file mode 100644
index ed186faf929c5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-list
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
deleted file mode 100644
index 179b5b76d6f6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-map
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
deleted file mode 100644
index 064d3eab47aef..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
+++ /dev/null
@@ -1,27 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 3c525e1b4a9d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-experimental/memory_resource
-experimental/string
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-regex
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
deleted file mode 100644
index 21d59c287aca1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-set
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
deleted file mode 100644
index 46dcb1d1a6282..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
deleted file mode 100644
index 5866e56e076ea..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 251dd7013fd2f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
deleted file mode 100644
index c678f3985291a..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-unordered_set
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
deleted file mode 100644
index 799a14724cf41..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
+++ /dev/null
@@ -1,11 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
deleted file mode 100644
index a97f08e050a8f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
+++ /dev/null
@@ -1,31 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
deleted file mode 100644
index 39829086f4cb1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.format b/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
deleted file mode 100644
index efe2c926890e3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-charconv
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
deleted file mode 100644
index 22e80bc111922..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-filesystem
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
deleted file mode 100644
index a202e549334ae..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.future b/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
deleted file mode 100644
index 0bffec1c88f36..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-thread
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
deleted file mode 100644
index 7b45506ea14b3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
+++ /dev/null
@@ -1,2 +0,0 @@
-cstddef
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
deleted file mode 100644
index 4d101cb290c16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
deleted file mode 100644
index 762d13c26ac3c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
+++ /dev/null
@@ -1,48 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
deleted file mode 100644
index f6043d7d3b1d4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
+++ /dev/null
@@ -1,18 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
deleted file mode 100644
index 3e9917b3da1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
deleted file mode 100644
index a5ac726129c05..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
+++ /dev/null
@@ -1,45 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
deleted file mode 100644
index 9af31ba1b625d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.new b/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
deleted file mode 100644
index 31e9f436e6cd3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
+++ /dev/null
@@ -1,5 +0,0 @@
-concepts
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
deleted file mode 100644
index 63afc93662e2e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
deleted file mode 100644
index c26bdc7479b64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.random b/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
deleted file mode 100644
index 67c6aa6723acf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-numeric
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
deleted file mode 100644
index a46c30df88516..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-span
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
deleted file mode 100644
index 29043403235fa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
+++ /dev/null
@@ -1,5 +0,0 @@
-climits
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
deleted file mode 100644
index 4f3dd16a93887..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
deleted file mode 100644
index 3e9917b3da1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.span b/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
deleted file mode 100644
index c26bdc7479b64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
deleted file mode 100644
index e9e1b1a3af1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-iosfwd
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
deleted file mode 100644
index 6e7e5b2689767..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
deleted file mode 100644
index e814351725ef2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
+++ /dev/null
@@ -1,38 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
deleted file mode 100644
index 138c1f54d41bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
+++ /dev/null
@@ -1,37 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
deleted file mode 100644
index 8598675317389..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
deleted file mode 100644
index fa3e26219e865..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
+++ /dev/null
@@ -1,3 +0,0 @@
-cstddef
-cstdint
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
deleted file mode 100644
index ba220443ca812..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
+++ /dev/null
@@ -1,29 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-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
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
deleted file mode 100644
index 2f34f998b4faa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
+++ /dev/null
@@ -1,10 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
deleted file mode 100644
index accc76242aff2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.version b/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17.csv b/libcxx/test/libcxx/transitive_includes/cxx17.csv
new file mode 100644
index 0000000000000..3b2c1414e5477
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes/cxx17.csv
@@ -0,0 +1,588 @@
+algorithm atomic
+algorithm bit
+algorithm chrono
+algorithm climits
+algorithm concepts
+algorithm cstddef
+algorithm cstdlib
+algorithm cstring
+algorithm initializer_list
+algorithm iterator
+algorithm limits
+algorithm memory
+algorithm new
+algorithm type_traits
+any atomic
+any concepts
+any cstddef
+any cstring
+any initializer_list
+any iterator
+any limits
+any memory
+any new
+any stdexcept
+any type_traits
+any typeinfo
+array algorithm
+array compare
+array concepts
+array cstdlib
+array initializer_list
+array limits
+array stdexcept
+atomic chrono
+atomic cstring
+atomic ctime
+atomic iosfwd
+atomic limits
+atomic ratio
+barrier atomic
+barrier concepts
+barrier cstring
+barrier ctime
+barrier iosfwd
+barrier iterator
+barrier limits
+barrier memory
+barrier new
+barrier ratio
+barrier type_traits
+bit cstdlib
+bit iosfwd
+bit limits
+bit type_traits
+bitset climits
+bitset concepts
+bitset cstdlib
+bitset cstring
+bitset initializer_list
+bitset limits
+bitset new
+bitset stdexcept
+bitset string
+ccomplex complex
+charconv cerrno
+charconv cmath
+charconv concepts
+charconv cstdlib
+charconv cstring
+charconv initializer_list
+charconv iosfwd
+charconv limits
+charconv type_traits
+chrono compare
+chrono ctime
+chrono limits
+chrono ratio
+cinttypes cstdint
+cmath type_traits
+codecvt atomic
+codecvt cctype
+codecvt concepts
+codecvt cstring
+codecvt initializer_list
+codecvt limits
+codecvt mutex
+codecvt new
+codecvt stdexcept
+codecvt type_traits
+codecvt typeinfo
+compare cmath
+compare type_traits
+complex cmath
+complex iosfwd
+complex sstream
+complex stdexcept
+concepts type_traits
+condition_variable atomic
+condition_variable concepts
+condition_variable cstring
+condition_variable initializer_list
+condition_variable limits
+condition_variable new
+condition_variable stdexcept
+condition_variable system_error
+condition_variable type_traits
+condition_variable typeinfo
+coroutine compare
+coroutine cstddef
+coroutine cstring
+coroutine iosfwd
+coroutine limits
+coroutine type_traits
+cstddef version
+ctgmath ccomplex
+cwchar cwctype
+cwctype cctype
+deque algorithm
+deque atomic
+deque concepts
+deque cstdlib
+deque cstring
+deque functional
+deque initializer_list
+deque limits
+deque new
+deque stdexcept
+deque typeinfo
+exception cstddef
+exception cstdlib
+exception type_traits
+execution version
+experimental/algorithm algorithm
+experimental/algorithm cstddef
+experimental/algorithm type_traits
+experimental/coroutine atomic
+experimental/coroutine concepts
+experimental/coroutine cstddef
+experimental/coroutine cstring
+experimental/coroutine initializer_list
+experimental/coroutine iterator
+experimental/coroutine limits
+experimental/coroutine memory
+experimental/coroutine new
+experimental/coroutine type_traits
+experimental/deque deque
+experimental/deque experimental/memory_resource
+experimental/forward_list experimental/memory_resource
+experimental/forward_list forward_list
+experimental/functional array
+experimental/functional cstddef
+experimental/functional functional
+experimental/functional type_traits
+experimental/iterator cstddef
+experimental/iterator iosfwd
+experimental/iterator iterator
+experimental/iterator type_traits
+experimental/list experimental/memory_resource
+experimental/list list
+experimental/map experimental/memory_resource
+experimental/map map
+experimental/memory_resource atomic
+experimental/memory_resource concepts
+experimental/memory_resource cstddef
+experimental/memory_resource experimental/utility
+experimental/memory_resource iterator
+experimental/memory_resource limits
+experimental/memory_resource memory
+experimental/memory_resource new
+experimental/memory_resource stdexcept
+experimental/memory_resource tuple
+experimental/memory_resource type_traits
+experimental/propagate_const cstddef
+experimental/propagate_const type_traits
+experimental/regex experimental/memory_resource
+experimental/regex experimental/string
+experimental/regex regex
+experimental/set experimental/memory_resource
+experimental/set set
+experimental/simd array
+experimental/simd cstddef
+experimental/simd functional
+experimental/string experimental/memory_resource
+experimental/string string
+experimental/type_traits initializer_list
+experimental/type_traits type_traits
+experimental/unordered_map array
+experimental/unordered_map experimental/memory_resource
+experimental/unordered_map functional
+experimental/unordered_map unordered_map
+experimental/unordered_set experimental/memory_resource
+experimental/unordered_set unordered_set
+experimental/utility utility
+experimental/vector experimental/memory_resource
+experimental/vector vector
+ext/hash_map algorithm
+ext/hash_map cmath
+ext/hash_map concepts
+ext/hash_map cstddef
+ext/hash_map cstring
+ext/hash_map initializer_list
+ext/hash_map limits
+ext/hash_map new
+ext/hash_map string
+ext/hash_map type_traits
+ext/hash_set algorithm
+ext/hash_set cmath
+ext/hash_set concepts
+ext/hash_set cstddef
+ext/hash_set cstring
+ext/hash_set initializer_list
+ext/hash_set limits
+ext/hash_set new
+ext/hash_set string
+ext/hash_set type_traits
+filesystem cerrno
+filesystem concepts
+filesystem ctime
+filesystem iomanip
+filesystem limits
+filesystem ratio
+filesystem string
+format charconv
+format concepts
+format cstdlib
+format cstring
+format initializer_list
+format limits
+format locale
+format stdexcept
+format string
+format string_view
+format version
+forward_list algorithm
+forward_list atomic
+forward_list concepts
+forward_list cstddef
+forward_list cstdlib
+forward_list cstring
+forward_list functional
+forward_list initializer_list
+forward_list limits
+forward_list new
+forward_list stdexcept
+forward_list type_traits
+forward_list typeinfo
+fstream atomic
+fstream cctype
+fstream concepts
+fstream cstddef
+fstream cstring
+fstream filesystem
+fstream initializer_list
+fstream istream
+fstream limits
+fstream mutex
+fstream new
+fstream stdexcept
+fstream type_traits
+fstream typeinfo
+functional array
+functional atomic
+functional concepts
+functional cstdlib
+functional cstring
+functional initializer_list
+functional limits
+functional stdexcept
+functional tuple
+functional type_traits
+functional unordered_map
+functional vector
+future exception
+future limits
+future mutex
+future ratio
+future thread
+initializer_list cstddef
+iomanip istream
+ios atomic
+ios cctype
+ios concepts
+ios cstring
+ios initializer_list
+ios iosfwd
+ios limits
+ios mutex
+ios new
+ios stdexcept
+ios type_traits
+ios typeinfo
+iosfwd version
+iostream ios
+iostream istream
+iostream version
+istream concepts
+istream cstddef
+istream iosfwd
+istream ostream
+iterator concepts
+iterator cstddef
+iterator cstdlib
+iterator limits
+iterator type_traits
+iterator variant
+latch atomic
+limits type_traits
+list algorithm
+list atomic
+list concepts
+list cstdlib
+list cstring
+list functional
+list initializer_list
+list limits
+list new
+list stdexcept
+list typeinfo
+locale atomic
+locale cctype
+locale concepts
+locale cstdarg
+locale cstdlib
+locale cstring
+locale initializer_list
+locale ios
+locale iosfwd
+locale limits
+locale mutex
+locale new
+locale stdexcept
+locale streambuf
+locale typeinfo
+map concepts
+map cstdlib
+map functional
+map initializer_list
+map limits
+map new
+map optional
+map stdexcept
+memory atomic
+memory concepts
+memory cstddef
+memory cstring
+memory initializer_list
+memory iterator
+memory limits
+memory new
+memory stdexcept
+memory type_traits
+memory typeinfo
+mutex atomic
+mutex concepts
+mutex cstring
+mutex initializer_list
+mutex limits
+mutex new
+mutex stdexcept
+mutex system_error
+mutex type_traits
+mutex typeinfo
+new cstddef
+new cstdlib
+new exception
+numbers concepts
+numeric cmath
+numeric concepts
+numeric functional
+optional atomic
+optional chrono
+optional compare
+optional concepts
+optional cstddef
+optional cstring
+optional initializer_list
+optional iterator
+optional limits
+optional memory
+optional new
+optional stdexcept
+optional type_traits
+ostream bitset
+ostream cstring
+ostream ios
+ostream limits
+ostream locale
+ostream new
+ostream type_traits
+queue concepts
+queue cstddef
+queue cstdlib
+queue deque
+queue initializer_list
+queue limits
+queue type_traits
+random climits
+random cmath
+random concepts
+random cstdint
+random cstdlib
+random initializer_list
+random iosfwd
+random limits
+random numeric
+random string
+random type_traits
+ranges concepts
+ranges cstdlib
+ranges initializer_list
+ranges limits
+ranges span
+ranges tuple
+ranges type_traits
+ranges variant
+ratio climits
+ratio cstdint
+ratio type_traits
+regex atomic
+regex cctype
+regex concepts
+regex cstdlib
+regex cstring
+regex deque
+regex initializer_list
+regex limits
+regex mutex
+regex new
+regex stdexcept
+regex type_traits
+regex typeinfo
+scoped_allocator atomic
+scoped_allocator concepts
+scoped_allocator cstddef
+scoped_allocator iterator
+scoped_allocator limits
+scoped_allocator memory
+scoped_allocator new
+scoped_allocator tuple
+scoped_allocator type_traits
+semaphore atomic
+semaphore ctime
+semaphore iosfwd
+semaphore limits
+semaphore ratio
+set concepts
+set cstdlib
+set functional
+set initializer_list
+set limits
+set new
+set optional
+set stdexcept
+shared_mutex version
+span array
+span concepts
+span cstddef
+span functional
+span initializer_list
+span limits
+span type_traits
+sstream istream
+sstream type_traits
+stack concepts
+stack deque
+stdexcept cstdlib
+stdexcept exception
+stdexcept iosfwd
+streambuf cstdint
+streambuf ios
+string climits
+string concepts
+string cstddef
+string cstdio
+string cstdlib
+string cstring
+string cwchar
+string initializer_list
+string iosfwd
+string limits
+string new
+string stdexcept
+string string_view
+string type_traits
+string_view algorithm
+string_view compare
+string_view concepts
+string_view cstddef
+string_view cstdio
+string_view cstdlib
+string_view cstring
+string_view cwchar
+string_view functional
+string_view initializer_list
+string_view iosfwd
+string_view limits
+string_view stdexcept
+string_view type_traits
+strstream istream
+system_error cerrno
+system_error cstddef
+system_error cstring
+system_error limits
+system_error stdexcept
+system_error string
+system_error type_traits
+thread cstddef
+thread cstring
+thread ctime
+thread iosfwd
+thread limits
+thread new
+thread ratio
+thread system_error
+thread type_traits
+tuple compare
+tuple exception
+tuple iosfwd
+tuple new
+tuple type_traits
+tuple typeinfo
+tuple utility
+type_traits cstddef
+type_traits cstdint
+typeindex compare
+typeindex iosfwd
+typeindex new
+typeindex typeinfo
+typeindex utility
+typeinfo cstddef
+typeinfo cstdint
+typeinfo exception
+unordered_map algorithm
+unordered_map cmath
+unordered_map concepts
+unordered_map cstdlib
+unordered_map cstring
+unordered_map initializer_list
+unordered_map limits
+unordered_map new
+unordered_map optional
+unordered_map stdexcept
+unordered_map type_traits
+unordered_set cmath
+unordered_set concepts
+unordered_set cstdlib
+unordered_set cstring
+unordered_set functional
+unordered_set initializer_list
+unordered_set limits
+unordered_set new
+unordered_set optional
+unordered_set stdexcept
+unordered_set type_traits
+utility compare
+utility cstddef
+utility cstdlib
+utility initializer_list
+utility iosfwd
+utility limits
+utility type_traits
+valarray algorithm
+valarray cmath
+valarray concepts
+valarray cstdlib
+valarray cstring
+valarray functional
+valarray initializer_list
+valarray limits
+valarray new
+valarray stdexcept
+variant cstring
+variant exception
+variant initializer_list
+variant limits
+variant new
+variant tuple
+variant type_traits
+vector algorithm
+vector atomic
+vector concepts
+vector cstdlib
+vector cstring
+vector initializer_list
+vector limits
+vector new
+vector stdexcept
+vector typeinfo

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
deleted file mode 100644
index ece47497507b2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
+++ /dev/null
@@ -1,27 +0,0 @@
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.any b/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.array b/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
deleted file mode 100644
index 4206ba1eee44e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
+++ /dev/null
@@ -1,13 +0,0 @@
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
deleted file mode 100644
index e53db43d769bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
deleted file mode 100644
index 64161c1d331fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
deleted file mode 100644
index 458696c3a73ff..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
+++ /dev/null
@@ -1,12 +0,0 @@
-cerrno
-cmath
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
deleted file mode 100644
index 9f1521d4d4835..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
+++ /dev/null
@@ -1,10 +0,0 @@
-climits
-cmath
-compare
-cstddef
-cstdint
-ctime
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
deleted file mode 100644
index 37103a4f4b892..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
+++ /dev/null
@@ -1 +0,0 @@
-cstdint

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
deleted file mode 100644
index 49fcbf44c5b21..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
deleted file mode 100644
index 4d101cb290c16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
deleted file mode 100644
index 7678c0e38802c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
+++ /dev/null
@@ -1,6 +0,0 @@
-cmath
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
deleted file mode 100644
index 1724fbdde39ed..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
deleted file mode 100644
index afddf59ae6bf5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
+++ /dev/null
@@ -1,9 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstring
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
deleted file mode 100644
index 98bf9a8010e40..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
+++ /dev/null
@@ -1,52 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-ccomplex
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
deleted file mode 100644
index fa1b7f2569941..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
+++ /dev/null
@@ -1,2 +0,0 @@
-cctype
-cwctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
deleted file mode 100644
index a82e62c088dce..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
+++ /dev/null
@@ -1 +0,0 @@
-cctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
deleted file mode 100644
index 4c4515dcec7d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-cstdlib
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
deleted file mode 100644
index e9b93fcc7c91e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
deleted file mode 100644
index e1ba276ab7ef9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-forward_list
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
deleted file mode 100644
index 447087a3f6f96..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
+++ /dev/null
@@ -1,19 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
deleted file mode 100644
index ed186faf929c5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-list
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
deleted file mode 100644
index 179b5b76d6f6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-map
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
deleted file mode 100644
index 064d3eab47aef..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
+++ /dev/null
@@ -1,27 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 3c525e1b4a9d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-experimental/memory_resource
-experimental/string
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-regex
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
deleted file mode 100644
index 21d59c287aca1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-set
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
deleted file mode 100644
index 46dcb1d1a6282..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
deleted file mode 100644
index 5866e56e076ea..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 251dd7013fd2f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
deleted file mode 100644
index c678f3985291a..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-unordered_set
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
deleted file mode 100644
index 799a14724cf41..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
+++ /dev/null
@@ -1,11 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
deleted file mode 100644
index a97f08e050a8f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
+++ /dev/null
@@ -1,31 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
deleted file mode 100644
index 0dacf739a7859..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
deleted file mode 100644
index 39829086f4cb1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.format b/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
deleted file mode 100644
index efe2c926890e3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-charconv
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
deleted file mode 100644
index 22e80bc111922..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-filesystem
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
deleted file mode 100644
index a202e549334ae..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.future b/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
deleted file mode 100644
index 0bffec1c88f36..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-thread
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
deleted file mode 100644
index 7b45506ea14b3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
+++ /dev/null
@@ -1,2 +0,0 @@
-cstddef
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
deleted file mode 100644
index 4d101cb290c16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
deleted file mode 100644
index 762d13c26ac3c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
+++ /dev/null
@@ -1,48 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
deleted file mode 100644
index f6043d7d3b1d4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
+++ /dev/null
@@ -1,18 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
deleted file mode 100644
index 3e9917b3da1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
deleted file mode 100644
index a5ac726129c05..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
+++ /dev/null
@@ -1,45 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
deleted file mode 100644
index 9af31ba1b625d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.new b/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
deleted file mode 100644
index 31e9f436e6cd3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
+++ /dev/null
@@ -1,5 +0,0 @@
-concepts
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
deleted file mode 100644
index 63afc93662e2e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
deleted file mode 100644
index c26bdc7479b64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.random b/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
deleted file mode 100644
index 67c6aa6723acf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-numeric
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
deleted file mode 100644
index a46c30df88516..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-span
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
deleted file mode 100644
index 29043403235fa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
+++ /dev/null
@@ -1,5 +0,0 @@
-climits
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
deleted file mode 100644
index 4f3dd16a93887..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
deleted file mode 100644
index f36910fde696d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
deleted file mode 100644
index 3e9917b3da1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-chrono
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.span b/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
deleted file mode 100644
index c26bdc7479b64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
deleted file mode 100644
index e9e1b1a3af1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-iosfwd
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
deleted file mode 100644
index 6e7e5b2689767..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
+++ /dev/null
@@ -1,43 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
deleted file mode 100644
index e814351725ef2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
+++ /dev/null
@@ -1,38 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
deleted file mode 100644
index 138c1f54d41bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
+++ /dev/null
@@ -1,37 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
deleted file mode 100644
index fd0c4b4ca7361..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
deleted file mode 100644
index 8598675317389..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
deleted file mode 100644
index 4101ee5209a39..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
deleted file mode 100644
index fa3e26219e865..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
+++ /dev/null
@@ -1,3 +0,0 @@
-cstddef
-cstdint
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
deleted file mode 100644
index ba220443ca812..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
+++ /dev/null
@@ -1,29 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-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
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
deleted file mode 100644
index 2f34f998b4faa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
+++ /dev/null
@@ -1,10 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
deleted file mode 100644
index 7625982373f82..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
deleted file mode 100644
index accc76242aff2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
deleted file mode 100644
index 944a3eeea2d64..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-chrono
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.version b/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20.csv b/libcxx/test/libcxx/transitive_includes/cxx20.csv
new file mode 100644
index 0000000000000..1ca1ab58d2c2c
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes/cxx20.csv
@@ -0,0 +1,593 @@
+algorithm atomic
+algorithm bit
+algorithm climits
+algorithm concepts
+algorithm cstddef
+algorithm cstdlib
+algorithm cstring
+algorithm initializer_list
+algorithm iterator
+algorithm limits
+algorithm memory
+algorithm new
+algorithm type_traits
+any atomic
+any concepts
+any cstddef
+any cstring
+any initializer_list
+any iterator
+any limits
+any memory
+any new
+any stdexcept
+any type_traits
+any typeinfo
+array algorithm
+array compare
+array concepts
+array cstdlib
+array initializer_list
+array limits
+array stdexcept
+atomic cmath
+atomic compare
+atomic cstring
+atomic ctime
+atomic iosfwd
+atomic limits
+atomic ratio
+barrier atomic
+barrier concepts
+barrier cstring
+barrier ctime
+barrier iosfwd
+barrier iterator
+barrier limits
+barrier memory
+barrier new
+barrier ratio
+barrier type_traits
+bit cstdlib
+bit iosfwd
+bit limits
+bit type_traits
+bitset climits
+bitset concepts
+bitset cstdlib
+bitset cstring
+bitset initializer_list
+bitset limits
+bitset new
+bitset stdexcept
+bitset string
+ccomplex complex
+charconv cerrno
+charconv cmath
+charconv concepts
+charconv cstdlib
+charconv cstring
+charconv initializer_list
+charconv iosfwd
+charconv limits
+charconv type_traits
+chrono charconv
+chrono compare
+chrono concepts
+chrono ctime
+chrono limits
+chrono ratio
+chrono sstream
+chrono stdexcept
+chrono string
+chrono string_view
+cinttypes cstdint
+cmath type_traits
+codecvt atomic
+codecvt cctype
+codecvt concepts
+codecvt cstring
+codecvt initializer_list
+codecvt limits
+codecvt mutex
+codecvt new
+codecvt stdexcept
+codecvt type_traits
+codecvt typeinfo
+compare cmath
+compare type_traits
+complex cmath
+complex iosfwd
+complex sstream
+complex stdexcept
+concepts type_traits
+condition_variable atomic
+condition_variable concepts
+condition_variable cstring
+condition_variable initializer_list
+condition_variable limits
+condition_variable new
+condition_variable stdexcept
+condition_variable system_error
+condition_variable type_traits
+condition_variable typeinfo
+coroutine compare
+coroutine cstddef
+coroutine cstring
+coroutine iosfwd
+coroutine limits
+coroutine type_traits
+cstddef version
+ctgmath ccomplex
+cwchar cwctype
+cwctype cctype
+deque algorithm
+deque atomic
+deque concepts
+deque cstdlib
+deque cstring
+deque functional
+deque initializer_list
+deque limits
+deque new
+deque stdexcept
+deque typeinfo
+exception cstddef
+exception cstdlib
+exception type_traits
+execution version
+experimental/algorithm algorithm
+experimental/algorithm cstddef
+experimental/algorithm type_traits
+experimental/coroutine atomic
+experimental/coroutine concepts
+experimental/coroutine cstddef
+experimental/coroutine cstring
+experimental/coroutine initializer_list
+experimental/coroutine iterator
+experimental/coroutine limits
+experimental/coroutine memory
+experimental/coroutine new
+experimental/coroutine type_traits
+experimental/deque deque
+experimental/deque experimental/memory_resource
+experimental/forward_list experimental/memory_resource
+experimental/forward_list forward_list
+experimental/functional array
+experimental/functional cstddef
+experimental/functional functional
+experimental/functional type_traits
+experimental/iterator cstddef
+experimental/iterator iosfwd
+experimental/iterator iterator
+experimental/iterator type_traits
+experimental/list experimental/memory_resource
+experimental/list list
+experimental/map experimental/memory_resource
+experimental/map map
+experimental/memory_resource atomic
+experimental/memory_resource concepts
+experimental/memory_resource cstddef
+experimental/memory_resource experimental/utility
+experimental/memory_resource iterator
+experimental/memory_resource limits
+experimental/memory_resource memory
+experimental/memory_resource new
+experimental/memory_resource stdexcept
+experimental/memory_resource tuple
+experimental/memory_resource type_traits
+experimental/propagate_const cstddef
+experimental/propagate_const type_traits
+experimental/regex experimental/memory_resource
+experimental/regex experimental/string
+experimental/regex regex
+experimental/set experimental/memory_resource
+experimental/set set
+experimental/simd array
+experimental/simd cstddef
+experimental/simd functional
+experimental/string experimental/memory_resource
+experimental/string string
+experimental/type_traits initializer_list
+experimental/type_traits type_traits
+experimental/unordered_map array
+experimental/unordered_map experimental/memory_resource
+experimental/unordered_map functional
+experimental/unordered_map unordered_map
+experimental/unordered_set experimental/memory_resource
+experimental/unordered_set unordered_set
+experimental/utility utility
+experimental/vector experimental/memory_resource
+experimental/vector vector
+ext/hash_map algorithm
+ext/hash_map cmath
+ext/hash_map concepts
+ext/hash_map cstddef
+ext/hash_map cstring
+ext/hash_map initializer_list
+ext/hash_map limits
+ext/hash_map new
+ext/hash_map string
+ext/hash_map type_traits
+ext/hash_set algorithm
+ext/hash_set cmath
+ext/hash_set concepts
+ext/hash_set cstddef
+ext/hash_set cstring
+ext/hash_set initializer_list
+ext/hash_set limits
+ext/hash_set new
+ext/hash_set string
+ext/hash_set type_traits
+filesystem cerrno
+filesystem concepts
+filesystem ctime
+filesystem iomanip
+filesystem limits
+filesystem ratio
+filesystem string
+format charconv
+format concepts
+format cstdlib
+format cstring
+format initializer_list
+format limits
+format locale
+format stdexcept
+format string
+format string_view
+format version
+forward_list algorithm
+forward_list atomic
+forward_list concepts
+forward_list cstddef
+forward_list cstdlib
+forward_list cstring
+forward_list functional
+forward_list initializer_list
+forward_list limits
+forward_list new
+forward_list stdexcept
+forward_list type_traits
+forward_list typeinfo
+fstream atomic
+fstream cctype
+fstream concepts
+fstream cstddef
+fstream cstring
+fstream filesystem
+fstream initializer_list
+fstream istream
+fstream limits
+fstream mutex
+fstream new
+fstream stdexcept
+fstream type_traits
+fstream typeinfo
+functional array
+functional atomic
+functional concepts
+functional cstdlib
+functional cstring
+functional initializer_list
+functional limits
+functional stdexcept
+functional tuple
+functional type_traits
+functional unordered_map
+functional vector
+future exception
+future limits
+future mutex
+future ratio
+future thread
+initializer_list cstddef
+iomanip istream
+ios atomic
+ios cctype
+ios concepts
+ios cstring
+ios initializer_list
+ios iosfwd
+ios limits
+ios mutex
+ios new
+ios stdexcept
+ios type_traits
+ios typeinfo
+iosfwd version
+iostream ios
+iostream istream
+iostream version
+istream concepts
+istream cstddef
+istream iosfwd
+istream ostream
+iterator concepts
+iterator cstddef
+iterator cstdlib
+iterator limits
+iterator type_traits
+iterator variant
+latch atomic
+limits type_traits
+list algorithm
+list atomic
+list concepts
+list cstdlib
+list cstring
+list functional
+list initializer_list
+list limits
+list new
+list stdexcept
+list typeinfo
+locale atomic
+locale cctype
+locale concepts
+locale cstdarg
+locale cstdlib
+locale cstring
+locale initializer_list
+locale ios
+locale iosfwd
+locale limits
+locale mutex
+locale new
+locale stdexcept
+locale streambuf
+locale typeinfo
+map concepts
+map cstdlib
+map functional
+map initializer_list
+map limits
+map new
+map optional
+map stdexcept
+memory atomic
+memory concepts
+memory cstddef
+memory cstring
+memory initializer_list
+memory iterator
+memory limits
+memory new
+memory stdexcept
+memory type_traits
+memory typeinfo
+mutex atomic
+mutex concepts
+mutex cstring
+mutex initializer_list
+mutex limits
+mutex new
+mutex stdexcept
+mutex system_error
+mutex type_traits
+mutex typeinfo
+new cstddef
+new cstdlib
+new exception
+numbers concepts
+numeric cmath
+numeric concepts
+numeric functional
+optional atomic
+optional compare
+optional concepts
+optional cstddef
+optional cstring
+optional initializer_list
+optional iterator
+optional limits
+optional memory
+optional new
+optional stdexcept
+optional type_traits
+ostream bitset
+ostream cstring
+ostream ios
+ostream limits
+ostream locale
+ostream new
+ostream type_traits
+queue concepts
+queue cstddef
+queue cstdlib
+queue deque
+queue initializer_list
+queue limits
+queue type_traits
+random climits
+random cmath
+random concepts
+random cstdint
+random cstdlib
+random initializer_list
+random iosfwd
+random limits
+random numeric
+random string
+random type_traits
+ranges concepts
+ranges cstdlib
+ranges initializer_list
+ranges limits
+ranges span
+ranges tuple
+ranges type_traits
+ranges variant
+ratio climits
+ratio cstdint
+ratio type_traits
+regex atomic
+regex cctype
+regex concepts
+regex cstdlib
+regex cstring
+regex deque
+regex initializer_list
+regex limits
+regex mutex
+regex new
+regex stdexcept
+regex type_traits
+regex typeinfo
+scoped_allocator atomic
+scoped_allocator concepts
+scoped_allocator cstddef
+scoped_allocator iterator
+scoped_allocator limits
+scoped_allocator memory
+scoped_allocator new
+scoped_allocator tuple
+scoped_allocator type_traits
+semaphore atomic
+semaphore ctime
+semaphore iosfwd
+semaphore limits
+semaphore ratio
+set concepts
+set cstdlib
+set functional
+set initializer_list
+set limits
+set new
+set optional
+set stdexcept
+shared_mutex version
+span array
+span concepts
+span cstddef
+span functional
+span initializer_list
+span limits
+span type_traits
+sstream istream
+sstream type_traits
+stack concepts
+stack deque
+stdexcept cstdlib
+stdexcept exception
+stdexcept iosfwd
+streambuf cstdint
+streambuf ios
+string climits
+string concepts
+string cstddef
+string cstdio
+string cstdlib
+string cstring
+string cwchar
+string initializer_list
+string iosfwd
+string limits
+string new
+string stdexcept
+string string_view
+string type_traits
+string_view algorithm
+string_view compare
+string_view concepts
+string_view cstddef
+string_view cstdio
+string_view cstdlib
+string_view cstring
+string_view cwchar
+string_view functional
+string_view initializer_list
+string_view iosfwd
+string_view limits
+string_view stdexcept
+string_view type_traits
+strstream istream
+system_error cerrno
+system_error cstddef
+system_error cstring
+system_error limits
+system_error stdexcept
+system_error string
+system_error type_traits
+thread cstddef
+thread cstring
+thread ctime
+thread iosfwd
+thread limits
+thread new
+thread ratio
+thread system_error
+thread type_traits
+tuple compare
+tuple exception
+tuple iosfwd
+tuple new
+tuple type_traits
+tuple typeinfo
+tuple utility
+type_traits cstddef
+type_traits cstdint
+typeindex compare
+typeindex iosfwd
+typeindex new
+typeindex typeinfo
+typeindex utility
+typeinfo cstddef
+typeinfo cstdint
+typeinfo exception
+unordered_map algorithm
+unordered_map cmath
+unordered_map concepts
+unordered_map cstdlib
+unordered_map cstring
+unordered_map initializer_list
+unordered_map limits
+unordered_map new
+unordered_map optional
+unordered_map stdexcept
+unordered_map type_traits
+unordered_set cmath
+unordered_set concepts
+unordered_set cstdlib
+unordered_set cstring
+unordered_set functional
+unordered_set initializer_list
+unordered_set limits
+unordered_set new
+unordered_set optional
+unordered_set stdexcept
+unordered_set type_traits
+utility compare
+utility cstddef
+utility cstdlib
+utility initializer_list
+utility iosfwd
+utility limits
+utility type_traits
+valarray algorithm
+valarray cmath
+valarray concepts
+valarray cstdlib
+valarray cstring
+valarray functional
+valarray initializer_list
+valarray limits
+valarray new
+valarray stdexcept
+variant cstring
+variant exception
+variant initializer_list
+variant limits
+variant new
+variant tuple
+variant type_traits
+vector algorithm
+vector atomic
+vector concepts
+vector cstdlib
+vector cstring
+vector initializer_list
+vector limits
+vector new
+vector stdexcept
+vector typeinfo

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
deleted file mode 100644
index a7741dc30ad6c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.any b/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
deleted file mode 100644
index db28f1f58dd4c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.array b/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
deleted file mode 100644
index f8ccff41c2bb1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
+++ /dev/null
@@ -1,27 +0,0 @@
-algorithm
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
deleted file mode 100644
index cd11be843d912..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
+++ /dev/null
@@ -1,12 +0,0 @@
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
deleted file mode 100644
index db28f1f58dd4c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
deleted file mode 100644
index e53db43d769bf..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
deleted file mode 100644
index b90a8c85d103f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
+++ /dev/null
@@ -1,38 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
deleted file mode 100644
index 7b2a43f3ec9f4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
deleted file mode 100644
index 458696c3a73ff..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
+++ /dev/null
@@ -1,12 +0,0 @@
-cerrno
-cmath
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
deleted file mode 100644
index afda2d6d3a2ac..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-charconv
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
deleted file mode 100644
index 37103a4f4b892..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
+++ /dev/null
@@ -1 +0,0 @@
-cstdint

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
deleted file mode 100644
index 49fcbf44c5b21..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
deleted file mode 100644
index dcaffb654be30..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
deleted file mode 100644
index 7678c0e38802c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
+++ /dev/null
@@ -1,6 +0,0 @@
-cmath
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
deleted file mode 100644
index 00e0758f4cced..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
deleted file mode 100644
index 1afa1e305c66d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
deleted file mode 100644
index afddf59ae6bf5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
+++ /dev/null
@@ -1,9 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstring
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
deleted file mode 100644
index 498d5a1ff0795..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
+++ /dev/null
@@ -1,51 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-ccomplex
-cctype
-cerrno
-climits
-cmath
-compare
-complex
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
deleted file mode 100644
index fa1b7f2569941..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
+++ /dev/null
@@ -1,2 +0,0 @@
-cctype
-cwctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
deleted file mode 100644
index a82e62c088dce..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
+++ /dev/null
@@ -1 +0,0 @@
-cctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
deleted file mode 100644
index 4c4515dcec7d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-cstdlib
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
deleted file mode 100644
index f8ccff41c2bb1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
+++ /dev/null
@@ -1,27 +0,0 @@
-algorithm
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
deleted file mode 100644
index db28f1f58dd4c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
deleted file mode 100644
index 0a8b728b721f4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
deleted file mode 100644
index d6d946b2aed23..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-forward_list
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
deleted file mode 100644
index 447087a3f6f96..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
+++ /dev/null
@@ -1,19 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
deleted file mode 100644
index 929912b655fee..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-list
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
deleted file mode 100644
index e64065ee68abd..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-map
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
deleted file mode 100644
index db18f2468bf18..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
+++ /dev/null
@@ -1,26 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 3c842a90ac617..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
+++ /dev/null
@@ -1,46 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-experimental/memory_resource
-experimental/string
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-regex
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
deleted file mode 100644
index 6bf895ce21b16..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-set
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
deleted file mode 100644
index 4421b8822f8a6..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
deleted file mode 100644
index 5866e56e076ea..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 0565815fb0b3f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
+++ /dev/null
@@ -1,34 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
deleted file mode 100644
index 8f0d104a4d699..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-unordered_set
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
deleted file mode 100644
index 799a14724cf41..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
+++ /dev/null
@@ -1,11 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
deleted file mode 100644
index 96d5aa83534a4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
+++ /dev/null
@@ -1,30 +0,0 @@
-algorithm
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
deleted file mode 100644
index b90a8c85d103f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
+++ /dev/null
@@ -1,38 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
deleted file mode 100644
index b90a8c85d103f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
+++ /dev/null
@@ -1,38 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
deleted file mode 100644
index fd992145bd1f3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
+++ /dev/null
@@ -1,49 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.format b/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
deleted file mode 100644
index d4526b941259f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
+++ /dev/null
@@ -1,46 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-charconv
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
deleted file mode 100644
index 02157ec5aa54d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
+++ /dev/null
@@ -1,50 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-filesystem
-functional
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
deleted file mode 100644
index b284e6329c390..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
+++ /dev/null
@@ -1,31 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.future b/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
deleted file mode 100644
index 8409f6047f93b..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-thread
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
deleted file mode 100644
index 7b45506ea14b3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
+++ /dev/null
@@ -1,2 +0,0 @@
-cstddef
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
deleted file mode 100644
index cd2a2f405afb9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
+++ /dev/null
@@ -1,48 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
deleted file mode 100644
index dcaffb654be30..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
+++ /dev/null
@@ -1,41 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
deleted file mode 100644
index cd2a2f405afb9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
+++ /dev/null
@@ -1,48 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
deleted file mode 100644
index c5cea41f9f069..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
+++ /dev/null
@@ -1,47 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
deleted file mode 100644
index f6043d7d3b1d4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
+++ /dev/null
@@ -1,18 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
deleted file mode 100644
index a211832b18bbe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
+++ /dev/null
@@ -1,13 +0,0 @@
-atomic
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
deleted file mode 100644
index ecff294a2587b..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
+++ /dev/null
@@ -1,44 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
deleted file mode 100644
index f90c01f7a521d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
+++ /dev/null
@@ -1,24 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
deleted file mode 100644
index 1afa1e305c66d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.new b/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
deleted file mode 100644
index 31e9f436e6cd3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
+++ /dev/null
@@ -1,5 +0,0 @@
-concepts
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
deleted file mode 100644
index db28f1f58dd4c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
deleted file mode 100644
index 06ee15d163d80..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
+++ /dev/null
@@ -1,46 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
deleted file mode 100644
index e3144557aa464..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.random b/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
deleted file mode 100644
index c4cd48f6c6459..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-numeric
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
deleted file mode 100644
index 96d634628cbfb..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-span
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
deleted file mode 100644
index 29043403235fa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
+++ /dev/null
@@ -1,5 +0,0 @@
-climits
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
deleted file mode 100644
index fd34735b9a8d5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
deleted file mode 100644
index db28f1f58dd4c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
deleted file mode 100644
index a211832b18bbe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
+++ /dev/null
@@ -1,13 +0,0 @@
-atomic
-climits
-cmath
-compare
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
deleted file mode 100644
index 1afa1e305c66d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.span b/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
deleted file mode 100644
index cd2a2f405afb9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
+++ /dev/null
@@ -1,48 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
deleted file mode 100644
index e3144557aa464..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
+++ /dev/null
@@ -1,33 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
deleted file mode 100644
index e9e1b1a3af1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-iosfwd
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
deleted file mode 100644
index b2eec45518af9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
+++ /dev/null
@@ -1,42 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-iterator
-limits
-memory
-mutex
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
deleted file mode 100644
index 8b80b5bc5be53..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
+++ /dev/null
@@ -1,37 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
deleted file mode 100644
index f476d89a6f217..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
+++ /dev/null
@@ -1,36 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
deleted file mode 100644
index cd2a2f405afb9..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
+++ /dev/null
@@ -1,48 +0,0 @@
-algorithm
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstdarg
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-ios
-iosfwd
-istream
-iterator
-limits
-locale
-memory
-mutex
-new
-optional
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
deleted file mode 100644
index 47bb23bb78ed8..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
deleted file mode 100644
index 1afa1e305c66d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
+++ /dev/null
@@ -1,40 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
deleted file mode 100644
index fa3e26219e865..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
+++ /dev/null
@@ -1,3 +0,0 @@
-cstddef
-cstdint
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
deleted file mode 100644
index 6b1d2d94efd6e..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
deleted file mode 100644
index 6ae4114122e1c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
+++ /dev/null
@@ -1,28 +0,0 @@
-algorithm
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-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
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
deleted file mode 100644
index 2f34f998b4faa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
+++ /dev/null
@@ -1,10 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-iosfwd
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
deleted file mode 100644
index 243ba6b8ea533..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
+++ /dev/null
@@ -1,32 +0,0 @@
-algorithm
-array
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-utility
-variant
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
deleted file mode 100644
index accc76242aff2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
deleted file mode 100644
index f8ccff41c2bb1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
+++ /dev/null
@@ -1,27 +0,0 @@
-algorithm
-atomic
-bit
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-iterator
-limits
-memory
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.version b/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b.csv b/libcxx/test/libcxx/transitive_includes/cxx2b.csv
new file mode 100644
index 0000000000000..0230046dbb87a
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b.csv
@@ -0,0 +1,560 @@
+algorithm bit
+algorithm climits
+algorithm concepts
+algorithm cstddef
+algorithm cstdlib
+algorithm cstring
+algorithm initializer_list
+algorithm iosfwd
+algorithm limits
+algorithm new
+algorithm type_traits
+any atomic
+any concepts
+any cstddef
+any cstring
+any initializer_list
+any limits
+any new
+any stdexcept
+any type_traits
+any typeinfo
+array compare
+array concepts
+array cstdlib
+array initializer_list
+array limits
+array stdexcept
+atomic cstring
+atomic ctime
+atomic iosfwd
+atomic limits
+atomic ratio
+barrier atomic
+barrier cstring
+barrier ctime
+barrier iosfwd
+barrier limits
+barrier new
+barrier ratio
+barrier type_traits
+bit cstdlib
+bit limits
+bit type_traits
+bitset climits
+bitset concepts
+bitset cstdlib
+bitset cstring
+bitset initializer_list
+bitset limits
+bitset new
+bitset stdexcept
+bitset string
+ccomplex complex
+charconv cerrno
+charconv cmath
+charconv concepts
+charconv cstdlib
+charconv cstring
+charconv initializer_list
+charconv limits
+charconv type_traits
+chrono array
+chrono bit
+chrono charconv
+chrono compare
+chrono concepts
+chrono ctime
+chrono limits
+chrono optional
+chrono ratio
+chrono sstream
+chrono stdexcept
+chrono string
+chrono string_view
+cinttypes cstdint
+cmath type_traits
+codecvt atomic
+codecvt cctype
+codecvt concepts
+codecvt cstring
+codecvt initializer_list
+codecvt limits
+codecvt mutex
+codecvt new
+codecvt stdexcept
+codecvt type_traits
+codecvt typeinfo
+compare cmath
+compare type_traits
+complex cmath
+complex iosfwd
+complex sstream
+complex stdexcept
+concepts type_traits
+condition_variable atomic
+condition_variable concepts
+condition_variable cstring
+condition_variable initializer_list
+condition_variable limits
+condition_variable new
+condition_variable stdexcept
+condition_variable system_error
+condition_variable type_traits
+condition_variable typeinfo
+coroutine compare
+coroutine cstddef
+coroutine cstring
+coroutine limits
+coroutine type_traits
+cstddef version
+ctgmath ccomplex
+cwchar cwctype
+cwctype cctype
+deque atomic
+deque compare
+deque concepts
+deque cstdlib
+deque cstring
+deque initializer_list
+deque limits
+deque new
+deque stdexcept
+deque typeinfo
+exception cstddef
+exception cstdlib
+exception type_traits
+execution version
+experimental/algorithm algorithm
+experimental/algorithm cstddef
+experimental/algorithm type_traits
+experimental/coroutine cstddef
+experimental/coroutine cstring
+experimental/coroutine limits
+experimental/coroutine new
+experimental/coroutine type_traits
+experimental/deque deque
+experimental/deque experimental/memory_resource
+experimental/forward_list experimental/memory_resource
+experimental/forward_list forward_list
+experimental/functional array
+experimental/functional cstddef
+experimental/functional functional
+experimental/functional type_traits
+experimental/iterator cstddef
+experimental/iterator iosfwd
+experimental/iterator iterator
+experimental/iterator type_traits
+experimental/list experimental/memory_resource
+experimental/list list
+experimental/map experimental/memory_resource
+experimental/map map
+experimental/memory_resource cstddef
+experimental/memory_resource experimental/utility
+experimental/memory_resource limits
+experimental/memory_resource new
+experimental/memory_resource stdexcept
+experimental/memory_resource tuple
+experimental/memory_resource type_traits
+experimental/propagate_const cstddef
+experimental/propagate_const type_traits
+experimental/regex experimental/memory_resource
+experimental/regex experimental/string
+experimental/regex regex
+experimental/set experimental/memory_resource
+experimental/set set
+experimental/simd array
+experimental/simd cstddef
+experimental/simd tuple
+experimental/string experimental/memory_resource
+experimental/string string
+experimental/type_traits initializer_list
+experimental/type_traits type_traits
+experimental/unordered_map experimental/memory_resource
+experimental/unordered_map unordered_map
+experimental/unordered_set experimental/memory_resource
+experimental/unordered_set unordered_set
+experimental/utility utility
+experimental/vector experimental/memory_resource
+experimental/vector vector
+ext/hash_map algorithm
+ext/hash_map cmath
+ext/hash_map concepts
+ext/hash_map cstddef
+ext/hash_map cstring
+ext/hash_map functional
+ext/hash_map initializer_list
+ext/hash_map limits
+ext/hash_map new
+ext/hash_map string
+ext/hash_map type_traits
+ext/hash_set algorithm
+ext/hash_set cmath
+ext/hash_set concepts
+ext/hash_set cstddef
+ext/hash_set cstring
+ext/hash_set functional
+ext/hash_set initializer_list
+ext/hash_set limits
+ext/hash_set new
+ext/hash_set string
+ext/hash_set type_traits
+filesystem cerrno
+filesystem concepts
+filesystem ctime
+filesystem iomanip
+filesystem limits
+filesystem ratio
+filesystem string
+format array
+format bit
+format charconv
+format concepts
+format cstdlib
+format cstring
+format initializer_list
+format limits
+format locale
+format optional
+format stdexcept
+format string
+format string_view
+format version
+forward_list atomic
+forward_list compare
+forward_list concepts
+forward_list cstddef
+forward_list cstdlib
+forward_list cstring
+forward_list initializer_list
+forward_list limits
+forward_list new
+forward_list stdexcept
+forward_list type_traits
+forward_list typeinfo
+fstream atomic
+fstream cctype
+fstream concepts
+fstream cstddef
+fstream cstring
+fstream filesystem
+fstream initializer_list
+fstream istream
+fstream limits
+fstream mutex
+fstream new
+fstream stdexcept
+fstream type_traits
+fstream typeinfo
+functional array
+functional atomic
+functional concepts
+functional cstdlib
+functional cstring
+functional initializer_list
+functional limits
+functional memory
+functional new
+functional stdexcept
+functional tuple
+functional type_traits
+functional typeinfo
+functional unordered_map
+functional vector
+future exception
+future limits
+future mutex
+future ratio
+future thread
+initializer_list cstddef
+iomanip istream
+ios atomic
+ios cctype
+ios concepts
+ios cstring
+ios initializer_list
+ios iosfwd
+ios limits
+ios mutex
+ios new
+ios stdexcept
+ios type_traits
+ios typeinfo
+iosfwd version
+iostream ios
+iostream istream
+iostream version
+istream concepts
+istream cstddef
+istream iosfwd
+istream ostream
+iterator concepts
+iterator cstddef
+iterator cstdlib
+iterator iosfwd
+iterator limits
+iterator type_traits
+iterator variant
+latch atomic
+limits type_traits
+list atomic
+list compare
+list concepts
+list cstdlib
+list cstring
+list initializer_list
+list limits
+list new
+list stdexcept
+list typeinfo
+locale atomic
+locale cctype
+locale concepts
+locale cstdlib
+locale cstring
+locale initializer_list
+locale ios
+locale iosfwd
+locale limits
+locale mutex
+locale new
+locale stdexcept
+locale streambuf
+locale typeinfo
+map concepts
+map cstdlib
+map initializer_list
+map limits
+map new
+map optional
+map stdexcept
+map tuple
+memory atomic
+memory compare
+memory concepts
+memory cstddef
+memory cstring
+memory initializer_list
+memory limits
+memory new
+memory stdexcept
+memory type_traits
+memory typeinfo
+mutex atomic
+mutex concepts
+mutex cstring
+mutex initializer_list
+mutex limits
+mutex new
+mutex stdexcept
+mutex system_error
+mutex tuple
+mutex type_traits
+mutex typeinfo
+new cstddef
+new cstdlib
+new exception
+numbers concepts
+numeric cmath
+numeric concepts
+optional compare
+optional cstddef
+optional cstring
+optional initializer_list
+optional limits
+optional new
+optional stdexcept
+optional type_traits
+ostream bitset
+ostream cstring
+ostream ios
+ostream limits
+ostream locale
+ostream new
+ostream type_traits
+queue concepts
+queue cstddef
+queue cstdlib
+queue deque
+queue initializer_list
+queue limits
+queue type_traits
+queue vector
+random bit
+random climits
+random cmath
+random concepts
+random cstdint
+random cstdlib
+random initializer_list
+random iosfwd
+random limits
+random numeric
+random string
+random type_traits
+random vector
+ranges concepts
+ranges cstdlib
+ranges initializer_list
+ranges iterator
+ranges limits
+ranges optional
+ranges span
+ranges tuple
+ranges type_traits
+ranges variant
+ratio climits
+ratio cstdint
+ratio type_traits
+regex atomic
+regex cctype
+regex concepts
+regex cstdlib
+regex cstring
+regex deque
+regex initializer_list
+regex limits
+regex mutex
+regex new
+regex stdexcept
+regex type_traits
+regex typeinfo
+regex vector
+scoped_allocator cstddef
+scoped_allocator limits
+scoped_allocator new
+scoped_allocator tuple
+scoped_allocator type_traits
+semaphore atomic
+semaphore ctime
+semaphore iosfwd
+semaphore limits
+semaphore ratio
+set concepts
+set cstdlib
+set initializer_list
+set limits
+set new
+set optional
+set stdexcept
+shared_mutex version
+span array
+span concepts
+span cstddef
+span initializer_list
+span limits
+span type_traits
+sstream istream
+sstream type_traits
+stack concepts
+stack deque
+stdexcept cstdlib
+stdexcept exception
+stdexcept iosfwd
+streambuf cstdint
+streambuf ios
+string climits
+string concepts
+string cstddef
+string cstdio
+string cstdlib
+string cstring
+string cwchar
+string initializer_list
+string iosfwd
+string limits
+string new
+string stdexcept
+string string_view
+string type_traits
+string_view compare
+string_view concepts
+string_view cstddef
+string_view cstdio
+string_view cstdlib
+string_view cstring
+string_view cwchar
+string_view initializer_list
+string_view iosfwd
+string_view limits
+string_view stdexcept
+string_view type_traits
+strstream istream
+system_error cerrno
+system_error cstddef
+system_error cstring
+system_error limits
+system_error stdexcept
+system_error string
+system_error type_traits
+thread cstddef
+thread cstring
+thread ctime
+thread iosfwd
+thread limits
+thread new
+thread ratio
+thread system_error
+thread tuple
+thread type_traits
+tuple compare
+tuple type_traits
+type_traits cstddef
+type_traits cstdint
+typeindex compare
+typeindex typeinfo
+typeinfo cstddef
+typeinfo cstdint
+typeinfo exception
+unordered_map cmath
+unordered_map concepts
+unordered_map cstdlib
+unordered_map cstring
+unordered_map initializer_list
+unordered_map limits
+unordered_map new
+unordered_map optional
+unordered_map stdexcept
+unordered_map tuple
+unordered_map type_traits
+unordered_set cmath
+unordered_set concepts
+unordered_set cstdlib
+unordered_set cstring
+unordered_set initializer_list
+unordered_set limits
+unordered_set new
+unordered_set optional
+unordered_set stdexcept
+unordered_set type_traits
+utility compare
+utility cstddef
+utility cstdlib
+utility initializer_list
+utility limits
+utility type_traits
+valarray cmath
+valarray concepts
+valarray cstdlib
+valarray cstring
+valarray initializer_list
+valarray limits
+valarray new
+valarray stdexcept
+variant cstring
+variant exception
+variant initializer_list
+variant limits
+variant new
+variant tuple
+variant type_traits
+vector atomic
+vector compare
+vector concepts
+vector cstdlib
+vector cstring
+vector initializer_list
+vector limits
+vector new
+vector stdexcept
+vector typeinfo

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
deleted file mode 100644
index 53858f0bed9e2..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
+++ /dev/null
@@ -1,14 +0,0 @@
-bit
-climits
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
deleted file mode 100644
index 49feb6821f207..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
+++ /dev/null
@@ -1,18 +0,0 @@
-atomic
-climits
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
deleted file mode 100644
index f700e97efd767..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
+++ /dev/null
@@ -1,13 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-stdexcept
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
deleted file mode 100644
index 795fc62ff8451..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
+++ /dev/null
@@ -1,10 +0,0 @@
-climits
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
deleted file mode 100644
index 20025bde41204..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
+++ /dev/null
@@ -1,14 +0,0 @@
-atomic
-climits
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-iosfwd
-limits
-new
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
deleted file mode 100644
index 38ff6fba54f7c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
deleted file mode 100644
index 9b0f96398db86..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
+++ /dev/null
@@ -1,22 +0,0 @@
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-new
-stdexcept
-string
-string_view
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
deleted file mode 100644
index 1c93821da16cd..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
+++ /dev/null
@@ -1,38 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-complex
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
deleted file mode 100644
index c76df9aef8465..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
+++ /dev/null
@@ -1,11 +0,0 @@
-cerrno
-cmath
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-initializer_list
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
deleted file mode 100644
index 4d8196453e81c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
+++ /dev/null
@@ -1,41 +0,0 @@
-array
-atomic
-bit
-bitset
-cctype
-cerrno
-charconv
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-optional
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
deleted file mode 100644
index 37103a4f4b892..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
+++ /dev/null
@@ -1 +0,0 @@
-cstdint

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
deleted file mode 100644
index 49fcbf44c5b21..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
deleted file mode 100644
index 525723ed20b2c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
+++ /dev/null
@@ -1,30 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-mutex
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
deleted file mode 100644
index 7678c0e38802c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
+++ /dev/null
@@ -1,6 +0,0 @@
-cmath
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
deleted file mode 100644
index 7c2e9901056a5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
+++ /dev/null
@@ -1,37 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
deleted file mode 100644
index 0ead270e3dae3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
+++ /dev/null
@@ -1,28 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
deleted file mode 100644
index 2443665e8d03f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
+++ /dev/null
@@ -1,8 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstring
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
deleted file mode 100644
index af8906391ee7d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
+++ /dev/null
@@ -1,39 +0,0 @@
-atomic
-bitset
-ccomplex
-cctype
-cerrno
-climits
-cmath
-compare
-complex
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-sstream
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
deleted file mode 100644
index fa1b7f2569941..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
+++ /dev/null
@@ -1,2 +0,0 @@
-cctype
-cwctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
deleted file mode 100644
index a82e62c088dce..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
+++ /dev/null
@@ -1 +0,0 @@
-cctype

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
deleted file mode 100644
index 22069ebe466d5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
+++ /dev/null
@@ -1,20 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
deleted file mode 100644
index 4c4515dcec7d1..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-cstdlib
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
deleted file mode 100644
index 90b8039f7343f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
+++ /dev/null
@@ -1,15 +0,0 @@
-algorithm
-bit
-climits
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
deleted file mode 100644
index a85c5ddb32e6f..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
+++ /dev/null
@@ -1,9 +0,0 @@
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-limits
-new
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
deleted file mode 100644
index a8bd778d7f964..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
deleted file mode 100644
index 262944b9436ed..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-forward_list
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
deleted file mode 100644
index 944f5a2cedd79..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
+++ /dev/null
@@ -1,27 +0,0 @@
-array
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-functional
-initializer_list
-iosfwd
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
deleted file mode 100644
index 698f6cf9de2f0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
+++ /dev/null
@@ -1,17 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-tuple
-type_traits
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
deleted file mode 100644
index 33fa6ac9ceecb..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-limits
-list
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
deleted file mode 100644
index 2c337ca63351d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
+++ /dev/null
@@ -1,21 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-limits
-map
-new
-optional
-stdexcept
-tuple
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
deleted file mode 100644
index 852039aaf3691..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-experimental/utility
-initializer_list
-iosfwd
-limits
-new
-stdexcept
-tuple
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index 92b60feaf76f8..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
+++ /dev/null
@@ -1,37 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-experimental/memory_resource
-experimental/string
-experimental/utility
-initializer_list
-iosfwd
-limits
-mutex
-new
-ratio
-regex
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-utility
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
deleted file mode 100644
index 97d4fecf64349..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
+++ /dev/null
@@ -1,21 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-limits
-new
-optional
-set
-stdexcept
-tuple
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
deleted file mode 100644
index 9908a3e3ee370..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
+++ /dev/null
@@ -1,15 +0,0 @@
-array
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-stdexcept
-tuple
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
deleted file mode 100644
index 5ec4bfe93aa38..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
+++ /dev/null
@@ -1,26 +0,0 @@
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-cwchar
-cwctype
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-limits
-new
-stdexcept
-string
-string_view
-tuple
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
deleted file mode 100644
index 5866e56e076ea..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
+++ /dev/null
@@ -1,5 +0,0 @@
-cstddef
-cstdint
-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
deleted file mode 100644
index c497967f90afc..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
+++ /dev/null
@@ -1,21 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-limits
-new
-optional
-stdexcept
-tuple
-type_traits
-unordered_map
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
deleted file mode 100644
index 9a1b417f2ccd5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
+++ /dev/null
@@ -1,21 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-limits
-new
-optional
-stdexcept
-tuple
-type_traits
-unordered_set
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
deleted file mode 100644
index 30781fff93362..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
+++ /dev/null
@@ -1,10 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-limits
-type_traits
-utility
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
deleted file mode 100644
index 14a94c0203de5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
+++ /dev/null
@@ -1,25 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-experimental/memory_resource
-experimental/utility
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-utility
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
deleted file mode 100644
index 5c77f4dd4955c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
deleted file mode 100644
index 5c77f4dd4955c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
+++ /dev/null
@@ -1,35 +0,0 @@
-algorithm
-array
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-functional
-initializer_list
-iosfwd
-limits
-memory
-new
-optional
-ratio
-stdexcept
-string
-string_view
-tuple
-type_traits
-typeinfo
-unordered_map
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
deleted file mode 100644
index 9f8bf82385e9d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
+++ /dev/null
@@ -1,37 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
deleted file mode 100644
index f5089e1be5834..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
+++ /dev/null
@@ -1,37 +0,0 @@
-array
-atomic
-bit
-cctype
-cerrno
-charconv
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-limits
-locale
-mutex
-new
-optional
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
deleted file mode 100644
index 22069ebe466d5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
+++ /dev/null
@@ -1,20 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
deleted file mode 100644
index 7bfb058cd5b9a..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
+++ /dev/null
@@ -1,38 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-filesystem
-initializer_list
-iomanip
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
deleted file mode 100644
index 3079923e12766..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
+++ /dev/null
@@ -1,26 +0,0 @@
-array
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-limits
-memory
-new
-optional
-ratio
-stdexcept
-tuple
-type_traits
-typeinfo
-unordered_map
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
deleted file mode 100644
index ba6d3a44d1c56..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
+++ /dev/null
@@ -1,31 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-mutex
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-thread
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
deleted file mode 100644
index 7b45506ea14b3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
+++ /dev/null
@@ -1,2 +0,0 @@
-cstddef
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
deleted file mode 100644
index d52cd08776155..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
+++ /dev/null
@@ -1,36 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
deleted file mode 100644
index 525723ed20b2c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
+++ /dev/null
@@ -1,30 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-mutex
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
deleted file mode 100644
index 088eda41aa61d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
+++ /dev/null
@@ -1 +0,0 @@
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
deleted file mode 100644
index d52cd08776155..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
+++ /dev/null
@@ -1,36 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
deleted file mode 100644
index 242f8f4cb7d31..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
+++ /dev/null
@@ -1,35 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-limits
-locale
-mutex
-new
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
deleted file mode 100644
index dd2860cbf0bd7..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-tuple
-type_traits
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
deleted file mode 100644
index 42e3c191ac896..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
+++ /dev/null
@@ -1,11 +0,0 @@
-atomic
-climits
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
deleted file mode 100644
index 8448275a1728c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
+++ /dev/null
@@ -1,4 +0,0 @@
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
deleted file mode 100644
index 22069ebe466d5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
+++ /dev/null
@@ -1,20 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
deleted file mode 100644
index 8e310a529a144..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
+++ /dev/null
@@ -1,32 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-limits
-mutex
-new
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
deleted file mode 100644
index 573d3aa59bcfa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
+++ /dev/null
@@ -1,17 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-optional
-stdexcept
-tuple
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
deleted file mode 100644
index 22069ebe466d5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
+++ /dev/null
@@ -1,20 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
deleted file mode 100644
index 4b6b70f55a151..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
+++ /dev/null
@@ -1,29 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
deleted file mode 100644
index 31e9f436e6cd3..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
+++ /dev/null
@@ -1,5 +0,0 @@
-concepts
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
deleted file mode 100644
index 460bf6a8ee373..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
+++ /dev/null
@@ -1,7 +0,0 @@
-cmath
-concepts
-cstddef
-cstdint
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
deleted file mode 100644
index cb2bf10d17ef0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-stdexcept
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
deleted file mode 100644
index 765ceb87be081..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
+++ /dev/null
@@ -1,34 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-limits
-locale
-mutex
-new
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
deleted file mode 100644
index 1fa8ec3664bce..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
+++ /dev/null
@@ -1,22 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-type_traits
-typeinfo
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
deleted file mode 100644
index aaf59ed274635..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
+++ /dev/null
@@ -1,29 +0,0 @@
-atomic
-bit
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-new
-numeric
-ratio
-stdexcept
-string
-string_view
-type_traits
-typeinfo
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
deleted file mode 100644
index c0faf1803c6a6..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
+++ /dev/null
@@ -1,21 +0,0 @@
-array
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-iterator
-limits
-new
-optional
-span
-stdexcept
-tuple
-type_traits
-variant
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
deleted file mode 100644
index 29043403235fa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
+++ /dev/null
@@ -1,5 +0,0 @@
-climits
-cstddef
-cstdint
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
deleted file mode 100644
index 992fa7d096498..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
+++ /dev/null
@@ -1,32 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-deque
-exception
-initializer_list
-iosfwd
-limits
-mutex
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-vector
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
deleted file mode 100644
index a25e41c53dc49..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
+++ /dev/null
@@ -1,11 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-limits
-new
-tuple
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
deleted file mode 100644
index 42e3c191ac896..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
+++ /dev/null
@@ -1,11 +0,0 @@
-atomic
-climits
-cstddef
-cstdint
-cstring
-ctime
-iosfwd
-limits
-ratio
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
deleted file mode 100644
index d035ad9ed9b2d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-optional
-stdexcept
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
deleted file mode 100644
index c0575fd4fca98..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
+++ /dev/null
@@ -1,26 +0,0 @@
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
deleted file mode 100644
index 0fb1b67d13d02..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
+++ /dev/null
@@ -1,14 +0,0 @@
-array
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-exception
-initializer_list
-iosfwd
-limits
-stdexcept
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
deleted file mode 100644
index d52cd08776155..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
+++ /dev/null
@@ -1,36 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
deleted file mode 100644
index 5d834c3613cae..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
+++ /dev/null
@@ -1,21 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-deque
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
deleted file mode 100644
index e9e1b1a3af1a0..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
+++ /dev/null
@@ -1,7 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-iosfwd
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
deleted file mode 100644
index 23fe84b18cbc4..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
+++ /dev/null
@@ -1,31 +0,0 @@
-atomic
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-limits
-mutex
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
deleted file mode 100644
index 573ee5a4a7399..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
+++ /dev/null
@@ -1,21 +0,0 @@
-cctype
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-new
-stdexcept
-string_view
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
deleted file mode 100644
index e287602d83000..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
+++ /dev/null
@@ -1,18 +0,0 @@
-cctype
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-stdexcept
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
deleted file mode 100644
index d52cd08776155..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
+++ /dev/null
@@ -1,36 +0,0 @@
-atomic
-bitset
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-ios
-iosfwd
-istream
-limits
-locale
-mutex
-new
-ostream
-ratio
-stdexcept
-streambuf
-string
-string_view
-system_error
-tuple
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
deleted file mode 100644
index 5892e99104dd5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
+++ /dev/null
@@ -1,23 +0,0 @@
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-new
-stdexcept
-string
-string_view
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
deleted file mode 100644
index 8ec7c41bca454..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
+++ /dev/null
@@ -1,27 +0,0 @@
-cctype
-cerrno
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdio
-cstdlib
-cstring
-ctime
-cwchar
-cwctype
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-string
-string_view
-system_error
-tuple
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
deleted file mode 100644
index df2d92f5d4b6c..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
+++ /dev/null
@@ -1,7 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-limits
-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
deleted file mode 100644
index fa3e26219e865..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
+++ /dev/null
@@ -1,3 +0,0 @@
-cstddef
-cstdint
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
deleted file mode 100644
index 9643f796f202a..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
+++ /dev/null
@@ -1,10 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-exception
-limits
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
deleted file mode 100644
index c48f9ed9e744d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-cstddef
-cstdint
-cstdlib
-exception
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
deleted file mode 100644
index 573d3aa59bcfa..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
+++ /dev/null
@@ -1,17 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-optional
-stdexcept
-tuple
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
deleted file mode 100644
index d035ad9ed9b2d..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
+++ /dev/null
@@ -1,16 +0,0 @@
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-optional
-stdexcept
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
deleted file mode 100644
index 16f4b2e8c3213..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
+++ /dev/null
@@ -1,9 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-initializer_list
-limits
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
deleted file mode 100644
index bdf7a26634297..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
+++ /dev/null
@@ -1,14 +0,0 @@
-cmath
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-iosfwd
-limits
-new
-stdexcept
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
deleted file mode 100644
index 03c4103698fe7..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
+++ /dev/null
@@ -1,13 +0,0 @@
-cmath
-compare
-cstddef
-cstdint
-cstdlib
-cstring
-exception
-initializer_list
-limits
-new
-tuple
-type_traits
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
deleted file mode 100644
index 22069ebe466d5..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
+++ /dev/null
@@ -1,20 +0,0 @@
-atomic
-climits
-cmath
-compare
-concepts
-cstddef
-cstdint
-cstdlib
-cstring
-ctime
-exception
-initializer_list
-iosfwd
-limits
-new
-ratio
-stdexcept
-type_traits
-typeinfo
-version

diff  --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
+++ /dev/null
@@ -1 +0,0 @@
-

diff  --git a/libcxx/test/libcxx/transitive_includes_to_csv.py b/libcxx/test/libcxx/transitive_includes_to_csv.py
new file mode 100755
index 0000000000000..ce9fb79a6bb31
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes_to_csv.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+# ===----------------------------------------------------------------------===##
+#
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# ===----------------------------------------------------------------------===##
+
+from dataclasses import dataclass, field
+from typing import List  # Needed for python 3.8 compatibility.
+import argparse
+import re
+import sys
+import pathlib
+
+
+ at dataclass
+class header:
+    name: str = None
+    level: int = -1
+
+
+def parse_line(line: str) -> header:
+    match = re.match(r"(\.+) (.+)", line)
+    if not match:
+        sys.exit(f"Line {line} contains invalid data.")
+
+    # The number of periods in front of the header name is the nesting level of
+    # that header.
+    return header(match.group(2), len(match.group(1)))
+
+
+# Generates the list of transitive includes of a header.
+#
+# The input contains two kinds of headers
+# * Standard headers  (algorithm, string, format, etc)
+# * Detail headers (__algorithm/copy.h, __algorithm/copy_n.h, etc)
+# The output contains the transitive includes of the Standard header being
+# processed. The detail headers are omitted from the output, but their
+# transitive includes are parsed and added, if they are a Standard header.
+#
+# This effectively generates the dependency graph of a Standard header.
+def parse_file(file: pathlib.Path) -> List[str]:
+    result = list()
+    with file.open(encoding="utf-8") as f:
+        level = 999
+
+        # The first line contains the Standard header being processed.
+        # The transitive includes of this Standard header should be processed.
+        header = parse_line(f.readline())
+        assert header.level == 1
+        result.append(header.name)
+
+        for line in f.readlines():
+            header = parse_line(line)
+
+            # Skip deeper nested headers for Standard headers.
+            if header.level > level:
+                continue
+
+            # Process deeper nested headers for detail headers.
+            if header.name.startswith("__") or header.name.__contains__("/__"):
+                level = 999
+                continue
+
+            # Add the Standard header.
+            level = header.level
+            result.append(header.name)
+
+    return result
+
+
+def create_include_graph(path: pathlib.Path) -> List[str]:
+    result = list()
+    for file in sorted(path.glob("header.*")):
+        includes = parse_file(file)
+        if len(includes) > 1:
+            result.append(includes)
+    return result
+
+
+def print_csv(graph: List[str]) -> None:
+    for includes in graph:
+        header = includes[0]
+        for include in sorted(includes[1:]):
+            if header == include:
+                sys.exit(f"Cycle detected: header {header} includes itself.")
+            print(f"{header} {include}")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="""Produce a dependency graph of libc++ headers, in CSV format.
+Typically this script is executed by libcxx/test/libcxx/transitive_includes.sh.cpp""",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    parser.add_argument(
+        "input",
+        default=None,
+        metavar="DIR",
+        help="The directory containing the transitive includes of the headers.",
+    )
+    options = parser.parse_args()
+
+    root = pathlib.Path(options.input)
+    print_csv(create_include_graph(root))