summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std/utilities')
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/default.allocator/allocator.members/construct.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/empty_in_place_t_does_not_clobber.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.swap/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.specalg/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/implicit_deduction_guides.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp6
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp6
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp4
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp4
-rw-r--r--libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp2
104 files changed, 128 insertions, 128 deletions
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
index 9748d66fb45..ae2ed0d97a4 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
@@ -22,8 +22,8 @@
#include <tuple>
#include <cassert>
#include <cstdlib>
-#include "uses_alloc_types.hpp"
-#include "controlled_allocators.hpp"
+#include "uses_alloc_types.h"
+#include "controlled_allocators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
index 103f8f41327..4fc4794918c 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
@@ -22,8 +22,8 @@
#include <tuple>
#include <cassert>
#include <cstdlib>
-#include "uses_alloc_types.hpp"
-#include "controlled_allocators.hpp"
+#include "uses_alloc_types.h"
+#include "controlled_allocators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
index d8f5e7c7879..2ada281f549 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
@@ -23,8 +23,8 @@
#include <tuple>
#include <cassert>
#include <cstdlib>
-#include "uses_alloc_types.hpp"
-#include "controlled_allocators.hpp"
+#include "uses_alloc_types.h"
+#include "controlled_allocators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
index 5632e2112d9..ed8785bcf33 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
@@ -22,8 +22,8 @@
#include <tuple>
#include <cassert>
#include <cstdlib>
-#include "uses_alloc_types.hpp"
-#include "controlled_allocators.hpp"
+#include "uses_alloc_types.h"
+#include "controlled_allocators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
index 9ba2d155d2a..3a4c236bf75 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
@@ -22,8 +22,8 @@
#include <tuple>
#include <cassert>
#include <cstdlib>
-#include "uses_alloc_types.hpp"
-#include "controlled_allocators.hpp"
+#include "uses_alloc_types.h"
+#include "controlled_allocators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
index 2dee95d34da..5a919d3c717 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
@@ -22,8 +22,8 @@
#include <tuple>
#include <cassert>
#include <cstdlib>
-#include "uses_alloc_types.hpp"
-#include "controlled_allocators.hpp"
+#include "uses_alloc_types.h"
+#include "controlled_allocators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp
index d818400c5de..7f44afec7fd 100644
--- a/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp
@@ -20,7 +20,7 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
using std::any;
diff --git a/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp
index 8ca93df34ad..5ac9b7985d5 100644
--- a/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
using std::any;
diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp
index fbb5f181a24..de299018928 100644
--- a/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
using std::any;
diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
index 6cd7b8937d2..159bf75e2be 100644
--- a/libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
@@ -18,7 +18,7 @@
#include "test_macros.h"
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp
index bfe86e800e9..329322d2d67 100644
--- a/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp
@@ -27,9 +27,9 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
-#include "test_convertible.hpp"
+#include "test_convertible.h"
using std::any;
using std::any_cast;
diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp
index 3c0780c0a3f..ac88e0f78df 100644
--- a/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp
@@ -20,7 +20,7 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
using std::any;
diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp
index e39c7307ecb..ecd3bd7616b 100644
--- a/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp
@@ -25,7 +25,7 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
using std::any;
diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp
index 8a5e433786d..e2b232b0819 100644
--- a/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp
@@ -20,7 +20,7 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
using std::any;
diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp
index 12164448002..faaca948a61 100644
--- a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp
@@ -26,7 +26,7 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
using std::any;
diff --git a/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
index 9c5dda2066c..5e319efdab0 100644
--- a/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
@@ -20,7 +20,7 @@
#include <cassert>
#include "any_helpers.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
using std::any;
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
index ec25bdf7802..cf3477ff554 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
class A
{
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
index fe5d24806b7..5944f5900ee 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
class A
{
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
index f70a2087cc2..26178551edb 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
class A
{
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
index bcc93adad10..f21f8d4cc67 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#include "min_allocator.h"
#include "test_allocator.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "../function_types.h"
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
index 3f3b5c696d7..138f3d9d8dc 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "min_allocator.h"
#include "test_allocator.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "../function_types.h"
class DummyClass {};
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
index 064046d0b2d..46f33be68fe 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
@@ -23,7 +23,7 @@
#include "test_macros.h"
#include "min_allocator.h"
-#include "count_new.hpp"
+#include "count_new.h"
class A
{
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
index d7b11ae1bfd..d97b699ea96 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
class A {
int data_[10];
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp
index dbbde5ce473..b756e7ecef9 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
class A
{
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
index 00ab664f7f0..16d9f05622d 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
@@ -15,7 +15,7 @@
#include <functional>
#include <cassert>
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
index 8c8f3f53db6..f034eb71e4d 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
@@ -15,7 +15,7 @@
#include <functional>
#include <cassert>
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
index 8e5e7c30e1e..8761357eb82 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
@@ -15,7 +15,7 @@
#include <functional>
#include <cassert>
-#include "counting_predicates.hpp"
+#include "counting_predicates.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp b/libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp
index c8711546764..8f29b2a4f2e 100644
--- a/libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp
@@ -15,7 +15,7 @@
#include <functional>
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
index fac99d173b0..cdf491bf586 100644
--- a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
+++ b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
@@ -16,7 +16,7 @@
#include <cstddef> // for std::max_align_t
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
#ifdef TEST_HAS_NO_ALIGNED_ALLOCATION
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/construct.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
index 96954e04b08..328603b717f 100644
--- a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
+++ b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
@@ -15,7 +15,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
int A_constructed = 0;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
index fe7567eebc1..8dd984dcdde 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
@@ -25,7 +25,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
struct T
: public std::enable_shared_from_this<T>
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
index 677354e19ed..a5a1a215353 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
@@ -15,7 +15,7 @@
#include <memory>
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
index 0fcf27fb929..9b695cf54ce 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
@@ -20,7 +20,7 @@
#include <cassert>
#if TEST_STD_VER >= 11
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
index 5cae6ca7d45..5d25bd78e13 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
@@ -22,7 +22,7 @@
#include "test_macros.h"
#if TEST_STD_VER >= 11
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "deleter_types.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
index 6b12d7564f4..5e9e06f7d79 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
struct B
{
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
index 7d2628d60dc..795717fbf23 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
@@ -21,7 +21,7 @@
#include <cstdlib>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
#include "deleter_types.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
index 9fa32714bc1..4a5ae751bc4 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
@@ -20,7 +20,7 @@
#include <new>
#include <cstdlib>
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
#include "deleter_types.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
index b7b5d145093..fd33ce9cb9e 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
@@ -19,7 +19,7 @@
#include <cstdlib>
#include <cassert>
-#include "count_new.hpp"
+#include "count_new.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
index 6fd812fca0a..41e64c6b431 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
struct B
{
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
index aed060e5790..ebb1cdce6f9 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "test_macros.h"
-#include "count_new.hpp"
+#include "count_new.h"
#if TEST_STD_VER >= 11
#define DELETE_FUNCTION = delete
diff --git a/libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp
index fc84e6dc92a..212ffec4fc6 100644
--- a/libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp
@@ -15,7 +15,7 @@
#include <optional>
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp b/libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp
index d4f04164f60..9645e31bb6d 100644
--- a/libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp
@@ -16,7 +16,7 @@
#include <memory>
#include <cassert>
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
index 3dd28ace26f..d3953af8264 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
@@ -17,7 +17,7 @@
#include <memory>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp
index 6ccaafa6d6f..cf44921fe57 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
index 5900e60461e..a5ff10201c9 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp
index c5cebc5420b..d05f40d1985 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp
@@ -17,7 +17,7 @@
#include <memory>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
index c862c5f0efd..bdaf6ffceb5 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
@@ -19,7 +19,7 @@
#include <utility>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp
index af582d73205..c0beecc62cb 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
using std::nullopt_t;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp
index cabaa070b27..2239acaf629 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
index b5966dfa55a..ce0b6e5878f 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
@@ -20,8 +20,8 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
index f20a840b0b3..018abd99033 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
index e6793cd4794..db38cbfbfa9 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp
index 3dd38da9d57..4b4d64e24ab 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/empty_in_place_t_does_not_clobber.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/empty_in_place_t_does_not_clobber.pass.cpp
index 84db7ea024f..7936390b459 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/empty_in_place_t_does_not_clobber.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/empty_in_place_t_does_not_clobber.pass.cpp
@@ -20,7 +20,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
index 4c58d45b5af..fc2c46123f2 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
index 12b19a72caf..30214fb01cb 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
@@ -15,7 +15,7 @@
#include <type_traits>
#include <cassert>
-#include "archetypes.hpp"
+#include "archetypes.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
index f2e7882e8ee..3d9e942af39 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.swap/swap.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.swap/swap.pass.cpp
index e881a0c6286..15fb2b057aa 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.swap/swap.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.swap/swap.pass.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp
index 2449801be18..6a5fb920182 100644
--- a/libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp
@@ -16,7 +16,7 @@
#include <optional>
#include <type_traits>
-#include "archetypes.hpp"
+#include "archetypes.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp
index 3af60a6bf9f..1aff9dff579 100644
--- a/libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp
@@ -22,7 +22,7 @@
#include <optional>
#include <type_traits>
-#include "archetypes.hpp"
+#include "archetypes.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/optional/optional.specalg/swap.pass.cpp b/libcxx/test/std/utilities/optional/optional.specalg/swap.pass.cpp
index 1a548e8cc2e..4fca6e0479c 100644
--- a/libcxx/test/std/utilities/optional/optional.specalg/swap.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.specalg/swap.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
using std::optional;
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp
index 5adc060c8ae..621caa411b7 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp
@@ -15,7 +15,7 @@
#include <bitset>
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp
index 916255c967a..6a06afab313 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp
@@ -20,7 +20,7 @@
#include <type_traits>
#include "test_macros.h"
-#include "test_convertible.hpp"
+#include "test_convertible.h"
#include "MoveOnly.h"
#if TEST_STD_VER > 11
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp
index ddb61a03651..4944f64ddf0 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp
@@ -26,7 +26,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
// Overloads
diff --git a/libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp
index e663071e71e..d8c9ce048ae 100644
--- a/libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp
@@ -15,7 +15,7 @@
#include <typeindex>
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
index e8ce292cca0..605aa991a0d 100644
--- a/libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#if TEST_STD_VER >= 11
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#endif
int main(int, char**)
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
index dc4cd317648..062ef62fd88 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
@@ -19,8 +19,8 @@
#include <memory>
#include <cassert>
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
index 834d73dd7f5..078d424a1ba 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
@@ -17,7 +17,7 @@
#include "test_macros.h"
#if TEST_STD_VER >= 11
-#include "archetypes.hpp"
+#include "archetypes.h"
#endif
int main(int, char**)
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
index 64e3adb56b7..17d602012c4 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
@@ -17,7 +17,7 @@
#include <utility>
#include <memory>
#include <cassert>
-#include <archetypes.hpp>
+#include <archetypes.h>
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
index 53c6cc8a6f2..621ab55aee4 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
@@ -17,8 +17,8 @@
#include <utility>
#include <cassert>
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
index 5a592c35cbf..6d9e81ce83e 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
@@ -17,8 +17,8 @@
#include <utility>
#include <cassert>
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp
index dc1f37b666b..de3730ef3cb 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp
@@ -26,7 +26,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/implicit_deduction_guides.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/implicit_deduction_guides.pass.cpp
index ca5a728844e..4e3559f144d 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/implicit_deduction_guides.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/implicit_deduction_guides.pass.cpp
@@ -26,7 +26,7 @@
#include <cassert>
#include "test_macros.h"
-#include "archetypes.hpp"
+#include "archetypes.h"
// Overloads
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
index 3d12398d6c9..a3f2464b440 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
@@ -18,8 +18,8 @@
#include <memory>
#include <cassert>
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp
index b1082ccfa65..449a27cd3db 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp
@@ -24,7 +24,7 @@
#include <string>
#include <tuple>
-#include "archetypes.hpp"
+#include "archetypes.h"
#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp
index 5210c5f9d84..827f7a23e95 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp
@@ -19,7 +19,7 @@
// get_if(const variant<Types...>* v) noexcept;
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
#include <cassert>
#include <memory>
#include <variant>
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp
index e7c9671f95c..341d53906b6 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp
@@ -18,7 +18,7 @@
// noexcept;
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
#include <cassert>
#include <variant>
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
index d8711c76366..16e2f209ce8 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
@@ -28,7 +28,7 @@
#include "test_macros.h"
#include "test_workarounds.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
#include <cassert>
#include <type_traits>
#include <utility>
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
index 5272c0981a8..333f3d91038 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
@@ -22,7 +22,7 @@
#include "test_macros.h"
#include "test_workarounds.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
#include <cassert>
#include <type_traits>
#include <utility>
diff --git a/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
index 2649dd6c4eb..f5e0fbe1171 100644
--- a/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
@@ -15,7 +15,7 @@
#include <variant>
-#include "poisoned_hash_helper.hpp"
+#include "poisoned_hash_helper.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp b/libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp
index edda8d21a24..a4255188ed4 100644
--- a/libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp
@@ -19,8 +19,8 @@
#include <variant>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
-#include "poisoned_hash_helper.hpp"
+#include "variant_test_helpers.h"
+#include "poisoned_hash_helper.h"
#ifndef TEST_HAS_NO_EXCEPTIONS
namespace std {
diff --git a/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp b/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp
index 7db07b6b0d4..e8b6302c199 100644
--- a/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp
@@ -26,7 +26,7 @@
#include <variant>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
template <class V, size_t I, class E> void test() {
static_assert(
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
index ab4ea7e4cf2..3483298eda7 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
@@ -25,7 +25,7 @@
#include <memory>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
namespace MetaHelpers {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp
index b16cf2cdd58..a1d9122a8c3 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp
@@ -20,7 +20,7 @@
#include <string>
#include <memory>
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
index 990e10c0f09..7ec76ab4ccc 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
@@ -29,7 +29,7 @@
#include <variant>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
struct NoCopy {
NoCopy(const NoCopy &) = delete;
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
index 42a31f33450..0824761b092 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
@@ -23,7 +23,7 @@
#include <memory>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
struct Dummy {
Dummy() = default;
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp
index 47991233a56..c0b1560a8f6 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp
@@ -19,7 +19,7 @@
#include <string>
#include <memory>
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
index 579ae4d9fe2..a26abf57cce 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
@@ -22,7 +22,7 @@
#include <variant>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
struct NonDefaultConstructible {
constexpr NonDefaultConstructible(int) {}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
index ac736fb3a44..f404c0ba726 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
@@ -23,7 +23,7 @@
#include <type_traits>
#include <variant>
-#include "test_convertible.hpp"
+#include "test_convertible.h"
#include "test_macros.h"
void test_ctor_sfinae() {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
index 179b6635309..eb8c7daa2fa 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
@@ -23,7 +23,7 @@
#include <type_traits>
#include <variant>
-#include "test_convertible.hpp"
+#include "test_convertible.h"
#include "test_macros.h"
struct InitList {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
index 430ddca3c69..9716d05f678 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
@@ -22,7 +22,7 @@
#include <type_traits>
#include <variant>
-#include "test_convertible.hpp"
+#include "test_convertible.h"
#include "test_macros.h"
void test_ctor_sfinae() {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
index 46dab74e810..75baf15143a 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
@@ -23,7 +23,7 @@
#include <type_traits>
#include <variant>
-#include "test_convertible.hpp"
+#include "test_convertible.h"
#include "test_macros.h"
struct InitList {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
index 95f16ac2dd8..07a70e4e8ef 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
@@ -23,10 +23,10 @@
#include <type_traits>
#include <variant>
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
template <class Var, size_t I, class... Args>
constexpr auto test_emplace_exists_imp(int) -> decltype(
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
index aee3c3fa11f..26604510323 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
@@ -23,8 +23,8 @@
#include <type_traits>
#include <variant>
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
#include "test_macros.h"
struct InitList {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
index 929806a099c..9eaddcc672c 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
@@ -22,10 +22,10 @@
#include <type_traits>
#include <variant>
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
template <class Var, class T, class... Args>
constexpr auto test_emplace_exists_imp(int) -> decltype(
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
index 9cb9674f47d..5910e50aef0 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
@@ -23,8 +23,8 @@
#include <type_traits>
#include <variant>
-#include "archetypes.hpp"
-#include "test_convertible.hpp"
+#include "archetypes.h"
+#include "test_convertible.h"
#include "test_macros.h"
struct InitList {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
index 6d463ad2788..657f9a1ee87 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
@@ -20,9 +20,9 @@
#include <type_traits>
#include <variant>
-#include "archetypes.hpp"
+#include "archetypes.h"
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
int main(int, char**) {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
index 2cb730cb0ff..2cf18241738 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
@@ -20,9 +20,9 @@
#include <type_traits>
#include <variant>
-#include "archetypes.hpp"
+#include "archetypes.h"
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
int main(int, char**) {
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
index 8443f1e8e23..2c95dfeb35c 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
@@ -22,9 +22,9 @@
#include <type_traits>
#include <variant>
-#include "test_convertible.hpp"
+#include "test_convertible.h"
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
struct NotSwappable {};
void swap(NotSwappable &, NotSwappable &) = delete;
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp
index ce79e9c4254..32ad7c35dff 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp
@@ -20,8 +20,8 @@
#include <cassert>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
-#include "test_convertible.hpp"
+#include "variant_test_helpers.h"
+#include "test_convertible.h"
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp
index 3b93cb0ab70..7fb78d42dfc 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp
@@ -16,7 +16,7 @@
#include <variant>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp
index 7c2c4669083..dd7f71eb461 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp
@@ -16,7 +16,7 @@
#include <variant>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp
index 27e9c399f8d..7be8ac48311 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp
@@ -20,8 +20,8 @@
#include <cassert>
#include "test_macros.h"
-#include "variant_test_helpers.hpp"
-#include "test_convertible.hpp"
+#include "variant_test_helpers.h"
+#include "test_convertible.h"
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
index 11e26d097d4..5a57164a2b6 100644
--- a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
@@ -24,7 +24,7 @@
#include "test_macros.h"
#include "type_id.h"
-#include "variant_test_helpers.hpp"
+#include "variant_test_helpers.h"
enum CallType : unsigned {
CT_None,
OpenPOWER on IntegriCloud