diff --git a/libcxx/test/std/concepts/concepts.lang/concept.assignable/assignable_from.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.assignable/assignable_from.compile.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.assignable/assignable_from.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.assignable/assignable_from.compile.pass.cpp
@@ -23,6 +23,7 @@
 #include <type_traits>
 
 #include "MoveOnly.h"
+#include "test_macros.h"
 
 struct NoCommonRef {
   NoCommonRef& operator=(const int&);
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp
@@ -15,6 +15,8 @@
 #include <concepts>
 #include <type_traits>
 
+#include "test_macros.h"
+
 template <class T, class U>
 constexpr bool CheckCommonWith() noexcept {
   constexpr bool result = std::common_with<T, U>;
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp
@@ -15,6 +15,8 @@
 #include <concepts>
 #include <type_traits>
 
+#include "test_macros.h"
+
 template <class T, class U>
 constexpr bool CheckCommonReferenceWith() noexcept {
   static_assert(std::common_reference_with<T, U&>);
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.constructible/constructible_from.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.constructible/constructible_from.compile.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.constructible/constructible_from.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.constructible/constructible_from.compile.pass.cpp
@@ -19,6 +19,8 @@
 #include <string>
 #include <type_traits>
 
+#include "test_macros.h"
+
 struct Empty {};
 
 struct Defaulted {
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.convertible/convertible_to.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.convertible/convertible_to.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.convertible/convertible_to.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.convertible/convertible_to.pass.cpp
@@ -15,6 +15,8 @@
 #include <concepts>
 #include <type_traits>
 
+#include "test_macros.h"
+
 namespace {
 enum ClassicEnum { a, b };
 enum class ScopedEnum { x, y };
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.copyconstructible/copy_constructible.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.copyconstructible/copy_constructible.compile.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.copyconstructible/copy_constructible.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.copyconstructible/copy_constructible.compile.pass.cpp
@@ -15,6 +15,7 @@
 #include <concepts>
 #include <type_traits>
 
+#include "test_macros.h"
 #include "type_classification/moveconstructible.h"
 
 // Tests in this namespace are shared with moveconstructible.pass.cpp
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.derived/derived_from.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.derived/derived_from.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.derived/derived_from.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.derived/derived_from.pass.cpp
@@ -15,6 +15,8 @@
 #include <concepts>
 #include <type_traits>
 
+#include "test_macros.h"
+
 struct Base1 {};
 struct Derived1 : Base1 {};
 struct Derived2 : Base1 {};
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.destructible/destructible.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.destructible/destructible.compile.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.destructible/destructible.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.destructible/destructible.compile.pass.cpp
@@ -15,6 +15,8 @@
 #include <concepts>
 #include <type_traits>
 
+#include "test_macros.h"
+
 struct Empty {};
 
 struct Defaulted {
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.moveconstructible/move_constructible.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.moveconstructible/move_constructible.compile.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.moveconstructible/move_constructible.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.moveconstructible/move_constructible.compile.pass.cpp
@@ -15,6 +15,7 @@
 #include <concepts>
 #include <type_traits>
 
+#include "test_macros.h"
 #include "type_classification/moveconstructible.h"
 
 static_assert(std::move_constructible<int>);
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.same/same_as.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.same/same_as.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.same/same_as.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.same/same_as.pass.cpp
@@ -15,6 +15,8 @@
 #include <concepts>
 #include <type_traits>
 
+#include "test_macros.h"
+
 struct S1 {};
 struct S2 {
   int i;
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.swappable/swappable_with.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.swappable/swappable_with.compile.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concept.swappable/swappable_with.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.swappable/swappable_with.compile.pass.cpp
@@ -27,6 +27,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include "test_macros.h"
 #include "type_classification/moveconstructible.h"
 #include "type_classification/swappable.h"
 
diff --git a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/arithmetic.h b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/arithmetic.h
--- a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/arithmetic.h
+++ b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/arithmetic.h
@@ -10,6 +10,8 @@
 
 #include <concepts>
 
+#include "test_macros.h"
+
 // This overload should never be called. It exists solely to force subsumption.
 template <std::integral I>
 constexpr bool CheckSubsumption(I) {
diff --git a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/floating_point.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/floating_point.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/floating_point.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/floating_point.pass.cpp
@@ -16,6 +16,7 @@
 #include <type_traits>
 
 #include "arithmetic.h"
+#include "test_macros.h"
 
 template <typename T>
 constexpr bool CheckFloatingPointQualifiers() {
diff --git a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp
@@ -16,6 +16,7 @@
 #include <type_traits>
 
 #include "arithmetic.h"
+#include "test_macros.h"
 
 template <typename T>
 constexpr bool CheckIntegralQualifiers() {
diff --git a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp
@@ -16,6 +16,7 @@
 #include <type_traits>
 
 #include "arithmetic.h"
+#include "test_macros.h"
 
 template <typename T>
 constexpr bool CheckSignedIntegralQualifiers() {
diff --git a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp
--- a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp
@@ -16,6 +16,7 @@
 #include <type_traits>
 
 #include "arithmetic.h"
+#include "test_macros.h"
 
 template <typename T>
 constexpr bool CheckUnsignedIntegralQualifiers() {
diff --git a/libcxx/test/std/language.support/cmp/cmp.categories.pre/zero_type.verify.cpp b/libcxx/test/std/language.support/cmp/cmp.categories.pre/zero_type.verify.cpp
--- a/libcxx/test/std/language.support/cmp/cmp.categories.pre/zero_type.verify.cpp
+++ b/libcxx/test/std/language.support/cmp/cmp.categories.pre/zero_type.verify.cpp
@@ -20,6 +20,8 @@
 
 #include <compare>
 
+#include "test_macros.h"
+
 #define TEST_FAIL(v, op)                                                       \
   void(v op 0L);                                                               \
   void(0L op v);                                                               \
diff --git a/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp b/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp
--- a/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp
+++ b/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp
@@ -15,6 +15,7 @@
 #include <compare>
 
 #include "compare_types.h"
+#include "test_macros.h"
 
 namespace fundamentals {
 // with default ordering
diff --git a/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable_with.compile.pass.cpp b/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable_with.compile.pass.cpp
--- a/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable_with.compile.pass.cpp
+++ b/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable_with.compile.pass.cpp
@@ -15,6 +15,7 @@
 #include <compare>
 
 #include "compare_types.h"
+#include "test_macros.h"
 
 template <class T, class U = T, typename Cat = std::partial_ordering>
 constexpr bool check_three_way_comparable_with() {
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.verify.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.verify.cpp
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.verify.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size.verify.cpp
@@ -17,6 +17,8 @@
 
 #include <new>
 
+#include "test_macros.h"
+
 int main(int, char**) {
     ::operator new[](4);  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
     return 0;
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.verify.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.verify.cpp
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.verify.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align.verify.cpp
@@ -21,6 +21,8 @@
 
 #include <new>
 
+#include "test_macros.h"
+
 int main(int, char**) {
     ::operator new[](4, std::align_val_t{4});  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
     return 0;
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.verify.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.verify.cpp
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.verify.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_align_nothrow.verify.cpp
@@ -21,6 +21,8 @@
 
 #include <new>
 
+#include "test_macros.h"
+
 int main(int, char**) {
     ::operator new[](4, std::align_val_t{4}, std::nothrow);  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
     return 0;
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.verify.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.verify.cpp
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.verify.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_size_nothrow.verify.cpp
@@ -17,6 +17,8 @@
 
 #include <new>
 
+#include "test_macros.h"
+
 int main(int, char**) {
     ::operator new[](4, std::nothrow);  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
     return 0;
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.verify.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.verify.cpp
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.verify.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align.verify.cpp
@@ -21,6 +21,8 @@
 
 #include <new>
 
+#include "test_macros.h"
+
 int main(int, char**) {
     ::operator new(4, std::align_val_t{4});  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
     return 0;
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.verify.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.verify.cpp
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.verify.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_size_align_nothrow.verify.cpp
@@ -21,6 +21,8 @@
 
 #include <new>
 
+#include "test_macros.h"
+
 int main(int, char**) {
     ::operator new(4, std::align_val_t{4}, std::nothrow);  // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
     return 0;
diff --git a/libcxx/test/std/language.support/support.dynamic/nothrow_t.fail.cpp b/libcxx/test/std/language.support/support.dynamic/nothrow_t.fail.cpp
--- a/libcxx/test/std/language.support/support.dynamic/nothrow_t.fail.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/nothrow_t.fail.cpp
@@ -18,6 +18,7 @@
 
 #include <new>
 
+#include "test_macros.h"
 
 std::nothrow_t f() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}}
 
diff --git a/libcxx/test/std/language.support/support.dynamic/nothrow_t.pass.cpp b/libcxx/test/std/language.support/support.dynamic/nothrow_t.pass.cpp
--- a/libcxx/test/std/language.support/support.dynamic/nothrow_t.pass.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/nothrow_t.pass.cpp
@@ -14,6 +14,7 @@
 
 #include <new>
 
+#include "test_macros.h"
 
 int main(int, char**) {
   std::nothrow_t x = std::nothrow;
diff --git a/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp b/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp
--- a/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp
+++ b/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp
@@ -21,4 +21,6 @@
 #include <cstdlib>
 #include <type_traits>
 
+#include "test_macros.h"
+
 static_assert(std::is_same<decltype(std::aligned_alloc(1, 0)), void*>::value, "");
diff --git a/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp b/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp
--- a/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp
+++ b/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp
@@ -26,6 +26,8 @@
 #include <ctime>
 #include <type_traits>
 
+#include "test_macros.h"
+
 #ifndef TIME_UTC
 #error TIME_UTC not defined
 #endif
diff --git a/libcxx/test/std/language.support/support.start.term/quick_exit.pass.cpp b/libcxx/test/std/language.support/support.start.term/quick_exit.pass.cpp
--- a/libcxx/test/std/language.support/support.start.term/quick_exit.pass.cpp
+++ b/libcxx/test/std/language.support/support.start.term/quick_exit.pass.cpp
@@ -18,6 +18,8 @@
 
 #include <cstdlib>
 
+#include "test_macros.h"
+
 void f() {}
 
 int main(int, char**) {
diff --git a/libcxx/test/std/language.support/support.types/nullptr_t_integral_cast.compile.fail.cpp b/libcxx/test/std/language.support/support.types/nullptr_t_integral_cast.compile.fail.cpp
--- a/libcxx/test/std/language.support/support.types/nullptr_t_integral_cast.compile.fail.cpp
+++ b/libcxx/test/std/language.support/support.types/nullptr_t_integral_cast.compile.fail.cpp
@@ -10,6 +10,8 @@
 
 #include <cstddef>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::ptrdiff_t i = static_cast<std::ptrdiff_t>(nullptr);
diff --git a/libcxx/test/std/numerics/bit/bit.cast/bit_cast.compile.pass.cpp b/libcxx/test/std/numerics/bit/bit.cast/bit_cast.compile.pass.cpp
--- a/libcxx/test/std/numerics/bit/bit.cast/bit_cast.compile.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bit.cast/bit_cast.compile.pass.cpp
@@ -28,6 +28,8 @@
 #include <bit>
 #include <concepts>
 
+#include "test_macros.h"
+
 template<class To, class From>
 concept bit_cast_is_valid = requires(From from) {
     { std::bit_cast<To>(from) } -> std::same_as<To>;
diff --git a/libcxx/test/std/numerics/bit/bit.cast/bit_cast.pass.cpp b/libcxx/test/std/numerics/bit/bit.cast/bit_cast.pass.cpp
--- a/libcxx/test/std/numerics/bit/bit.cast/bit_cast.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bit.cast/bit_cast.pass.cpp
@@ -21,6 +21,8 @@
 #include <cstring>
 #include <limits>
 
+#include "test_macros.h"
+
 // std::bit_cast does not preserve padding bits, so if T has padding bits,
 // the results might not memcmp cleanly.
 template<bool HasUniqueObjectRepresentations = true, typename T>
diff --git a/libcxx/test/std/numerics/c.math/abs.verify.cpp b/libcxx/test/std/numerics/c.math/abs.verify.cpp
--- a/libcxx/test/std/numerics/c.math/abs.verify.cpp
+++ b/libcxx/test/std/numerics/c.math/abs.verify.cpp
@@ -8,6 +8,8 @@
 
 #include <cmath>
 
+#include "test_macros.h"
+
 void f() {
     unsigned int ui = -5;
     (void)std::abs(ui); // expected-error {{call to 'abs' is ambiguous}}
diff --git a/libcxx/test/std/numerics/complex.number/cases.h b/libcxx/test/std/numerics/complex.number/cases.h
--- a/libcxx/test/std/numerics/complex.number/cases.h
+++ b/libcxx/test/std/numerics/complex.number/cases.h
@@ -16,6 +16,8 @@
 #include <complex>
 #include <cassert>
 
+#include "test_macros.h"
+
 const std::complex<double> testcases[] =
 {
     std::complex<double>( 1.e-6,  1.e-6),
diff --git a/libcxx/test/std/numerics/complex.number/cmplx.over/UDT_is_rejected.fail.cpp b/libcxx/test/std/numerics/complex.number/cmplx.over/UDT_is_rejected.fail.cpp
--- a/libcxx/test/std/numerics/complex.number/cmplx.over/UDT_is_rejected.fail.cpp
+++ b/libcxx/test/std/numerics/complex.number/cmplx.over/UDT_is_rejected.fail.cpp
@@ -15,6 +15,8 @@
 #include <type_traits>
 #include <cassert>
 
+#include "test_macros.h"
+
 template <class IntT>
 struct UDT {
   operator IntT() const { return 1; }
diff --git a/libcxx/test/std/numerics/complex.number/complex.special/double_long_double_implicit.compile.fail.cpp b/libcxx/test/std/numerics/complex.number/complex.special/double_long_double_implicit.compile.fail.cpp
--- a/libcxx/test/std/numerics/complex.number/complex.special/double_long_double_implicit.compile.fail.cpp
+++ b/libcxx/test/std/numerics/complex.number/complex.special/double_long_double_implicit.compile.fail.cpp
@@ -17,6 +17,8 @@
 #include <complex>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     const std::complex<long double> cd(2.5, 3.5);
diff --git a/libcxx/test/std/numerics/complex.number/complex.special/float_double_implicit.compile.fail.cpp b/libcxx/test/std/numerics/complex.number/complex.special/float_double_implicit.compile.fail.cpp
--- a/libcxx/test/std/numerics/complex.number/complex.special/float_double_implicit.compile.fail.cpp
+++ b/libcxx/test/std/numerics/complex.number/complex.special/float_double_implicit.compile.fail.cpp
@@ -17,6 +17,8 @@
 #include <complex>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     const std::complex<double> cd(2.5, 3.5);
diff --git a/libcxx/test/std/numerics/complex.number/complex.special/float_long_double_implicit.compile.fail.cpp b/libcxx/test/std/numerics/complex.number/complex.special/float_long_double_implicit.compile.fail.cpp
--- a/libcxx/test/std/numerics/complex.number/complex.special/float_long_double_implicit.compile.fail.cpp
+++ b/libcxx/test/std/numerics/complex.number/complex.special/float_long_double_implicit.compile.fail.cpp
@@ -17,6 +17,8 @@
 #include <complex>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     const std::complex<long double> cd(2.5, 3.5);
diff --git a/libcxx/test/std/numerics/numarray/template.gslice.array/default.compile.fail.cpp b/libcxx/test/std/numerics/numarray/template.gslice.array/default.compile.fail.cpp
--- a/libcxx/test/std/numerics/numarray/template.gslice.array/default.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numarray/template.gslice.array/default.compile.fail.cpp
@@ -15,6 +15,8 @@
 #include <valarray>
 #include <type_traits>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::gslice_array<int> gs;
diff --git a/libcxx/test/std/numerics/numarray/template.indirect.array/default.compile.fail.cpp b/libcxx/test/std/numerics/numarray/template.indirect.array/default.compile.fail.cpp
--- a/libcxx/test/std/numerics/numarray/template.indirect.array/default.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numarray/template.indirect.array/default.compile.fail.cpp
@@ -15,6 +15,8 @@
 #include <valarray>
 #include <type_traits>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::indirect_array<int> ia;
diff --git a/libcxx/test/std/numerics/numarray/template.mask.array/default.compile.fail.cpp b/libcxx/test/std/numerics/numarray/template.mask.array/default.compile.fail.cpp
--- a/libcxx/test/std/numerics/numarray/template.mask.array/default.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numarray/template.mask.array/default.compile.fail.cpp
@@ -15,6 +15,8 @@
 #include <valarray>
 #include <type_traits>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::mask_array<int> s;
diff --git a/libcxx/test/std/numerics/numarray/template.slice.array/default.compile.fail.cpp b/libcxx/test/std/numerics/numarray/template.slice.array/default.compile.fail.cpp
--- a/libcxx/test/std/numerics/numarray/template.slice.array/default.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numarray/template.slice.array/default.compile.fail.cpp
@@ -15,6 +15,8 @@
 #include <valarray>
 #include <type_traits>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::slice_array<int> s;
diff --git a/libcxx/test/std/numerics/numbers/defined.pass.cpp b/libcxx/test/std/numerics/numbers/defined.pass.cpp
--- a/libcxx/test/std/numerics/numbers/defined.pass.cpp
+++ b/libcxx/test/std/numerics/numbers/defined.pass.cpp
@@ -11,6 +11,8 @@
 
 #include <numbers>
 
+#include "test_macros.h"
+
 constexpr bool tests() {
   [[maybe_unused]] const double* dd0{&std::numbers::e};
   [[maybe_unused]] const double* dd1{&std::numbers::log2e};
diff --git a/libcxx/test/std/numerics/numbers/illformed.verify.cpp b/libcxx/test/std/numerics/numbers/illformed.verify.cpp
--- a/libcxx/test/std/numerics/numbers/illformed.verify.cpp
+++ b/libcxx/test/std/numerics/numbers/illformed.verify.cpp
@@ -11,6 +11,8 @@
 
 #include <numbers>
 
+#include "test_macros.h"
+
 // Initializing the primary template is ill-formed.
 int log2e{std::numbers::log2e_v<
     int>}; // expected-error-re@numbers:* {{static_assert failed {{.*}} "A program that instantiates a primary template of a mathematical constant variable template is ill-formed."}}
diff --git a/libcxx/test/std/numerics/numbers/specialize.pass.cpp b/libcxx/test/std/numerics/numbers/specialize.pass.cpp
--- a/libcxx/test/std/numerics/numbers/specialize.pass.cpp
+++ b/libcxx/test/std/numerics/numbers/specialize.pass.cpp
@@ -12,6 +12,8 @@
 #include <cassert>
 #include <numbers>
 
+#include "test_macros.h"
+
 constexpr bool tests() {
   [[maybe_unused]] float f0{std::numbers::e_v<float>};
   [[maybe_unused]] float f1{std::numbers::log2e_v<float>};
diff --git a/libcxx/test/std/numerics/numbers/user_type.pass.cpp b/libcxx/test/std/numerics/numbers/user_type.pass.cpp
--- a/libcxx/test/std/numerics/numbers/user_type.pass.cpp
+++ b/libcxx/test/std/numerics/numbers/user_type.pass.cpp
@@ -11,6 +11,8 @@
 
 #include <numbers>
 
+#include "test_macros.h"
+
 struct user {
   int value;
 };
diff --git a/libcxx/test/std/numerics/numbers/value.pass.cpp b/libcxx/test/std/numerics/numbers/value.pass.cpp
--- a/libcxx/test/std/numerics/numbers/value.pass.cpp
+++ b/libcxx/test/std/numerics/numbers/value.pass.cpp
@@ -12,6 +12,8 @@
 #include <cassert>
 #include <numbers>
 
+#include "test_macros.h"
+
 constexpr bool tests() {
   assert(std::numbers::e == 0x1.5bf0a8b145769p+1);
   assert(std::numbers::e_v<double> == 0x1.5bf0a8b145769p+1);
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool1.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool1.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool1.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool1.compile.fail.cpp
@@ -17,6 +17,8 @@
 
 #include <numeric>
 
+#include "test_macros.h"
+
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool2.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool2.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool2.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool2.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool3.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool3.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool3.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool3.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool4.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool4.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool4.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool4.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral1.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral1.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral1.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral1.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral2.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral2.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral2.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral2.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool1.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool1.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool1.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool1.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool2.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool2.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool2.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool2.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool3.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool3.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool3.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool3.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool4.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool4.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool4.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool4.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral1.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral1.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral1.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral1.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral2.compile.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral2.compile.fail.cpp
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral2.compile.fail.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral2.compile.fail.cpp
@@ -17,6 +17,7 @@
 
 #include <numeric>
 
+#include "test_macros.h"
 
 int main(int, char**)
 {
diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp
--- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp
@@ -20,6 +20,8 @@
 #include <vector>
 #include <cassert>
 
+#include "test_macros.h"
+
 template <class T>
 inline
 T
diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp
--- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp
@@ -20,6 +20,8 @@
 #include <vector>
 #include <cassert>
 
+#include "test_macros.h"
+
 template <class T>
 inline
 T
diff --git a/libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.fail.cpp b/libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.fail.cpp
--- a/libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.fail.cpp
+++ b/libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.fail.cpp
@@ -15,6 +15,8 @@
 
 #include <random>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     typedef unsigned long long T;
diff --git a/libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp b/libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp
--- a/libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp
@@ -14,6 +14,8 @@
 
 #include <random>
 
+#include "test_macros.h"
+
 static_assert(std::uniform_random_bit_generator<
               std::linear_congruential_engine<unsigned int, 0U, 1U, 2U> >);
 
diff --git a/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/assign.compile.fail.cpp b/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/assign.compile.fail.cpp
--- a/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/assign.compile.fail.cpp
+++ b/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/assign.compile.fail.cpp
@@ -14,6 +14,8 @@
 
 #include <random>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::seed_seq s0;
diff --git a/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/copy.compile.fail.cpp b/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/copy.compile.fail.cpp
--- a/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/copy.compile.fail.cpp
+++ b/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/copy.compile.fail.cpp
@@ -14,6 +14,8 @@
 
 #include <random>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::seed_seq s0;