diff --git a/libcxx/test/libcxx/transitive_includes.sanitize.py b/libcxx/test/libcxx/transitive_includes.sanitize.py
--- a/libcxx/test/libcxx/transitive_includes.sanitize.py
+++ b/libcxx/test/libcxx/transitive_includes.sanitize.py
@@ -11,28 +11,66 @@
 # Specifically, it looks for lines of the form 'c++/v1/header' where 'header' is the name
 # of a public C++ header, excluding C compatibility headers.
 
+# The input looks like
+#. ${build_dir}/include/c++/v1/algorithm
+#.. ${build_dir}/include/c++/v1/__assert
+#... ${build_dir}/include/c++/v1/__config
+#.... ${build_dir}/include/c++/v1/__config_site
+#.... /usr/include/features.h
+#..... /usr/include/stdc-predef.h
+#..... /usr/include/x86_64-linux-gnu/sys/cdefs.h
+#...... /usr/include/x86_64-linux-gnu/bits/wordsize.h
+# <snip>
+#.... ${build_dir}/include/c++/v1/version
+#.... ${build_dir}/include/c++/v1/stddef.h
+#..... /usr/lib/llvm-15/lib/clang/15.0.0/include/stddef.h
+#...... /usr/lib/llvm-15/lib/clang/15.0.0/include/__stddef_max_align_t.h
+#... ${build_dir}/include/c++/v1/type_traits
+# <more>
+
+# The first line matched libc++ header contains the name of the header being
+# evaluated. The might be other headers before, for example ASAN adds
+# additional headers. The filtered output will be like:
+# version
+# type_traits
+
 import os
 import re
 import sys
 
+# Determine the top-level header in the input.
+top_level_header = None
+while True:
+    line = sys.stdin.readline()
+    # On Windows, the path separators can either be forward slash or backslash.
+    # If it is a backslash, Clang prints it escaped as two consecutive
+    # backslashes, and they need to be escaped in the RE. (Use a raw string for
+    # the pattern to avoid needing another level of escaping on the Python string
+    # literal level.)
+    match = re.match(
+        r". .*(?:/|\\\\)include(?:/|\\\\)c\+\+(?:/|\\\\)v[0-9]+(?:/|\\\\)(.+)", line
+    )
+    if match:
+        top_level_header = match.group(1)
+        break
+
+# Filter out non Standard transitive includes.
 headers = []
 for line in sys.stdin.readlines():
-  # On Windows, the path separators can either be forward slash or backslash.
-  # If it is a backslash, Clang prints it escaped as two consecutive
-  # backslashes, and they need to be escaped in the RE. (Use a raw string for
-  # the pattern to avoid needing another level of escaping on the Python string
-  # literal level.)
-  match = re.search(r'c\+\+(/|\\\\)v[0-9]+(/|\\\\)(.+)', line)
-  if not match:
-    continue
+    match = re.search(r"c\+\+(?:/|\\\\)v[0-9]+(?:/|\\\\)(.+)", line)
+    if not match:
+        continue
+
+    header = match.group(1)
+    if os.path.basename(header).endswith(".h"):  # Skip C headers
+        continue
 
-  header = match.group(3)
-  if os.path.basename(header).endswith('.h'): # Skip C headers
-    continue
+    if os.path.basename(header).startswith("__"):  # Skip internal headers
+        continue
 
-  if os.path.basename(header).startswith('__'): # Skip internal headers
-    continue
+    if header == top_level_header:
+        sys.exit(f"Cyclic dependency in header {header}")
 
-  headers.append(header)
+    headers.append(header)
 
-print('\n'.join(sorted(set(headers))))
+print("\n".join(sorted(set(headers))))
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
 atomic
 bit
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.any b/libcxx/test/libcxx/transitive_includes/cxx03/expected.any
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.any
@@ -1,4 +1,3 @@
-any
 atomic
 chrono
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.array b/libcxx/test/libcxx/transitive_includes/cxx03/expected.array
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.array
@@ -1,5 +1,4 @@
 algorithm
-array
 atomic
 bit
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.atomic
@@ -1,4 +1,3 @@
-atomic
 chrono
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.barrier
@@ -1,5 +1,4 @@
 atomic
-barrier
 chrono
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bit
@@ -1,4 +1,3 @@
-bit
 cstddef
 cstdint
 cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.bitset
@@ -2,7 +2,6 @@
 array
 atomic
 bit
-bitset
 cctype
 chrono
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ccomplex
@@ -3,7 +3,6 @@
 atomic
 bit
 bitset
-ccomplex
 cctype
 cerrno
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.charconv
@@ -1,5 +1,4 @@
 cerrno
-charconv
 cmath
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.chrono
@@ -1,4 +1,3 @@
-chrono
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
 cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cmath
@@ -1,4 +1,3 @@
-cmath
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.codecvt
@@ -7,7 +7,6 @@
 chrono
 climits
 cmath
-codecvt
 compare
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.compare
@@ -1,5 +1,4 @@
 cmath
-compare
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.complex
@@ -9,7 +9,6 @@
 climits
 cmath
 compare
-complex
 concepts
 cstdarg
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.concepts
@@ -1,4 +1,3 @@
-concepts
 cstddef
 cstdint
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.condition_variable
@@ -9,7 +9,6 @@
 cmath
 compare
 concepts
-condition_variable
 cstddef
 cstdint
 cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.coroutine
@@ -1,6 +1,5 @@
 cmath
 compare
-coroutine
 cstddef
 cstdint
 cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstddef
@@ -1,2 +1 @@
-cstddef
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctgmath
@@ -18,7 +18,6 @@
 cstdio
 cstdlib
 cstring
-ctgmath
 ctime
 cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwchar
@@ -1,3 +1,2 @@
 cctype
-cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.cwctype
@@ -1,2 +1 @@
 cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.deque
@@ -12,7 +12,6 @@
 cstdlib
 cstring
 ctime
-deque
 exception
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.exception
@@ -1,6 +1,5 @@
 cstddef
 cstdint
 cstdlib
-exception
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.execution
@@ -1,2 +1 @@
-execution
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_algorithm
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/algorithm
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_coroutine
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/coroutine
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_deque
@@ -14,7 +14,6 @@
 ctime
 deque
 exception
-experimental/deque
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_forward_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/forward_list
 experimental/memory_resource
 experimental/utility
 forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_functional
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/functional
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_iterator
@@ -6,7 +6,6 @@
 cstdlib
 cstring
 exception
-experimental/iterator
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/list
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_map
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/map
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_memory_resource
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/memory_resource
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-experimental/propagate_const
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_regex
@@ -20,7 +20,6 @@
 deque
 exception
 experimental/memory_resource
-experimental/regex
 experimental/string
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_set
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_simd
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/simd
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_string
@@ -18,7 +18,6 @@
 cwctype
 exception
 experimental/memory_resource
-experimental/string
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_type_traits
@@ -1 +1 @@
-experimental/type_traits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_map
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_map
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_unordered_set
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_utility
@@ -3,7 +3,6 @@
 cstddef
 cstdint
 cstdlib
-experimental/utility
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.experimental_vector
@@ -14,7 +14,6 @@
 exception
 experimental/memory_resource
 experimental/utility
-experimental/vector
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_map
@@ -17,7 +17,6 @@
 cwchar
 cwctype
 exception
-ext/hash_map
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ext_hash_set
@@ -17,7 +17,6 @@
 cwchar
 cwctype
 exception
