From 630bdd010b80f1f6d6eba047db662fb9b531cda6 Mon Sep 17 00:00:00 2001
From: Dan Katz <katzdm@gmail.com>
Date: Tue, 24 Jun 2025 11:01:59 -0400
Subject: [PATCH] Update test includes.

---
 .../test/std/experimental/reflection/define-aggregate.pass.cpp | 2 +-
 .../std/experimental/reflection/define-aggregate.verify.cpp    | 2 +-
 .../std/experimental/reflection/entity-classification.pass.cpp | 2 +-
 .../test/std/experimental/reflection/entity-proxies.pass.cpp   | 2 +-
 libcxx/test/std/experimental/reflection/example-module.cppm    | 2 +-
 libcxx/test/std/experimental/reflection/layout.pass.cpp        | 2 +-
 .../experimental/reflection/linkage-and-storage-class.pass.cpp | 2 +-
 .../std/experimental/reflection/member-classification.pass.cpp | 2 +-
 .../std/experimental/reflection/member-visibility.pass.cpp     | 2 +-
 .../experimental/reflection/members-and-subobjects.pass.cpp    | 2 +-
 .../test/std/experimental/reflection/meta-type-traits.pass.cpp | 2 +-
 libcxx/test/std/experimental/reflection/miscellaneous.pass.cpp | 2 +-
 libcxx/test/std/experimental/reflection/module-imports.sh.cpp  | 2 +-
 libcxx/test/std/experimental/reflection/names.pass.cpp         | 2 +-
 .../experimental/reflection/p2996-ex-alt-named-tuple.pass.cpp  | 3 ++-
 .../reflection/p2996-ex-compile-time-ticket-counter.pass.cpp   | 2 +-
 .../reflection/p2996-ex-emulating-typeful-reflection.pass.cpp  | 2 +-
 .../experimental/reflection/p2996-ex-enum-to-string.pass.cpp   | 2 +-
 .../reflection/p2996-ex-getting-class-layout.pass.cpp          | 2 +-
 .../p2996-ex-list-of-types-to-list-of-sizes.pass.cpp           | 2 +-
 .../reflection/p2996-ex-make-integer-sequence.pass.cpp         | 2 +-
 .../std/experimental/reflection/p2996-ex-named-tuple.pass.cpp  | 2 +-
 .../reflection/p2996-ex-parsing-command-line-options-1.sh.cpp  | 2 +-
 .../reflection/p2996-ex-parsing-command-line-options-2.sh.cpp  | 2 +-
 .../reflection/p2996-ex-selecting-members-pt2.pass.cpp         | 2 +-
 .../reflection/p2996-ex-selecting-members-pt3.pass.cpp         | 2 +-
 .../reflection/p2996-ex-simple-tuple-type.pass.cpp             | 2 +-
 .../reflection/p2996-ex-struct-to-struct-of-arrays.pass.cpp    | 2 +-
 .../experimental/reflection/p2996-ex-struct-to-tuple.pass.cpp  | 2 +-
 .../std/experimental/reflection/p2996-ex-tuple-cat.pass.cpp    | 2 +-
 .../reflection/p2996-ex-universal-formatter.sh.cpp             | 2 +-
 .../std/experimental/reflection/p3096-fn-parameters.pass.cpp   | 2 +-
 .../experimental/reflection/p3289-consteval-blocks.verify.cpp  | 2 +-
 .../std/experimental/reflection/p3394-annotations.pass.cpp     | 2 +-
 .../test/std/experimental/reflection/reflect-invoke.pass.cpp   | 2 +-
 .../test/std/experimental/reflection/reflect-invoke.verify.cpp | 2 +-
 .../std/experimental/reflection/related-reflections.pass.cpp   | 2 +-
 .../test/std/experimental/reflection/source-location.pass.cpp  | 2 +-
 libcxx/test/std/experimental/reflection/static-arrays.pass.cpp | 2 +-
 libcxx/test/std/experimental/reflection/substitute.verify.cpp  | 2 +-
 .../std/experimental/reflection/template-arguments.pass.cpp    | 2 +-
 .../std/experimental/reflection/to-and-from-values.pass.cpp    | 2 +-
 .../std/experimental/reflection/to-and-from-values.verify.cpp  | 2 +-
 43 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/libcxx/test/std/experimental/reflection/define-aggregate.pass.cpp b/libcxx/test/std/experimental/reflection/define-aggregate.pass.cpp
