diff --git a/compilation_tests/ctest_extents_ctors.cpp b/compilation_tests/ctest_extents_ctors.cpp
index f72f75c5..6ffa4346 100644
--- a/compilation_tests/ctest_extents_ctors.cpp
+++ b/compilation_tests/ctest_extents_ctors.cpp
@@ -15,7 +15,7 @@
 //@HEADER
 #include "ctest_common.hpp"
 
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 
 
diff --git a/compilation_tests/ctest_extents_type_check.cpp b/compilation_tests/ctest_extents_type_check.cpp
index b4d3c3f5..0b792a5b 100644
--- a/compilation_tests/ctest_extents_type_check.cpp
+++ b/compilation_tests/ctest_extents_type_check.cpp
@@ -15,7 +15,7 @@
 //@HEADER
 #include "ctest_common.hpp"
 
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 
 using E1 = md::extents<int32_t, md::dynamic_extent, 3>;
diff --git a/compilation_tests/ctest_layout_convertible.cpp b/compilation_tests/ctest_layout_convertible.cpp
index d55d19c6..afd4eee9 100644
--- a/compilation_tests/ctest_layout_convertible.cpp
+++ b/compilation_tests/ctest_layout_convertible.cpp
@@ -15,7 +15,7 @@
 //@HEADER
 #include "ctest_common.hpp"
 
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 
 struct NotARealLayout {
diff --git a/compilation_tests/ctest_layout_type_check.cpp b/compilation_tests/ctest_layout_type_check.cpp
index 31530e7b..f4eb24c5 100644
--- a/compilation_tests/ctest_layout_type_check.cpp
+++ b/compilation_tests/ctest_layout_type_check.cpp
@@ -15,7 +15,7 @@
 //@HEADER
 #include "ctest_common.hpp"
 
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 
 using E1 = md::extents<int32_t, md::dynamic_extent, 3>;
diff --git a/compilation_tests/ctest_mdspan_convertible.cpp b/compilation_tests/ctest_mdspan_convertible.cpp
index f0259197..82b89940 100644
--- a/compilation_tests/ctest_mdspan_convertible.cpp
+++ b/compilation_tests/ctest_mdspan_convertible.cpp
@@ -15,7 +15,7 @@
 //@HEADER
 #include "ctest_common.hpp"
 
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 #include <type_traits>
 
diff --git a/compilation_tests/ctest_no_unique_address.cpp b/compilation_tests/ctest_no_unique_address.cpp
index ec1368af..677c71c1 100644
--- a/compilation_tests/ctest_no_unique_address.cpp
+++ b/compilation_tests/ctest_no_unique_address.cpp
@@ -15,7 +15,7 @@
 //@HEADER
 #include "ctest_common.hpp"
 
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 #include <type_traits>
 
diff --git a/compilation_tests/ctest_standard_layout.cpp b/compilation_tests/ctest_standard_layout.cpp
index 7222ec77..0d45bb54 100644
--- a/compilation_tests/ctest_standard_layout.cpp
+++ b/compilation_tests/ctest_standard_layout.cpp
@@ -15,7 +15,7 @@
 //@HEADER
 #include "ctest_common.hpp"
 
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 #include <type_traits>
 
diff --git a/compilation_tests/ctest_trivially_copyable.cpp b/compilation_tests/ctest_trivially_copyable.cpp
index a80fc23f..6a54300b 100644
--- a/compilation_tests/ctest_trivially_copyable.cpp
+++ b/compilation_tests/ctest_trivially_copyable.cpp
@@ -15,7 +15,7 @@
 //@HEADER
 #include "ctest_common.hpp"
 
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 #include <type_traits>
 
diff --git a/examples/aligned_accessor/aligned_accessor.cpp b/examples/aligned_accessor/aligned_accessor.cpp
index 7f0e7fee..99e29776 100644
--- a/examples/aligned_accessor/aligned_accessor.cpp
+++ b/examples/aligned_accessor/aligned_accessor.cpp
@@ -13,7 +13,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //@HEADER
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 // Just checking __cpp_lib_int_pow2 isn't enough for some GCC versions.
 // The <bit> header exists, but std::has_single_bit does not.
diff --git a/examples/dot_product/dot_product.cpp b/examples/dot_product/dot_product.cpp
index c0c32af8..a460aaf4 100644
--- a/examples/dot_product/dot_product.cpp
+++ b/examples/dot_product/dot_product.cpp
@@ -13,7 +13,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //@HEADER
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 #include <iostream>
 #include <iomanip>
diff --git a/examples/godbolt_starter/godbolt_starter.cpp b/examples/godbolt_starter/godbolt_starter.cpp
index 06123f25..9acb58e0 100644
--- a/examples/godbolt_starter/godbolt_starter.cpp
+++ b/examples/godbolt_starter/godbolt_starter.cpp
@@ -16,7 +16,7 @@
 
 #if defined(_MDSPAN_USE_CLASS_TEMPLATE_ARGUMENT_DEDUCTION)
 // https://godbolt.org/z/ehErvsTce
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 #include <iostream>
 
 
diff --git a/examples/restrict_accessor/restrict_accessor.cpp b/examples/restrict_accessor/restrict_accessor.cpp
index 85151a7b..b43b1ff1 100644
--- a/examples/restrict_accessor/restrict_accessor.cpp
+++ b/examples/restrict_accessor/restrict_accessor.cpp
@@ -13,7 +13,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //@HEADER
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 #include <cassert>
 #include <chrono>
diff --git a/examples/tiled_layout/simple_tiled_layout.cpp b/examples/tiled_layout/simple_tiled_layout.cpp
index ee8c868f..a7d968a6 100644
--- a/examples/tiled_layout/simple_tiled_layout.cpp
+++ b/examples/tiled_layout/simple_tiled_layout.cpp
@@ -13,7 +13,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //@HEADER
-#include <experimental/mdspan>
+#include <mdspan.hpp>
 
 #include <cassert>
 #include <iostream>