-ext/hash_set
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.filesystem
@@ -20,7 +20,6 @@
 cwchar
 cwctype
 exception
-filesystem
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.format b/libcxx/test/libcxx/transitive_includes/cxx03/expected.format
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.format
@@ -20,7 +20,6 @@
 cwchar
 cwctype
 exception
-format
 functional
 initializer_list
 ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.forward_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-forward_list
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.fstream
@@ -21,7 +21,6 @@
 cwctype
 exception
 filesystem
-fstream
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.functional
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-functional
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.future b/libcxx/test/libcxx/transitive_includes/cxx03/expected.future
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.future
@@ -19,7 +19,6 @@
 cwctype
 exception
 functional
-future
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.initializer_list
@@ -1,3 +1,2 @@
 cstddef
-initializer_list
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iomanip
@@ -22,7 +22,6 @@
 exception
 functional
 initializer_list
-iomanip
 ios
 iosfwd
 istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ios
@@ -20,7 +20,6 @@
 exception
 functional
 initializer_list
-ios
 iosfwd
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iostream
@@ -24,7 +24,6 @@
 initializer_list
 ios
 iosfwd
-iostream
 istream
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.istream
@@ -24,7 +24,6 @@
 initializer_list
 ios
 iosfwd
-istream
 iterator
 limits
 locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.iterator
@@ -8,7 +8,6 @@
 exception
 initializer_list
 iosfwd
-iterator
 limits
 new
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.latch
@@ -8,7 +8,6 @@
 cstring
 ctime
 iosfwd
-latch
 limits
 ratio
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.limits
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-limits
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.list b/libcxx/test/libcxx/transitive_includes/cxx03/expected.list
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.list
@@ -18,7 +18,6 @@
 iosfwd
 iterator
 limits
-list
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.locale
@@ -25,7 +25,6 @@
 iosfwd
 iterator
 limits
-locale
 memory
 mutex
 new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.map
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.map
@@ -18,7 +18,6 @@
 iosfwd
 iterator
 limits
-map
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.memory
@@ -14,7 +14,6 @@
 iosfwd
 iterator
 limits
-memory
 new
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.mutex
@@ -24,7 +24,6 @@
 iterator
 limits
 memory
-mutex
 new
 optional
 ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.new b/libcxx/test/libcxx/transitive_includes/cxx03/expected.new
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.new
@@ -2,6 +2,5 @@
 cstdint
 cstdlib
 exception
-new
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numbers
@@ -1,6 +1,5 @@
 concepts
 cstddef
 cstdint
-numbers
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.numeric
@@ -20,7 +20,6 @@
 limits
 memory
 new
-numeric
 optional
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.optional
@@ -16,7 +16,6 @@
 limits
 memory
 new
-optional
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ostream
@@ -31,7 +31,6 @@
 mutex
 new
 optional
-ostream
 ratio
 stdexcept
 streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.queue
@@ -22,7 +22,6 @@
 memory
 new
 optional
-queue
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.random b/libcxx/test/libcxx/transitive_includes/cxx03/expected.random
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.random
@@ -26,7 +26,6 @@
 new
 numeric
 optional
-random
 ratio
 stdexcept
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ranges
@@ -21,7 +21,6 @@
 memory
 new
 optional
-ranges
 ratio
 span
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.ratio
@@ -1,6 +1,5 @@
 climits
 cstddef
 cstdint
-ratio
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.regex
@@ -29,7 +29,6 @@
 new
 optional
 ratio
-regex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.scoped_allocator
@@ -17,7 +17,6 @@
 memory
 new
 ratio
-scoped_allocator
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.semaphore
@@ -10,6 +10,5 @@
 iosfwd
 limits
 ratio
-semaphore
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.set
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.set
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-set
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.shared_mutex
@@ -1,2 +1 @@
-shared_mutex
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.span b/libcxx/test/libcxx/transitive_includes/cxx03/expected.span
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.span
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-span
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.sstream
@@ -34,7 +34,6 @@
 optional
 ostream
 ratio
-sstream
 stdexcept
 streambuf
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stack
@@ -23,7 +23,6 @@
 new
 optional
 ratio
-stack
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.stdexcept
@@ -3,6 +3,5 @@
 cstdlib
 exception
 iosfwd
-stdexcept
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.streambuf
@@ -30,7 +30,6 @@
 optional
 ratio
 stdexcept
-streambuf
 string
 string_view
 system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string
@@ -27,7 +27,6 @@
 optional
 ratio
 stdexcept
-string
 string_view
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.string_view
@@ -27,7 +27,6 @@
 optional
 ratio
 stdexcept
-string_view
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.strstream
@@ -38,7 +38,6 @@
 streambuf
 string
 string_view
-strstream
 system_error
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.system_error
@@ -30,7 +30,6 @@
 stdexcept
 string
 string_view
-system_error
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.thread
@@ -31,7 +31,6 @@
 string
 string_view
 system_error
-thread
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.tuple
@@ -8,7 +8,6 @@
 iosfwd
 limits
 new
-tuple
 type_traits
 typeinfo
 utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.type_traits
@@ -1,4 +1,3 @@
 cstddef
 cstdint
-type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeindex
@@ -9,7 +9,6 @@
 limits
 new
 type_traits
-typeindex
 typeinfo
 utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.typeinfo
@@ -3,5 +3,4 @@
 cstdlib
 exception
 type_traits
-typeinfo
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_map
@@ -24,7 +24,6 @@
 tuple
 type_traits
 typeinfo
-unordered_map
 utility
 variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.unordered_set
@@ -27,7 +27,6 @@
 type_traits
 typeinfo
 unordered_map
-unordered_set
 utility
 variant
 vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.utility
@@ -7,5 +7,4 @@
 iosfwd
 limits
 type_traits
-utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.valarray
@@ -28,7 +28,6 @@
 typeinfo
 unordered_map
 utility
-valarray
 variant
 vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.variant
@@ -13,5 +13,4 @@
 type_traits
 typeinfo
 utility
-variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.vector
@@ -25,5 +25,4 @@
 typeinfo
 utility
 variant
-vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03/expected.version b/libcxx/test/libcxx/transitive_includes/cxx03/expected.version
--- a/libcxx/test/libcxx/transitive_includes/cxx03/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx03/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
 atomic
 bit
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.any b/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
@@ -1,4 +1,3 @@
-any
 atomic
 chrono
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.array b/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
@@ -1,5 +1,4 @@
 algorithm
-array
 atomic
 bit
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
@@ -1,4 +1,3 @@
-atomic
 chrono
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
@@ -1,5 +1,4 @@
 atomic
-barrier
 chrono
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
@@ -1,4 +1,3 @@
-bit
 cstddef
 cstdint
 cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
@@ -2,7 +2,6 @@
 array
 atomic
 bit
-bitset
 cctype
 chrono
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
@@ -3,7 +3,6 @@
 atomic
 bit
 bitset
-ccomplex
 cctype
 cerrno
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
@@ -1,5 +1,4 @@
 cerrno
-charconv
 cmath
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
@@ -1,4 +1,3 @@
-chrono
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
 cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
@@ -1,4 +1,3 @@
-cmath
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
@@ -7,7 +7,6 @@
 chrono
 climits
 cmath
-codecvt
 compare
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
@@ -1,5 +1,4 @@
 cmath
-compare
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
@@ -9,7 +9,6 @@
 climits
 cmath
 compare