index 2dc6d6b1dee2..8c7e7ab2e460 100644
--- a/libcxx/test/std/experimental/reflection/define-aggregate.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/define-aggregate.pass.cpp
@@ -19,7 +19,7 @@
 //
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <print>
 
diff --git a/libcxx/test/std/experimental/reflection/define-aggregate.verify.cpp b/libcxx/test/std/experimental/reflection/define-aggregate.verify.cpp
index f0e0a99accc6..4926b12792d7 100644
--- a/libcxx/test/std/experimental/reflection/define-aggregate.verify.cpp
+++ b/libcxx/test/std/experimental/reflection/define-aggregate.verify.cpp
@@ -17,7 +17,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 #include <print>
 
diff --git a/libcxx/test/std/experimental/reflection/entity-classification.pass.cpp b/libcxx/test/std/experimental/reflection/entity-classification.pass.cpp
index 1046760e0ab9..01c6e44e327b 100644
--- a/libcxx/test/std/experimental/reflection/entity-classification.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/entity-classification.pass.cpp
@@ -15,7 +15,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 #include <tuple>
 
 
diff --git a/libcxx/test/std/experimental/reflection/entity-proxies.pass.cpp b/libcxx/test/std/experimental/reflection/entity-proxies.pass.cpp
index 6b1ab251da3a..96ec80c454d2 100644
--- a/libcxx/test/std/experimental/reflection/entity-proxies.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/entity-proxies.pass.cpp
@@ -17,7 +17,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 constexpr auto ctx = std::meta::access_context::current();
diff --git a/libcxx/test/std/experimental/reflection/example-module.cppm b/libcxx/test/std/experimental/reflection/example-module.cppm
index 435a3bb55da4..7bf598da440e 100644
--- a/libcxx/test/std/experimental/reflection/example-module.cppm
+++ b/libcxx/test/std/experimental/reflection/example-module.cppm
@@ -1,5 +1,5 @@
 module;
