Index: libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp
===================================================================
--- libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp
+++ libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp
@@ -41,11 +41,6 @@
 
 #include <__config>
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
 int main(int, char**) { return 0; }
 
 // DO NOT MANUALLY EDIT ANYTHING BETWEEN THE MARKERS BELOW
@@ -752,16 +747,4 @@
     using HandlerType = decltype(std::__libcpp_verbose_abort);
 #endif
 
-// RUN: %{build} -DTEST_138
-#if defined(TEST_138)
-#   include <ext/hash_map>
-    using HandlerType = decltype(std::__libcpp_verbose_abort);
-#endif
-
-// RUN: %{build} -DTEST_139
-#if defined(TEST_139)
-#   include <ext/hash_set>
-    using HandlerType = decltype(std::__libcpp_verbose_abort);
-#endif
-
 // GENERATED-MARKER
Index: libcxx/test/libcxx/clang_tidy.sh.cpp
===================================================================
--- libcxx/test/libcxx/clang_tidy.sh.cpp
+++ libcxx/test/libcxx/clang_tidy.sh.cpp
@@ -15,11 +15,6 @@
 // RUN: %{clang-tidy} %s --warnings-as-errors=* -header-filter=.* --checks='-*,libcpp-*' --load=%{test-tools}/clang_tidy_checks/libcxx-tidy.plugin -- %{compile_flags} -fno-modules
 // RUN: %{clang-tidy} %s --warnings-as-errors=* -header-filter=.* --config-file=%S/../../.clang-tidy -- -Wweak-vtables %{compile_flags} -fno-modules
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 
@@ -262,6 +257,4 @@
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER
Index: libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp
===================================================================
--- libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
-#include <ext/hash_map>
-#include <cassert>
-
-#include "test_macros.h"
-#include "count_new.h"
-
-void test_default_does_not_allocate() {
-  DisableAllocationGuard g;
-  ((void)g);
-  {
-    __gnu_cxx::hash_map<int, int> h;
-    assert(h.bucket_count() == 0);
-  }
-  {
-    __gnu_cxx::hash_multimap<int, int> h;
-    assert(h.bucket_count() == 0);
-  }
-}
-
-int main(int, char**) {
-  test_default_does_not_allocate();
-  return 0;
-}
Index: libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp
===================================================================
--- libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// Poison the std:: names we might use inside __gnu_cxx to ensure they're
-// properly qualified.
-struct allocator;
-struct pair;
-struct equal_to;
-struct unique_ptr;
-
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
-#include <ext/hash_map>
-
-#include "test_macros.h"
-
-
-namespace __gnu_cxx {
-template class hash_map<int, int>;
-}
-
-int main(int, char**) {
-  typedef __gnu_cxx::hash_map<int, int> Map;
-  Map m;
-  Map m2(m);
-  ((void)m2);
-
-  return 0;
-}
Index: libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp
===================================================================
--- libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// Prevent <ext/hash_set> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
-#include <ext/hash_set>
-#include <cassert>
-
-#include "test_macros.h"
-#include "count_new.h"
-
-void test_default_does_not_allocate() {
-  DisableAllocationGuard g;
-  ((void)g);
-  {
-    __gnu_cxx::hash_set<int> h;
-    assert(h.bucket_count() == 0);
-  }
-  {
-    __gnu_cxx::hash_multiset<int> h;
-    assert(h.bucket_count() == 0);
-  }
-}
-
-int main(int, char**) {
-  test_default_does_not_allocate();
-  return 0;
-}
Index: libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp
===================================================================
--- libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// Poison the std:: names we might use inside __gnu_cxx to ensure they're
-// properly qualified.
-struct allocator;
-struct pair;
-struct equal_to;
-struct unique_ptr;
-
-// Prevent <ext/hash_set> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
-#include <ext/hash_set>
-
-#include "test_macros.h"
-
-namespace __gnu_cxx {
-template class hash_set<int>;
-}
-
-int main(int, char**) {
-  typedef __gnu_cxx::hash_set<int> Set;
-  Set s;
-  Set s2(s);
-  ((void)s2);
-
-  return 0;
-}
Index: libcxx/test/libcxx/double_include.sh.cpp
===================================================================
--- libcxx/test/libcxx/double_include.sh.cpp
+++ libcxx/test/libcxx/double_include.sh.cpp
@@ -16,11 +16,6 @@
 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 