-complex
 concepts
 cstdarg
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
@@ -1,4 +1,3 @@
-concepts
 cstddef
 cstdint
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
@@ -9,7 +9,6 @@
 cmath
 compare
 concepts
-condition_variable
 cstddef
 cstdint
 cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
@@ -1,6 +1,5 @@
 cmath
 compare
-coroutine
 cstddef
 cstdint
 cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
@@ -1,2 +1 @@
-cstddef
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
@@ -18,7 +18,6 @@
 cstdio
 cstdlib
 cstring
-ctgmath
 ctime
 cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
@@ -1,3 +1,2 @@
 cctype
-cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
@@ -1,2 +1 @@
 cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
@@ -12,7 +12,6 @@
 cstdlib
 cstring
 ctime
-deque
 exception
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
@@ -1,6 +1,5 @@
 cstddef
 cstdint
 cstdlib
-exception
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
@@ -1,2 +1 @@
-execution
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/algorithm
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/coroutine
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
@@ -14,7 +14,6 @@
 ctime
 deque
 exception
-experimental/deque
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/forward_list
 experimental/memory_resource
 experimental/utility
 forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/functional
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
@@ -6,7 +6,6 @@
 cstdlib
 cstring
 exception
-experimental/iterator
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/list
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/map
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/memory_resource
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-experimental/propagate_const
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
@@ -20,7 +20,6 @@
 deque
 exception
 experimental/memory_resource
-experimental/regex
 experimental/string
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/simd
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
@@ -18,7 +18,6 @@
 cwctype
 exception
 experimental/memory_resource
-experimental/string
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
@@ -1 +1 @@
-experimental/type_traits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_map
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
@@ -3,7 +3,6 @@
 cstddef
 cstdint
 cstdlib
-experimental/utility
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
@@ -14,7 +14,6 @@
 exception
 experimental/memory_resource
 experimental/utility
-experimental/vector
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
@@ -17,7 +17,6 @@
 cwchar
 cwctype
 exception
-ext/hash_map
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
@@ -17,7 +17,6 @@
 cwchar
 cwctype
 exception
-ext/hash_set
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
@@ -20,7 +20,6 @@
 cwchar
 cwctype
 exception
-filesystem
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.format b/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
@@ -20,7 +20,6 @@
 cwchar
 cwctype
 exception
-format
 functional
 initializer_list
 ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-forward_list
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
@@ -21,7 +21,6 @@
 cwctype
 exception
 filesystem
-fstream
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-functional
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.future b/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
@@ -19,7 +19,6 @@
 cwctype
 exception
 functional
-future
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
@@ -1,3 +1,2 @@
 cstddef
-initializer_list
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
@@ -22,7 +22,6 @@
 exception
 functional
 initializer_list
-iomanip
 ios
 iosfwd
 istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
@@ -20,7 +20,6 @@
 exception
 functional
 initializer_list
-ios
 iosfwd
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
@@ -24,7 +24,6 @@
 initializer_list
 ios
 iosfwd
-iostream
 istream
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
@@ -24,7 +24,6 @@
 initializer_list
 ios
 iosfwd
-istream
 iterator
 limits
 locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
@@ -8,7 +8,6 @@
 exception
 initializer_list
 iosfwd
-iterator
 limits
 new
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
@@ -8,7 +8,6 @@
 cstring
 ctime
 iosfwd
-latch
 limits
 ratio
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-limits
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
@@ -18,7 +18,6 @@
 iosfwd
 iterator
 limits
-list
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
@@ -25,7 +25,6 @@
 iosfwd
 iterator
 limits
-locale
 memory
 mutex
 new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
@@ -18,7 +18,6 @@
 iosfwd
 iterator
 limits
-map
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
@@ -14,7 +14,6 @@
 iosfwd
 iterator
 limits
-memory
 new
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
@@ -24,7 +24,6 @@
 iterator
 limits
 memory
-mutex
 new
 optional
 ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.new b/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
@@ -2,6 +2,5 @@
 cstdint
 cstdlib
 exception
-new
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
@@ -1,6 +1,5 @@
 concepts
 cstddef
 cstdint
-numbers
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
@@ -20,7 +20,6 @@
 limits
 memory
 new
-numeric
 optional
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
@@ -16,7 +16,6 @@
 limits
 memory
 new
-optional
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
@@ -31,7 +31,6 @@
 mutex
 new
 optional
-ostream
 ratio
 stdexcept
 streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
@@ -22,7 +22,6 @@
 memory
 new
 optional
-queue
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.random b/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
@@ -26,7 +26,6 @@
 new
 numeric
 optional
-random
 ratio
 stdexcept
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
@@ -21,7 +21,6 @@
 memory
 new
 optional
-ranges
 ratio
 span
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
@@ -1,6 +1,5 @@
 climits
 cstddef
 cstdint
-ratio
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
@@ -29,7 +29,6 @@
 new
 optional
 ratio
-regex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
@@ -17,7 +17,6 @@
 memory
 new
 ratio
-scoped_allocator
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
@@ -10,6 +10,5 @@
 iosfwd
 limits
 ratio
-semaphore
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-set
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
@@ -1,2 +1 @@
-shared_mutex
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.span b/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-span
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
@@ -34,7 +34,6 @@
 optional
 ostream
 ratio
-sstream
 stdexcept
 streambuf
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
@@ -23,7 +23,6 @@
 new
 optional
 ratio
-stack
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
@@ -3,6 +3,5 @@
 cstdlib
 exception
 iosfwd
-stdexcept
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
@@ -30,7 +30,6 @@
 optional
 ratio
 stdexcept
-streambuf
 string
 string_view
 system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
@@ -27,7 +27,6 @@
 optional
 ratio
 stdexcept
-string
 string_view
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
@@ -27,7 +27,6 @@
 optional
 ratio
 stdexcept
-string_view
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
@@ -38,7 +38,6 @@
 streambuf
 string
 string_view
-strstream
 system_error
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
@@ -30,7 +30,6 @@
 stdexcept
 string
 string_view
-system_error
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
@@ -31,7 +31,6 @@
 string
 string_view
 system_error
-thread
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
@@ -8,7 +8,6 @@
 iosfwd
 limits
 new
-tuple
 type_traits
 typeinfo
 utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
@@ -1,4 +1,3 @@
 cstddef
 cstdint
-type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
@@ -9,7 +9,6 @@
 limits
 new
 type_traits
-typeindex
 typeinfo
 utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
@@ -3,5 +3,4 @@
 cstdlib
 exception
 type_traits
-typeinfo
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
@@ -24,7 +24,6 @@
 tuple
 type_traits
 typeinfo
-unordered_map
 utility
 variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
@@ -27,7 +27,6 @@
 type_traits
 typeinfo
 unordered_map
-unordered_set
 utility
 variant
 vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
@@ -7,5 +7,4 @@
 iosfwd
 limits
 type_traits
-utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
@@ -28,7 +28,6 @@
 typeinfo
 unordered_map
 utility
-valarray
 variant
 vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
@@ -13,5 +13,4 @@
 type_traits
 typeinfo
 utility
-variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
@@ -25,5 +25,4 @@
 typeinfo
 utility
 variant
-vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.version b/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
--- a/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
 atomic
 bit
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.any b/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
@@ -1,4 +1,3 @@
-any
 atomic
 chrono
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.array b/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
@@ -1,5 +1,4 @@
 algorithm
-array
 atomic
 bit
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
@@ -1,4 +1,3 @@
-atomic
 chrono
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
@@ -1,5 +1,4 @@
 atomic