-#include <experimental/meta>
+#include <meta>
 
 export module Example;
 namespace Example {
diff --git a/libcxx/test/std/experimental/reflection/layout.pass.cpp b/libcxx/test/std/experimental/reflection/layout.pass.cpp
index 3b9d6839c81e..3414bcec27b2 100644
--- a/libcxx/test/std/experimental/reflection/layout.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/layout.pass.cpp
@@ -15,7 +15,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 using int_alias = int;
diff --git a/libcxx/test/std/experimental/reflection/linkage-and-storage-class.pass.cpp b/libcxx/test/std/experimental/reflection/linkage-and-storage-class.pass.cpp
index ba5c17a63cbb..932556fb6da1 100644
--- a/libcxx/test/std/experimental/reflection/linkage-and-storage-class.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/linkage-and-storage-class.pass.cpp
@@ -18,7 +18,7 @@
 
 module;
 
-#include <experimental/meta>
+#include <meta>
 
 
                          // ==========================
diff --git a/libcxx/test/std/experimental/reflection/member-classification.pass.cpp b/libcxx/test/std/experimental/reflection/member-classification.pass.cpp
index ce0902383593..ac0b0c4ccbb9 100644
--- a/libcxx/test/std/experimental/reflection/member-classification.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/member-classification.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 constexpr auto ctx = std::meta::access_context::unchecked();
diff --git a/libcxx/test/std/experimental/reflection/member-visibility.pass.cpp b/libcxx/test/std/experimental/reflection/member-visibility.pass.cpp
index 08abb5743596..104e735749bf 100644
--- a/libcxx/test/std/experimental/reflection/member-visibility.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/member-visibility.pass.cpp
@@ -15,7 +15,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 using std::meta::access_context;
diff --git a/libcxx/test/std/experimental/reflection/members-and-subobjects.pass.cpp b/libcxx/test/std/experimental/reflection/members-and-subobjects.pass.cpp
index 5d1a08730921..dbaff25219bc 100644
--- a/libcxx/test/std/experimental/reflection/members-and-subobjects.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/members-and-subobjects.pass.cpp
@@ -17,7 +17,7 @@
 //
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <print>
 #include <tuple>
diff --git a/libcxx/test/std/experimental/reflection/meta-type-traits.pass.cpp b/libcxx/test/std/experimental/reflection/meta-type-traits.pass.cpp
index 78e983917b9a..babdb2b7bf98 100644
--- a/libcxx/test/std/experimental/reflection/meta-type-traits.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/meta-type-traits.pass.cpp
@@ -15,7 +15,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 struct C {};
diff --git a/libcxx/test/std/experimental/reflection/miscellaneous.pass.cpp b/libcxx/test/std/experimental/reflection/miscellaneous.pass.cpp
index e26e5701c91f..1fade2bd3709 100644
--- a/libcxx/test/std/experimental/reflection/miscellaneous.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/miscellaneous.pass.cpp
@@ -19,7 +19,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <algorithm>
 #include <array>
diff --git a/libcxx/test/std/experimental/reflection/module-imports.sh.cpp b/libcxx/test/std/experimental/reflection/module-imports.sh.cpp
index 4e440cabd64b..e82eabfdac0d 100644
--- a/libcxx/test/std/experimental/reflection/module-imports.sh.cpp
+++ b/libcxx/test/std/experimental/reflection/module-imports.sh.cpp
@@ -11,7 +11,7 @@
 // RUN: %t/module-imports.sh.cpp.tsk > %t/stdout.txt
 
 // expected-no-diagnostics
-#include <experimental/meta>
+#include <meta>
 #include <print>
 
 import Example;
diff --git a/libcxx/test/std/experimental/reflection/names.pass.cpp b/libcxx/test/std/experimental/reflection/names.pass.cpp
index 53d4697ca666..bc121c4af91b 100644
--- a/libcxx/test/std/experimental/reflection/names.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/names.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 constexpr auto ctx = std::meta::access_context::unchecked();
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-alt-named-tuple.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-alt-named-tuple.pass.cpp
index 7e6ba6705997..709eccb1f70c 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-alt-named-tuple.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-alt-named-tuple.pass.cpp
@@ -17,7 +17,8 @@
 //
 // RUN: %{build}
 
-#include <experimental/meta>
+#include <meta>
+
 #include <algorithm>
 
 
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-compile-time-ticket-counter.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-compile-time-ticket-counter.pass.cpp
index 95ca971c53c2..083ee14c2c05 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-compile-time-ticket-counter.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-compile-time-ticket-counter.pass.cpp
@@ -18,7 +18,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <print>
 
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-emulating-typeful-reflection.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-emulating-typeful-reflection.pass.cpp
index d3278d92fcd4..69da56b15645 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-emulating-typeful-reflection.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-emulating-typeful-reflection.pass.cpp
@@ -18,7 +18,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <algorithm>
 #include <array>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-enum-to-string.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-enum-to-string.pass.cpp
index ac779cb8e0b2..f08580b276d4 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-enum-to-string.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-enum-to-string.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 #include <print>
 #include <type_traits>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-getting-class-layout.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-getting-class-layout.pass.cpp
index bd58f865cc5b..d7735f34ac45 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-getting-class-layout.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-getting-class-layout.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 #include <array>
 #include <cstdlib>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-list-of-types-to-list-of-sizes.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-list-of-types-to-list-of-sizes.pass.cpp
index 84614b977825..15bc07b049cf 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-list-of-types-to-list-of-sizes.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-list-of-types-to-list-of-sizes.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 #include <array>
 #include <ranges>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-make-integer-sequence.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-make-integer-sequence.pass.cpp
index f64767f2a783..8366dbafa972 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-make-integer-sequence.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-make-integer-sequence.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 #include <utility>
 #include <vector>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-named-tuple.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-named-tuple.pass.cpp
index 23f9342d4121..c0eeaaf0102f 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-named-tuple.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-named-tuple.pass.cpp
@@ -19,7 +19,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <algorithm>
 #include <string_view>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-parsing-command-line-options-1.sh.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-parsing-command-line-options-1.sh.cpp
index a184a5dd0210..bf40aef396ad 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-parsing-command-line-options-1.sh.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-parsing-command-line-options-1.sh.cpp
@@ -20,7 +20,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe --count 42 > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <iostream>
 #include <sstream>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-parsing-command-line-options-2.sh.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-parsing-command-line-options-2.sh.cpp
index 7a7d8c58f87b..f9f9e043306e 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-parsing-command-line-options-2.sh.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-parsing-command-line-options-2.sh.cpp
@@ -19,7 +19,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe -n WG21 --count 5 > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <iostream>
 #include <sstream>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-selecting-members-pt2.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-selecting-members-pt2.pass.cpp
index b95f63666573..e08c4906cb7c 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-selecting-members-pt2.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-selecting-members-pt2.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 struct S { unsigned i:2, j:6; };
 
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-selecting-members-pt3.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-selecting-members-pt3.pass.cpp
index 26531b2df8ea..1d97f07f02d6 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-selecting-members-pt3.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-selecting-members-pt3.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 struct S { unsigned i:2, j:6; };
 
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-simple-tuple-type.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-simple-tuple-type.pass.cpp
index 8343c01358f3..f1830112e00e 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-simple-tuple-type.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-simple-tuple-type.pass.cpp
@@ -19,7 +19,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <array>
 #include <print>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-struct-to-struct-of-arrays.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-struct-to-struct-of-arrays.pass.cpp
index e8ef9aec64ed..4afc2173b420 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-struct-to-struct-of-arrays.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-struct-to-struct-of-arrays.pass.cpp
@@ -18,7 +18,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <array>
 #include <print>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-struct-to-tuple.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-struct-to-tuple.pass.cpp
index c81feebef8a5..aa717246f3f2 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-struct-to-tuple.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-struct-to-tuple.pass.cpp
@@ -19,7 +19,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <array>
 #include <print>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-tuple-cat.pass.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-tuple-cat.pass.cpp
index 12762ea8af79..68267e62093e 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-tuple-cat.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-tuple-cat.pass.cpp
@@ -18,7 +18,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <print>
 #include <utility>
diff --git a/libcxx/test/std/experimental/reflection/p2996-ex-universal-formatter.sh.cpp b/libcxx/test/std/experimental/reflection/p2996-ex-universal-formatter.sh.cpp
index e4a090abefbe..9fbc3f3af15d 100644
--- a/libcxx/test/std/experimental/reflection/p2996-ex-universal-formatter.sh.cpp
+++ b/libcxx/test/std/experimental/reflection/p2996-ex-universal-formatter.sh.cpp
@@ -19,7 +19,7 @@
 // RUN: %{build}
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 #include <format>
 #include <print>
 
diff --git a/libcxx/test/std/experimental/reflection/p3096-fn-parameters.pass.cpp b/libcxx/test/std/experimental/reflection/p3096-fn-parameters.pass.cpp
index 34ce2ae294cb..4e0a32d696ff 100644
--- a/libcxx/test/std/experimental/reflection/p3096-fn-parameters.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p3096-fn-parameters.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 constexpr auto ctx = std::meta::access_context::unchecked();
diff --git a/libcxx/test/std/experimental/reflection/p3289-consteval-blocks.verify.cpp b/libcxx/test/std/experimental/reflection/p3289-consteval-blocks.verify.cpp
index 09b970078387..8919f7d91375 100644
--- a/libcxx/test/std/experimental/reflection/p3289-consteval-blocks.verify.cpp
+++ b/libcxx/test/std/experimental/reflection/p3289-consteval-blocks.verify.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
                             // =====================
diff --git a/libcxx/test/std/experimental/reflection/p3394-annotations.pass.cpp b/libcxx/test/std/experimental/reflection/p3394-annotations.pass.cpp
index cc07e3b2f142..da352e1a5ee5 100644
--- a/libcxx/test/std/experimental/reflection/p3394-annotations.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/p3394-annotations.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
                                  // ==========
diff --git a/libcxx/test/std/experimental/reflection/reflect-invoke.pass.cpp b/libcxx/test/std/experimental/reflection/reflect-invoke.pass.cpp
index f4580d9106f1..1a4f66c47342 100644
--- a/libcxx/test/std/experimental/reflection/reflect-invoke.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/reflect-invoke.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 #include <array>
 
diff --git a/libcxx/test/std/experimental/reflection/reflect-invoke.verify.cpp b/libcxx/test/std/experimental/reflection/reflect-invoke.verify.cpp
index 933b827fe91f..0813acc150e5 100644
--- a/libcxx/test/std/experimental/reflection/reflect-invoke.verify.cpp
+++ b/libcxx/test/std/experimental/reflection/reflect-invoke.verify.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 namespace NS {
 struct A {
diff --git a/libcxx/test/std/experimental/reflection/related-reflections.pass.cpp b/libcxx/test/std/experimental/reflection/related-reflections.pass.cpp
index 1897952dfcb2..3b1ab6a09a70 100644
--- a/libcxx/test/std/experimental/reflection/related-reflections.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/related-reflections.pass.cpp
@@ -15,7 +15,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 constexpr auto ctx = std::meta::access_context::current();
diff --git a/libcxx/test/std/experimental/reflection/source-location.pass.cpp b/libcxx/test/std/experimental/reflection/source-location.pass.cpp
index bf287a180061..82b069643b00 100644
--- a/libcxx/test/std/experimental/reflection/source-location.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/source-location.pass.cpp
@@ -18,7 +18,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 constexpr std::source_location loc = std::source_location::current();
diff --git a/libcxx/test/std/experimental/reflection/static-arrays.pass.cpp b/libcxx/test/std/experimental/reflection/static-arrays.pass.cpp
index 17647ab1a340..28da801a7599 100644
--- a/libcxx/test/std/experimental/reflection/static-arrays.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/static-arrays.pass.cpp
@@ -16,7 +16,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 constexpr auto ctx = std::meta::access_context::unchecked();
diff --git a/libcxx/test/std/experimental/reflection/substitute.verify.cpp b/libcxx/test/std/experimental/reflection/substitute.verify.cpp
index 1c20529b2f19..78b05c1c4500 100644
--- a/libcxx/test/std/experimental/reflection/substitute.verify.cpp
+++ b/libcxx/test/std/experimental/reflection/substitute.verify.cpp
@@ -15,7 +15,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 #include <queue>
 #include <tuple>
diff --git a/libcxx/test/std/experimental/reflection/template-arguments.pass.cpp b/libcxx/test/std/experimental/reflection/template-arguments.pass.cpp
index 9813b272dafc..fa1cc7ab24c1 100644
--- a/libcxx/test/std/experimental/reflection/template-arguments.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/template-arguments.pass.cpp
@@ -15,7 +15,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
 constexpr auto ctx = std::meta::access_context::unchecked();
diff --git a/libcxx/test/std/experimental/reflection/to-and-from-values.pass.cpp b/libcxx/test/std/experimental/reflection/to-and-from-values.pass.cpp
index a5c7f19d495c..4ce9babc029c 100644
--- a/libcxx/test/std/experimental/reflection/to-and-from-values.pass.cpp
+++ b/libcxx/test/std/experimental/reflection/to-and-from-values.pass.cpp
@@ -17,7 +17,7 @@
 //
 // RUN: %{exec} %t.exe > %t.stdout
 
-#include <experimental/meta>
+#include <meta>
 
 #include <print>
 #include <utility>
diff --git a/libcxx/test/std/experimental/reflection/to-and-from-values.verify.cpp b/libcxx/test/std/experimental/reflection/to-and-from-values.verify.cpp
index 4877b67f600b..9a0effd26644 100644
--- a/libcxx/test/std/experimental/reflection/to-and-from-values.verify.cpp
+++ b/libcxx/test/std/experimental/reflection/to-and-from-values.verify.cpp
@@ -15,7 +15,7 @@
 //
 // [reflection]
 
-#include <experimental/meta>
+#include <meta>
 
 
                              // ==================