@@ -263,8 +258,6 @@
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER
 
 #if defined(WITH_MAIN)
Index: libcxx/test/libcxx/extensions/hash/specializations.compile.fail.cpp
===================================================================
--- libcxx/test/libcxx/extensions/hash/specializations.compile.fail.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <assert.h>
-#include <ext/hash_map>
-#include <string>
-
-int main(int, char**)
-{
-    assert(__gnu_cxx::hash<std::string>()(std::string()) == 0);  // error
-
-  return 0;
-}
Index: libcxx/test/libcxx/extensions/hash/specializations.pass.cpp
===================================================================
--- libcxx/test/libcxx/extensions/hash/specializations.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// NOTE: Undefined __DEPRECATED to prevent this test from failing with -Werror
-#undef __DEPRECATED
-#include <assert.h>
-#include <ext/hash_map>
-#include <string>
-
-#include "test_macros.h"
-
-int main(int, char**)
-{
-    char str[] = "test";
-    assert(__gnu_cxx::hash<const char *>()("test") ==
-           std::hash<std::string>()("test"));
-    assert(__gnu_cxx::hash<char *>()(str) == std::hash<std::string>()("test"));
-    assert(__gnu_cxx::hash<char>()(42) == 42);
-    assert(__gnu_cxx::hash<signed char>()(42) == 42);
-    assert(__gnu_cxx::hash<unsigned char>()(42) == 42);
-    assert(__gnu_cxx::hash<short>()(42) == 42);
-    assert(__gnu_cxx::hash<unsigned short>()(42) == 42);
-    assert(__gnu_cxx::hash<int>()(42) == 42);
-    assert(__gnu_cxx::hash<unsigned int>()(42) == 42);
-    assert(__gnu_cxx::hash<long>()(42) == 42);
-    assert(__gnu_cxx::hash<unsigned long>()(42) == 42);
-
-  return 0;
-}
Index: libcxx/test/libcxx/extensions/hash_map/const_iterator.compile.fail.cpp
===================================================================
--- libcxx/test/libcxx/extensions/hash_map/const_iterator.compile.fail.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <ext/hash_map>
-
-int main(int, char**)
-{
-    __gnu_cxx::hash_map<int, int> m;
-    m[1] = 1;
-    const __gnu_cxx::hash_map<int, int> &cm = m;
-    cm.find(1)->second = 2;  // error
-
-  return 0;
-}
Index: libcxx/test/libcxx/min_max_macros.compile.pass.cpp
===================================================================
--- libcxx/test/libcxx/min_max_macros.compile.pass.cpp
+++ libcxx/test/libcxx/min_max_macros.compile.pass.cpp
@@ -12,11 +12,6 @@
 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 #define TEST_MACROS() static_assert(min() == true && max() == true, "")
 #define min() true
 #define max() true
@@ -401,8 +396,4 @@
 #   include <experimental/vector>
 TEST_MACROS();
 #endif
-#include <ext/hash_map>
-TEST_MACROS();
-#include <ext/hash_set>
-TEST_MACROS();
 // GENERATED-MARKER