-barrier
 chrono
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
@@ -1,4 +1,3 @@
-bit
 cstddef
 cstdint
 cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
@@ -2,7 +2,6 @@
 array
 atomic
 bit
-bitset
 cctype
 chrono
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
@@ -3,7 +3,6 @@
 atomic
 bit
 bitset
-ccomplex
 cctype
 cerrno
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
@@ -1,5 +1,4 @@
 cerrno
-charconv
 cmath
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
@@ -1,4 +1,3 @@
-chrono
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
 cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
@@ -1,4 +1,3 @@
-cmath
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
@@ -7,7 +7,6 @@
 chrono
 climits
 cmath
-codecvt
 compare
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
@@ -1,5 +1,4 @@
 cmath
-compare
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
@@ -9,7 +9,6 @@
 climits
 cmath
 compare
-complex
 concepts
 cstdarg
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
@@ -1,4 +1,3 @@
-concepts
 cstddef
 cstdint
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
@@ -9,7 +9,6 @@
 cmath
 compare
 concepts
-condition_variable
 cstddef
 cstdint
 cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
@@ -1,6 +1,5 @@
 cmath
 compare
-coroutine
 cstddef
 cstdint
 cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
@@ -1,2 +1 @@
-cstddef
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
@@ -18,7 +18,6 @@
 cstdio
 cstdlib
 cstring
-ctgmath
 ctime
 cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
@@ -1,3 +1,2 @@
 cctype
-cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
@@ -1,2 +1 @@
 cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
@@ -12,7 +12,6 @@
 cstdlib
 cstring
 ctime
-deque
 exception
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
@@ -1,6 +1,5 @@
 cstddef
 cstdint
 cstdlib
-exception
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
@@ -1,2 +1 @@
-execution
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/algorithm
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/coroutine
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
@@ -14,7 +14,6 @@
 ctime
 deque
 exception
-experimental/deque
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/forward_list
 experimental/memory_resource
 experimental/utility
 forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/functional
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
@@ -6,7 +6,6 @@
 cstdlib
 cstring
 exception
-experimental/iterator
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/list
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/map
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/memory_resource
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-experimental/propagate_const
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
@@ -20,7 +20,6 @@
 deque
 exception
 experimental/memory_resource
-experimental/regex
 experimental/string
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/simd
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
@@ -18,7 +18,6 @@
 cwctype
 exception
 experimental/memory_resource
-experimental/string
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
@@ -1,6 +1,5 @@
 cstddef
 cstdint
-experimental/type_traits
 initializer_list
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_map
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
@@ -3,7 +3,6 @@
 cstddef
 cstdint
 cstdlib
-experimental/utility
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
@@ -14,7 +14,6 @@
 exception
 experimental/memory_resource
 experimental/utility
-experimental/vector
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
@@ -17,7 +17,6 @@
 cwchar
 cwctype
 exception
-ext/hash_map
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
@@ -17,7 +17,6 @@
 cwchar
 cwctype
 exception
-ext/hash_set
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
@@ -20,7 +20,6 @@
 cwchar
 cwctype
 exception
-filesystem
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.format b/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
@@ -20,7 +20,6 @@
 cwchar
 cwctype
 exception
-format
 functional
 initializer_list
 ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-forward_list
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
@@ -21,7 +21,6 @@
 cwctype
 exception
 filesystem
-fstream
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-functional
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.future b/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
@@ -19,7 +19,6 @@
 cwctype
 exception
 functional
-future
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
@@ -1,3 +1,2 @@
 cstddef
-initializer_list
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
@@ -22,7 +22,6 @@
 exception
 functional
 initializer_list
-iomanip
 ios
 iosfwd
 istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
@@ -20,7 +20,6 @@
 exception
 functional
 initializer_list
-ios
 iosfwd
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
@@ -24,7 +24,6 @@
 initializer_list
 ios
 iosfwd
-iostream
 istream
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
@@ -24,7 +24,6 @@
 initializer_list
 ios
 iosfwd
-istream
 iterator
 limits
 locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
@@ -8,7 +8,6 @@
 exception
 initializer_list
 iosfwd
-iterator
 limits
 new
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
@@ -8,7 +8,6 @@
 cstring
 ctime
 iosfwd
-latch
 limits
 ratio
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-limits
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
@@ -18,7 +18,6 @@
 iosfwd
 iterator
 limits
-list
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
@@ -25,7 +25,6 @@
 iosfwd
 iterator
 limits
-locale
 memory
 mutex
 new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
@@ -18,7 +18,6 @@
 iosfwd
 iterator
 limits
-map
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
@@ -14,7 +14,6 @@
 iosfwd
 iterator
 limits
-memory
 new
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
@@ -24,7 +24,6 @@
 iterator
 limits
 memory
-mutex
 new
 optional
 ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.new b/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
@@ -2,6 +2,5 @@
 cstdint
 cstdlib
 exception
-new
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
@@ -1,6 +1,5 @@
 concepts
 cstddef
 cstdint
-numbers
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
@@ -20,7 +20,6 @@
 limits
 memory
 new
-numeric
 optional
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
@@ -16,7 +16,6 @@
 limits
 memory
 new
-optional
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
@@ -31,7 +31,6 @@
 mutex
 new
 optional
-ostream
 ratio
 stdexcept
 streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
@@ -22,7 +22,6 @@
 memory
 new
 optional
-queue
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.random b/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
@@ -26,7 +26,6 @@
 new
 numeric
 optional
-random
 ratio
 stdexcept
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
@@ -21,7 +21,6 @@
 memory
 new
 optional
-ranges
 ratio
 span
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
@@ -1,6 +1,5 @@
 climits
 cstddef
 cstdint
-ratio
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
@@ -29,7 +29,6 @@
 new
 optional
 ratio
-regex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
@@ -17,7 +17,6 @@
 memory
 new
 ratio
-scoped_allocator
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
@@ -10,6 +10,5 @@
 iosfwd
 limits
 ratio
-semaphore
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-set
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
@@ -27,7 +27,6 @@
 new
 optional
 ratio
-shared_mutex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.span b/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-span
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
@@ -34,7 +34,6 @@
 optional
 ostream
 ratio
-sstream
 stdexcept
 streambuf
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
@@ -23,7 +23,6 @@
 new
 optional
 ratio
-stack
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
@@ -3,6 +3,5 @@
 cstdlib
 exception
 iosfwd
-stdexcept
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
@@ -30,7 +30,6 @@
 optional
 ratio
 stdexcept
-streambuf
 string
 string_view
 system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
@@ -27,7 +27,6 @@
 optional
 ratio
 stdexcept
-string
 string_view
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
@@ -27,7 +27,6 @@
 optional
 ratio
 stdexcept
-string_view
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
@@ -38,7 +38,6 @@
 streambuf
 string
 string_view
-strstream
 system_error
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
@@ -30,7 +30,6 @@
 stdexcept
 string
 string_view
-system_error
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
@@ -31,7 +31,6 @@
 string
 string_view
 system_error
-thread
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
@@ -8,7 +8,6 @@
 iosfwd
 limits
 new
-tuple
 type_traits
 typeinfo
 utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
@@ -1,4 +1,3 @@
 cstddef
 cstdint
-type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
@@ -9,7 +9,6 @@
 limits
 new
 type_traits
-typeindex
 typeinfo
 utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
@@ -3,5 +3,4 @@
 cstdlib
 exception
 type_traits
-typeinfo
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
@@ -24,7 +24,6 @@
 tuple
 type_traits
 typeinfo
-unordered_map
 utility
 variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
@@ -27,7 +27,6 @@
 type_traits
 typeinfo
 unordered_map
-unordered_set
 utility
 variant
 vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
@@ -7,5 +7,4 @@
 iosfwd
 limits
 type_traits
-utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
@@ -28,7 +28,6 @@
 typeinfo
 unordered_map
 utility
-valarray
 variant
 vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
@@ -13,5 +13,4 @@
 type_traits
 typeinfo
 utility
-variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
@@ -25,5 +25,4 @@
 typeinfo
 utility
 variant
-vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14/expected.version b/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
--- a/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
 atomic
 bit
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.any b/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
@@ -1,4 +1,3 @@
-any
 atomic
 chrono
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.array b/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
@@ -1,5 +1,4 @@
 algorithm
-array
 atomic
 bit
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
@@ -1,4 +1,3 @@
-atomic
 chrono
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
@@ -1,5 +1,4 @@
 atomic
-barrier
 chrono
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
@@ -1,4 +1,3 @@
-bit
 cstddef
 cstdint
 cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
@@ -2,7 +2,6 @@
 array
 atomic
 bit
-bitset
 cctype
 chrono
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
@@ -3,7 +3,6 @@
 atomic
 bit
 bitset
-ccomplex
 cctype
 cerrno
 chrono
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
@@ -1,5 +1,4 @@
 cerrno
-charconv
 cmath
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
@@ -1,4 +1,3 @@
-chrono
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
 cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
@@ -1,4 +1,3 @@
-cmath
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
@@ -7,7 +7,6 @@
 chrono
 climits
 cmath
-codecvt
 compare
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
@@ -1,5 +1,4 @@
 cmath
-compare
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
@@ -9,7 +9,6 @@
 climits
 cmath
 compare
-complex
 concepts
 cstdarg
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
@@ -1,4 +1,3 @@
-concepts
 cstddef
 cstdint
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
@@ -9,7 +9,6 @@
 cmath
 compare
 concepts
-condition_variable
 cstddef
 cstdint
 cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
@@ -1,6 +1,5 @@
 cmath
 compare
-coroutine
 cstddef
 cstdint
 cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
@@ -1,2 +1 @@
-cstddef
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
@@ -18,7 +18,6 @@
 cstdio
 cstdlib
 cstring
-ctgmath
 ctime
 cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
@@ -1,3 +1,2 @@
 cctype
-cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
@@ -1,2 +1 @@
 cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
@@ -12,7 +12,6 @@
 cstdlib
 cstring
 ctime
-deque
 exception
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
@@ -1,6 +1,5 @@
 cstddef
 cstdint
 cstdlib
-exception
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
@@ -1,2 +1 @@
-execution
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/algorithm
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/coroutine
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
@@ -14,7 +14,6 @@
 ctime
 deque
 exception
-experimental/deque
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/forward_list
 experimental/memory_resource
 experimental/utility
 forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/functional
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
@@ -6,7 +6,6 @@
 cstdlib
 cstring
 exception
-experimental/iterator
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/list
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/map
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/memory_resource
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-experimental/propagate_const
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
@@ -20,7 +20,6 @@
 deque
 exception
 experimental/memory_resource
-experimental/regex
 experimental/string
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-experimental/simd
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
@@ -18,7 +18,6 @@
 cwctype
 exception
 experimental/memory_resource
-experimental/string
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
@@ -1,6 +1,5 @@
 cstddef
 cstdint
-experimental/type_traits
 initializer_list
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_map
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
@@ -14,7 +14,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
@@ -3,7 +3,6 @@
 cstddef
 cstdint
 cstdlib
-experimental/utility
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
@@ -14,7 +14,6 @@
 exception
 experimental/memory_resource
 experimental/utility
-experimental/vector
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
@@ -17,7 +17,6 @@
 cwchar
 cwctype
 exception
-ext/hash_map
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
@@ -17,7 +17,6 @@
 cwchar
 cwctype
 exception
-ext/hash_set
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
@@ -20,7 +20,6 @@
 cwchar
 cwctype
 exception
-filesystem
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.format b/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
@@ -20,7 +20,6 @@
 cwchar
 cwctype
 exception
-format
 functional
 initializer_list
 ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-forward_list
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
@@ -21,7 +21,6 @@
 cwctype
 exception
 filesystem
-fstream
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
@@ -13,7 +13,6 @@
 cstring
 ctime
 exception
-functional
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.future b/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
@@ -19,7 +19,6 @@
 cwctype
 exception
 functional
-future
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
@@ -1,3 +1,2 @@
 cstddef
-initializer_list
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
@@ -22,7 +22,6 @@
 exception
 functional
 initializer_list
-iomanip
 ios
 iosfwd
 istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
@@ -20,7 +20,6 @@
 exception
 functional
 initializer_list
-ios
 iosfwd
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
@@ -24,7 +24,6 @@
 initializer_list
 ios
 iosfwd
-iostream
 istream
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
@@ -24,7 +24,6 @@
 initializer_list
 ios
 iosfwd
-istream
 iterator
 limits
 locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
@@ -8,7 +8,6 @@
 exception
 initializer_list
 iosfwd
-iterator
 limits
 new
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
@@ -8,7 +8,6 @@
 cstring
 ctime
 iosfwd
-latch
 limits
 ratio
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-limits
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
@@ -18,7 +18,6 @@
 iosfwd
 iterator
 limits
-list
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
@@ -25,7 +25,6 @@
 iosfwd
 iterator
 limits
-locale
 memory
 mutex
 new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
@@ -18,7 +18,6 @@
 iosfwd
 iterator
 limits
-map
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
@@ -14,7 +14,6 @@
 iosfwd
 iterator
 limits
-memory
 new
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
@@ -24,7 +24,6 @@
 iterator
 limits
 memory
-mutex
 new
 optional
 ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.new b/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
@@ -2,6 +2,5 @@
 cstdint
 cstdlib
 exception
-new
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
@@ -1,6 +1,5 @@
 concepts
 cstddef
 cstdint
-numbers
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
@@ -20,7 +20,6 @@
 limits
 memory
 new
-numeric
 optional
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
@@ -16,7 +16,6 @@
 limits
 memory
 new
-optional
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
@@ -31,7 +31,6 @@
 mutex
 new
 optional
-ostream
 ratio
 stdexcept
 streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
@@ -22,7 +22,6 @@
 memory
 new
 optional
-queue
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.random b/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
@@ -26,7 +26,6 @@
 new
 numeric
 optional
-random
 ratio
 stdexcept
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
@@ -21,7 +21,6 @@
 memory
 new
 optional
-ranges
 ratio
 span
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
@@ -1,6 +1,5 @@
 climits
 cstddef
 cstdint
-ratio
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
@@ -29,7 +29,6 @@
 new
 optional
 ratio
-regex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
@@ -17,7 +17,6 @@
 memory
 new
 ratio
-scoped_allocator
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
@@ -10,6 +10,5 @@
 iosfwd
 limits
 ratio
-semaphore
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-set
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
@@ -27,7 +27,6 @@
 new
 optional
 ratio
-shared_mutex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.span b/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-span
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
@@ -34,7 +34,6 @@
 optional
 ostream
 ratio
-sstream
 stdexcept
 streambuf
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
@@ -23,7 +23,6 @@
 new
 optional
 ratio
-stack
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
@@ -3,6 +3,5 @@
 cstdlib
 exception
 iosfwd