Index: libcxx/test/libcxx/modules_include.sh.cpp
===================================================================
--- libcxx/test/libcxx/modules_include.sh.cpp
+++ libcxx/test/libcxx/modules_include.sh.cpp
@@ -23,11 +23,6 @@
 // The Android headers don't appear to be compatible with modules yet
 // XFAIL: LIBCXX-ANDROID-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 #include <__config>
 
 /*
@@ -871,18 +866,8 @@
 #if defined(TEST_137) && __cplusplus >= 201103L
 #include <experimental/vector>
 #endif
-// RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_138 &' >> %t.sh
-// RUN: echo 'TEST_138=$!' >> %t.sh
 // RUN: echo "wait $TEST_122" >> %t.sh
-#if defined(TEST_138)
-#include <ext/hash_map>
-#endif
-// RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_139 &' >> %t.sh
-// RUN: echo 'TEST_139=$!' >> %t.sh
 // RUN: echo "wait $TEST_123" >> %t.sh
-#if defined(TEST_139)
-#include <ext/hash_set>
-#endif
 // RUN: echo "wait $TEST_124" >> %t.sh
 // RUN: echo "wait $TEST_125" >> %t.sh
 // RUN: echo "wait $TEST_126" >> %t.sh
@@ -897,7 +882,5 @@
 // RUN: echo "wait $TEST_135" >> %t.sh
 // RUN: echo "wait $TEST_136" >> %t.sh
 // RUN: echo "wait $TEST_137" >> %t.sh
-// RUN: echo "wait $TEST_138" >> %t.sh
-// RUN: echo "wait $TEST_139" >> %t.sh
 // RUN: bash %t.sh
 // GENERATED-MARKER
Index: libcxx/test/libcxx/nasty_macros.compile.pass.cpp
===================================================================
--- libcxx/test/libcxx/nasty_macros.compile.pass.cpp
+++ libcxx/test/libcxx/nasty_macros.compile.pass.cpp
@@ -12,11 +12,6 @@
 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 #define NASTY_MACRO This should not be expanded!!!
 
 // libc++ does not use single-letter names as a matter of principle.
@@ -387,6 +382,4 @@
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER
Index: libcxx/test/libcxx/no_assert_include.compile.pass.cpp
===================================================================
--- libcxx/test/libcxx/no_assert_include.compile.pass.cpp
+++ libcxx/test/libcxx/no_assert_include.compile.pass.cpp
@@ -12,11 +12,6 @@
 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 
@@ -260,8 +255,6 @@
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER
 
 #ifdef assert
Index: libcxx/test/libcxx/transitive_includes.sh.cpp
===================================================================
--- libcxx/test/libcxx/transitive_includes.sh.cpp
+++ libcxx/test/libcxx/transitive_includes.sh.cpp
@@ -35,11 +35,6 @@
 // this test instead.
 // UNSUPPORTED: transitive-includes-disabled
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 
@@ -545,14 +540,6 @@
 #if defined(TEST_137)
 #include <experimental/vector>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_138 2> %t/header.ext_hash_map
-#if defined(TEST_138)
-#include <ext/hash_map>
-#endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_139 2> %t/header.ext_hash_set
-#if defined(TEST_139)
-#include <ext/hash_set>
-#endif
 // RUN: %{python} %S/transitive_includes_to_csv.py %t > %t/transitive_includes.csv
 // RUN: diff -w %S/transitive_includes/%{cxx_std}.csv %t/transitive_includes.csv
 // GENERATED-MARKER
Index: libcxx/utils/generate_header_tests.py
===================================================================
--- libcxx/utils/generate_header_tests.py
+++ libcxx/utils/generate_header_tests.py
@@ -126,13 +126,11 @@
 
     toplevel_headers     = sorted(str(p.relative_to(include)) for p in include.glob('[a-z]*') if is_header(p))
     experimental_headers = sorted(str(p.relative_to(include)) for p in include.glob('experimental/[a-z]*') if is_header(p))
-    extended_headers     = sorted(str(p.relative_to(include)) for p in include.glob('ext/[a-z]*') if is_header(p))
-    public_headers       = toplevel_headers + experimental_headers + extended_headers
+    public_headers       = toplevel_headers + experimental_headers
     private_headers      = sorted(str(p.relative_to(include)) for p in include.rglob('*') if is_header(p) and str(p.relative_to(include)).startswith('__'))
     variables = {
         'toplevel_headers': toplevel_headers,
         'experimental_headers': experimental_headers,
-        'extended_headers': extended_headers,
         'public_headers': public_headers,
         'private_headers': private_headers,
         'header_restrictions': header_restrictions,