-stdexcept
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
@@ -30,7 +30,6 @@
 optional
 ratio
 stdexcept
-streambuf
 string
 string_view
 system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
@@ -27,7 +27,6 @@
 optional
 ratio
 stdexcept
-string
 string_view
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
@@ -27,7 +27,6 @@
 optional
 ratio
 stdexcept
-string_view
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
@@ -38,7 +38,6 @@
 streambuf
 string
 string_view
-strstream
 system_error
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
@@ -30,7 +30,6 @@
 stdexcept
 string
 string_view
-system_error
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
@@ -31,7 +31,6 @@
 string
 string_view
 system_error
-thread
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
@@ -8,7 +8,6 @@
 iosfwd
 limits
 new
-tuple
 type_traits
 typeinfo
 utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
@@ -1,4 +1,3 @@
 cstddef
 cstdint
-type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
@@ -9,7 +9,6 @@
 limits
 new
 type_traits
-typeindex
 typeinfo
 utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
@@ -3,5 +3,4 @@
 cstdlib
 exception
 type_traits
-typeinfo
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
@@ -24,7 +24,6 @@
 tuple
 type_traits
 typeinfo
-unordered_map
 utility
 variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
@@ -27,7 +27,6 @@
 type_traits
 typeinfo
 unordered_map
-unordered_set
 utility
 variant
 vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
@@ -7,5 +7,4 @@
 iosfwd
 limits
 type_traits
-utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
@@ -28,7 +28,6 @@
 typeinfo
 unordered_map
 utility
-valarray
 variant
 vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
@@ -13,5 +13,4 @@
 type_traits
 typeinfo
 utility
-variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
@@ -25,5 +25,4 @@
 typeinfo
 utility
 variant
-vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17/expected.version b/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
--- a/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
 atomic
 bit
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.any b/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
@@ -1,4 +1,3 @@
-any
 atomic
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.array b/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
@@ -1,5 +1,4 @@
 algorithm
-array
 atomic
 bit
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
@@ -1,4 +1,3 @@
-atomic
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
@@ -1,5 +1,4 @@
 atomic
-barrier
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
@@ -1,4 +1,3 @@
-bit
 cstddef
 cstdint
 cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
@@ -2,7 +2,6 @@
 array
 atomic
 bit
-bitset
 cctype
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
@@ -3,7 +3,6 @@
 atomic
 bit
 bitset
-ccomplex
 cctype
 cerrno
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
@@ -1,5 +1,4 @@
 cerrno
-charconv
 cmath
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
@@ -1,4 +1,3 @@
-chrono
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
 cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
@@ -1,4 +1,3 @@
-cmath
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
@@ -6,7 +6,6 @@
 cerrno
 climits
 cmath
-codecvt
 compare
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
@@ -1,5 +1,4 @@
 cmath
-compare
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
@@ -8,7 +8,6 @@
 climits
 cmath
 compare
-complex
 concepts
 cstdarg
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
@@ -1,4 +1,3 @@
-concepts
 cstddef
 cstdint
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
@@ -8,7 +8,6 @@
 cmath
 compare
 concepts
-condition_variable
 cstddef
 cstdint
 cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
@@ -1,6 +1,5 @@
 cmath
 compare
-coroutine
 cstddef
 cstdint
 cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
@@ -1,2 +1 @@
-cstddef
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
@@ -17,7 +17,6 @@
 cstdio
 cstdlib
 cstring
-ctgmath
 ctime
 cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
@@ -1,3 +1,2 @@
 cctype
-cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
@@ -1,2 +1 @@
 cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
@@ -11,7 +11,6 @@
 cstdlib
 cstring
 ctime
-deque
 exception
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
@@ -1,6 +1,5 @@
 cstddef
 cstdint
 cstdlib
-exception
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
@@ -1,2 +1 @@
-execution
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
@@ -11,7 +11,6 @@
 cstring
 ctime
 exception
-experimental/algorithm
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
@@ -9,7 +9,6 @@
 cstring
 ctime
 exception
-experimental/coroutine
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
@@ -13,7 +13,6 @@
 ctime
 deque
 exception
-experimental/deque
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/forward_list
 experimental/memory_resource
 experimental/utility
 forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/functional
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
@@ -6,7 +6,6 @@
 cstdlib
 cstring
 exception
-experimental/iterator
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/list
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/map
 experimental/memory_resource
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
@@ -9,7 +9,6 @@
 cstring
 ctime
 exception
-experimental/memory_resource
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-experimental/propagate_const
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
@@ -19,7 +19,6 @@
 deque
 exception
 experimental/memory_resource
-experimental/regex
 experimental/string
 experimental/utility
 functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
@@ -13,7 +13,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-experimental/simd
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
@@ -17,7 +17,6 @@
 cwctype
 exception
 experimental/memory_resource
-experimental/string
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
@@ -1,6 +1,5 @@
 cstddef
 cstdint
-experimental/type_traits
 initializer_list
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
@@ -13,7 +13,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_map
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
@@ -13,7 +13,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_set
 experimental/utility
 functional
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
@@ -3,7 +3,6 @@
 cstddef
 cstdint
 cstdlib
-experimental/utility
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
@@ -13,7 +13,6 @@
 exception
 experimental/memory_resource
 experimental/utility
-experimental/vector
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
@@ -16,7 +16,6 @@
 cwchar
 cwctype
 exception
-ext/hash_map
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
@@ -16,7 +16,6 @@
 cwchar
 cwctype
 exception
-ext/hash_set
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
@@ -19,7 +19,6 @@
 cwchar
 cwctype
 exception
-filesystem
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.format b/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
@@ -19,7 +19,6 @@
 cwchar
 cwctype
 exception
-format
 functional
 initializer_list
 ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-forward_list
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
@@ -20,7 +20,6 @@
 cwctype
 exception
 filesystem
-fstream
 functional
 initializer_list
 iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
@@ -12,7 +12,6 @@
 cstring
 ctime
 exception
-functional
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.future b/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
@@ -18,7 +18,6 @@
 cwctype
 exception
 functional
-future
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
@@ -1,3 +1,2 @@
 cstddef
-initializer_list
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
@@ -21,7 +21,6 @@
 exception
 functional
 initializer_list
-iomanip
 ios
 iosfwd
 istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
@@ -19,7 +19,6 @@
 exception
 functional
 initializer_list
-ios
 iosfwd
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
@@ -23,7 +23,6 @@
 initializer_list
 ios
 iosfwd
-iostream
 istream
 iterator
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
@@ -23,7 +23,6 @@
 initializer_list
 ios
 iosfwd
-istream
 iterator
 limits
 locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
@@ -8,7 +8,6 @@
 exception
 initializer_list
 iosfwd
-iterator
 limits
 new
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
@@ -7,7 +7,6 @@
 cstring
 ctime
 iosfwd
-latch
 limits
 ratio
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-limits
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
@@ -17,7 +17,6 @@
 iosfwd
 iterator
 limits
-list
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
@@ -24,7 +24,6 @@
 iosfwd
 iterator
 limits
-locale
 memory
 mutex
 new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
@@ -17,7 +17,6 @@
 iosfwd
 iterator
 limits
-map
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
@@ -13,7 +13,6 @@
 iosfwd
 iterator
 limits
-memory
 new
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
@@ -23,7 +23,6 @@
 iterator
 limits
 memory
-mutex
 new
 optional
 ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.new b/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
@@ -2,6 +2,5 @@
 cstdint
 cstdlib
 exception
-new
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
@@ -1,6 +1,5 @@
 concepts
 cstddef
 cstdint
-numbers
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
@@ -19,7 +19,6 @@
 limits
 memory
 new
-numeric
 optional
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
@@ -15,7 +15,6 @@
 limits
 memory
 new
-optional
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
@@ -30,7 +30,6 @@
 mutex
 new
 optional
-ostream
 ratio
 stdexcept
 streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
@@ -21,7 +21,6 @@
 memory
 new
 optional
-queue
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.random b/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
@@ -25,7 +25,6 @@
 new
 numeric
 optional
-random
 ratio
 stdexcept
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
@@ -20,7 +20,6 @@
 memory
 new
 optional
-ranges
 ratio
 span
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
@@ -1,6 +1,5 @@
 climits
 cstddef
 cstdint
-ratio
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
@@ -28,7 +28,6 @@
 new
 optional
 ratio
-regex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
@@ -16,7 +16,6 @@
 memory
 new
 ratio
-scoped_allocator
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
@@ -9,6 +9,5 @@
 iosfwd
 limits
 ratio
-semaphore
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
@@ -21,7 +21,6 @@
 new
 optional
 ratio
-set
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
@@ -26,7 +26,6 @@
 new
 optional
 ratio
-shared_mutex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.span b/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
@@ -21,7 +21,6 @@
 new
 optional
 ratio
-span
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
@@ -33,7 +33,6 @@
 optional
 ostream
 ratio
-sstream
 stdexcept
 streambuf
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
@@ -22,7 +22,6 @@
 new
 optional
 ratio
-stack
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
@@ -3,6 +3,5 @@
 cstdlib
 exception
 iosfwd
-stdexcept
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
@@ -29,7 +29,6 @@
 optional
 ratio
 stdexcept
-streambuf
 string
 string_view
 system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
@@ -26,7 +26,6 @@
 optional
 ratio
 stdexcept
-string
 string_view
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
@@ -26,7 +26,6 @@
 optional
 ratio
 stdexcept
-string_view
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
@@ -37,7 +37,6 @@
 streambuf
 string
 string_view
-strstream
 system_error
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
@@ -29,7 +29,6 @@
 stdexcept
 string
 string_view
-system_error
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
@@ -30,7 +30,6 @@
 string
 string_view
 system_error
-thread
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
@@ -8,7 +8,6 @@
 iosfwd
 limits
 new
-tuple
 type_traits
 typeinfo
 utility
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
@@ -1,4 +1,3 @@
 cstddef
 cstdint
-type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
@@ -9,7 +9,6 @@
 limits
 new
 type_traits
-typeindex
 typeinfo
 utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
@@ -3,5 +3,4 @@
 cstdlib
 exception
 type_traits
-typeinfo
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
@@ -23,7 +23,6 @@
 tuple
 type_traits
 typeinfo
-unordered_map
 utility
 variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
@@ -26,7 +26,6 @@
 type_traits
 typeinfo
 unordered_map
-unordered_set
 utility
 variant
 vector
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
@@ -7,5 +7,4 @@
 iosfwd
 limits
 type_traits
-utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
@@ -27,7 +27,6 @@
 typeinfo
 unordered_map
 utility
-valarray
 variant
 vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
@@ -13,5 +13,4 @@
 type_traits
 typeinfo
 utility
-variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
@@ -24,5 +24,4 @@
 typeinfo
 utility
 variant
-vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20/expected.version b/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
--- a/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
@@ -1 +1 @@
-version
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
@@ -1,4 +1,3 @@
-algorithm
 atomic
 bit
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
@@ -1,4 +1,3 @@
-any
 atomic
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
@@ -1,4 +1,3 @@
-array
 cmath
 compare
 concepts
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
@@ -1,4 +1,3 @@
-atomic
 climits
 cstddef
 cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
@@ -1,5 +1,4 @@
 atomic
-barrier
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
@@ -1,4 +1,3 @@
-bit
 cstddef
 cstdint
 cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
@@ -1,5 +1,4 @@
 atomic
-bitset
 cctype
 climits
 cmath
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
@@ -1 +1 @@
-cassert
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
@@ -1,6 +1,5 @@
 atomic
 bitset
-ccomplex
 cctype
 cerrno
 climits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
@@ -1 +1 @@
-cctype
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
@@ -1 +1 @@
-cerrno
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
@@ -1 +1 @@
-cfenv
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
@@ -1 +1 @@
-cfloat
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
@@ -1,5 +1,4 @@
 cerrno
-charconv
 cmath
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
@@ -1,4 +1,3 @@
-chrono
 climits
 cmath
 compare
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
@@ -1,2 +1 @@
-cinttypes
 cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
@@ -1 +1 @@
-ciso646
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
@@ -1 +1 @@
-climits
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
@@ -1 +1 @@
-clocale
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
@@ -1,4 +1,3 @@
-cmath
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
@@ -3,7 +3,6 @@
 cerrno
 climits
 cmath
-codecvt
 compare
 concepts
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
@@ -1,5 +1,4 @@
 cmath
-compare
 cstddef
 cstdint
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
@@ -5,7 +5,6 @@
 climits
 cmath
 compare
-complex
 concepts
 cstdarg
 cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
@@ -1,4 +1,3 @@
-concepts
 cstddef
 cstdint
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
@@ -5,7 +5,6 @@
 cmath
 compare
 concepts
-condition_variable
 cstddef
 cstdint
 cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
@@ -1,6 +1,5 @@
 cmath
 compare
-coroutine
 cstddef
 cstdint
 cstring
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
@@ -1 +1 @@
-csetjmp
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
@@ -1 +1 @@
-csignal
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
@@ -1 +1 @@
-cstdarg
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
@@ -1 +1 @@
-cstdbool
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
@@ -1,2 +1 @@
-cstddef
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
@@ -1 +1 @@
-cstdint
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
@@ -1 +1 @@
-cstdio
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
@@ -1 +1 @@
-cstdlib
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
@@ -1 +1 @@
-cstring
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
@@ -14,7 +14,6 @@
 cstdio
 cstdlib
 cstring
-ctgmath
 ctime
 cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
@@ -1 +1 @@
-ctime
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
@@ -1 +1 @@
-cuchar
+
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
@@ -1,3 +1,2 @@
 cctype
-cwchar
 cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
@@ -1,2 +1 @@
 cctype
-cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
@@ -8,7 +8,6 @@
 cstdlib
 cstring
 ctime
-deque
 exception
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
@@ -1,6 +1,5 @@
 cstddef
 cstdint
 cstdlib
-exception
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
@@ -1,2 +1 @@
-execution
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
@@ -11,7 +11,6 @@
 cstring
 ctime
 exception
-experimental/algorithm
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
@@ -9,7 +9,6 @@
 cstring
 ctime
 exception
-experimental/coroutine
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
@@ -10,7 +10,6 @@
 ctime
 deque
 exception
-experimental/deque
 experimental/memory_resource
 experimental/utility
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
@@ -9,7 +9,6 @@
 cstring
 ctime
 exception
-experimental/forward_list
 experimental/memory_resource
 experimental/utility
 forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-experimental/functional
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
@@ -6,7 +6,6 @@
 cstdlib
 cstring
 exception
-experimental/iterator
 initializer_list
 iosfwd
 iterator
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
@@ -9,7 +9,6 @@
 cstring
 ctime
 exception
-experimental/list
 experimental/memory_resource
 experimental/utility
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
@@ -9,7 +9,6 @@
 cstring
 ctime
 exception
-experimental/map
 experimental/memory_resource
 experimental/utility
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
@@ -9,7 +9,6 @@
 cstring
 ctime
 exception
-experimental/memory_resource
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-experimental/propagate_const
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
@@ -16,7 +16,6 @@
 deque
 exception
 experimental/memory_resource
-experimental/regex
 experimental/string
 experimental/utility
 initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
@@ -10,7 +10,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/set
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
@@ -6,7 +6,6 @@
 cstdint
 cstdlib
 exception
-experimental/simd
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
@@ -14,7 +14,6 @@
 cwctype
 exception
 experimental/memory_resource
-experimental/string
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
@@ -1,6 +1,5 @@
 cstddef
 cstdint
-experimental/type_traits
 initializer_list
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
@@ -10,7 +10,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_map
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
@@ -10,7 +10,6 @@
 ctime
 exception
 experimental/memory_resource
-experimental/unordered_set
 experimental/utility
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
@@ -3,7 +3,6 @@
 cstddef
 cstdint
 cstdlib
-experimental/utility
 initializer_list
 limits
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
@@ -11,7 +11,6 @@
 exception
 experimental/memory_resource
 experimental/utility
-experimental/vector
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
@@ -16,7 +16,6 @@
 cwchar
 cwctype
 exception
-ext/hash_map
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
@@ -16,7 +16,6 @@
 cwchar
 cwctype
 exception
-ext/hash_set
 functional
 initializer_list
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
@@ -16,7 +16,6 @@
 cwchar
 cwctype
 exception
-filesystem
 initializer_list
 iomanip
 ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
@@ -18,7 +18,6 @@
 cwchar
 cwctype
 exception
-format
 initializer_list
 ios
 iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
@@ -9,7 +9,6 @@
 cstring
 ctime
 exception
-forward_list
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
@@ -17,7 +17,6 @@
 cwctype
 exception
 filesystem
-fstream
 initializer_list
 iomanip
 ios
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
@@ -10,7 +10,6 @@
 cstring
 ctime
 exception
-functional
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
@@ -14,7 +14,6 @@
 cwchar
 cwctype
 exception
-future
 initializer_list
 iosfwd
 limits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
@@ -1,3 +1,2 @@
 cstddef
-initializer_list
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
@@ -17,7 +17,6 @@
 cwctype
 exception
 initializer_list
-iomanip
 ios
 iosfwd
 istream
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
@@ -15,7 +15,6 @@
 cwctype
 exception
 initializer_list
-ios
 iosfwd
 limits
 memory
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
@@ -1,2 +1 @@
-iosfwd
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
@@ -19,7 +19,6 @@
 initializer_list
 ios
 iosfwd
-iostream
 istream
 limits
 locale
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
@@ -19,7 +19,6 @@
 initializer_list
 ios
 iosfwd
-istream
 limits
 locale
 memory
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
@@ -8,7 +8,6 @@
 exception
 initializer_list
 iosfwd
-iterator
 limits
 new
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
@@ -5,7 +5,6 @@
 cstring
 ctime
 iosfwd
-latch
 limits
 ratio
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
@@ -1,5 +1,4 @@
 cstddef
 cstdint
-limits
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
@@ -12,7 +12,6 @@
 initializer_list
 iosfwd
 limits
-list
 memory
 new
 ratio
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
@@ -19,7 +19,6 @@
 ios
 iosfwd
 limits
-locale
 memory
 mutex
 new
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
@@ -12,7 +12,6 @@
 initializer_list
 iosfwd
 limits
-map
 memory
 new
 optional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
@@ -12,7 +12,6 @@
 initializer_list
 iosfwd
 limits
-memory
 new
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
@@ -18,7 +18,6 @@
 iosfwd
 limits
 memory
-mutex
 new
 ratio
 stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
@@ -2,6 +2,5 @@
 cstdint
 cstdlib
 exception
-new
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
@@ -1,6 +1,5 @@
 concepts
 cstddef
 cstdint
-numbers
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
@@ -3,6 +3,5 @@
 cstddef
 cstdint
 limits
-numeric
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
@@ -9,7 +9,6 @@
 iosfwd
 limits
 new
-optional
 stdexcept
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
@@ -24,7 +24,6 @@
 memory
 mutex
 new
-ostream
 ratio
 stdexcept
 streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
@@ -18,7 +18,6 @@
 memory
 new
 optional
-queue
 ratio
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
@@ -20,7 +20,6 @@
 memory
 new
 numeric
-random
 ratio
 stdexcept
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
@@ -13,7 +13,6 @@
 limits
 new
 optional
-ranges
 span
 stdexcept
 tuple
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
@@ -1,6 +1,5 @@
 climits
 cstddef
 cstdint
-ratio
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
@@ -22,7 +22,6 @@
 mutex
 new
 ratio
-regex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
@@ -15,7 +15,6 @@
 memory
 new
 ratio
-scoped_allocator
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
@@ -7,6 +7,5 @@
 iosfwd
 limits
 ratio
-semaphore
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
@@ -16,7 +16,6 @@
 new
 optional
 ratio
-set
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
@@ -20,7 +20,6 @@
 memory
 new
 ratio
-shared_mutex
 stdexcept
 string
 string_view
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
@@ -9,7 +9,6 @@
 initializer_list
 iosfwd
 limits
-span
 stdexcept
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
@@ -27,7 +27,6 @@
 new
 ostream
 ratio
-sstream
 stdexcept
 streambuf
 string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
@@ -16,7 +16,6 @@
 memory
 new
 ratio
-stack
 stdexcept
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
@@ -3,6 +3,5 @@
 cstdlib
 exception
 iosfwd
-stdexcept
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
@@ -23,7 +23,6 @@
 new
 ratio
 stdexcept
-streambuf
 string
 string_view
 system_error
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
@@ -20,7 +20,6 @@
 new
 ratio
 stdexcept
-string
 string_view
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
@@ -14,6 +14,5 @@
 iosfwd
 limits
 stdexcept
-string_view
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
@@ -31,7 +31,6 @@
 streambuf
 string
 string_view
-strstream
 system_error
 tuple
 type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
@@ -23,7 +23,6 @@
 stdexcept
 string
 string_view
-system_error
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
@@ -24,7 +24,6 @@
 string
 string_view
 system_error
-thread
 tuple
 type_traits
 typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
@@ -3,6 +3,5 @@
 cstddef
 cstdint
 limits
-tuple
 type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
@@ -1,4 +1,3 @@
 cstddef
 cstdint
-type_traits
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
@@ -6,6 +6,5 @@
 exception
 limits
 type_traits
-typeindex
 typeinfo
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
@@ -3,5 +3,4 @@
 cstdlib
 exception
 type_traits
-typeinfo
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
@@ -20,5 +20,4 @@
 tuple
 type_traits
 typeinfo
-unordered_map
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
@@ -20,5 +20,4 @@
 tuple
 type_traits
 typeinfo
-unordered_set
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
@@ -6,5 +6,4 @@
 initializer_list
 limits
 type_traits
-utility
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
@@ -11,5 +11,4 @@
 new
 stdexcept
 type_traits
-valarray
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
@@ -10,5 +10,4 @@
 new
 tuple
 type_traits
-variant
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
@@ -19,5 +19,4 @@
 tuple
 type_traits
 typeinfo
-vector
 version
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
--- a/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
@@ -1 +1 @@
-version
+