From e5cb48daf0561ea523783bfe9f2ccf8d4ee5fce7 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Sun, 22 Dec 2024 12:29:38 +0100
Subject: [PATCH 01/14] BOOST_MODULE_EXPORT

---
 include/boost/config/modules.hpp | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 include/boost/config/modules.hpp

diff --git a/include/boost/config/modules.hpp b/include/boost/config/modules.hpp
new file mode 100644
index 000000000..5b1a4bd90
--- /dev/null
+++ b/include/boost/config/modules.hpp
@@ -0,0 +1,10 @@
+#ifndef BOOST_CONFIG_MODULES_INCLUDED_HPP
+#define BOOST_CONFIG_MODULES_INCLUDED_HPP
+
+#ifdef BOOST_CXX20_MODULE
+#define BOOST_MODULE_EXPORT export
+#else
+#define BOOST_MODULE_EXPORT
+#endif
+
+#endif
\ No newline at end of file

From 62ab88eae2af4f8d76567a562261b2356eb7e688 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Mon, 30 Dec 2024 16:04:19 +0100
Subject: [PATCH 02/14] Rename config macro to BOOST_USE_MODULES

---
 include/boost/config/modules.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/config/modules.hpp b/include/boost/config/modules.hpp
index 5b1a4bd90..32af51c79 100644
--- a/include/boost/config/modules.hpp
+++ b/include/boost/config/modules.hpp
@@ -1,7 +1,7 @@
 #ifndef BOOST_CONFIG_MODULES_INCLUDED_HPP
 #define BOOST_CONFIG_MODULES_INCLUDED_HPP
 
-#ifdef BOOST_CXX20_MODULE
+#ifdef BOOST_USE_MODULES
 #define BOOST_MODULE_EXPORT export
 #else
 #define BOOST_MODULE_EXPORT

From dcf77026954947f45d566888869a141f041f8cf2 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Fri, 3 Jan 2025 17:22:28 +0100
Subject: [PATCH 03/14] Remove config/modules.hpp

---
 include/boost/config/modules.hpp | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 include/boost/config/modules.hpp

diff --git a/include/boost/config/modules.hpp b/include/boost/config/modules.hpp
deleted file mode 100644
index 32af51c79..000000000
--- a/include/boost/config/modules.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef BOOST_CONFIG_MODULES_INCLUDED_HPP
-#define BOOST_CONFIG_MODULES_INCLUDED_HPP
-
-#ifdef BOOST_USE_MODULES
-#define BOOST_MODULE_EXPORT export
-#else
-#define BOOST_MODULE_EXPORT
-#endif
-
-#endif
\ No newline at end of file

From 60b437b62360cff3b6393b2724a53c40d0d4c1b1 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Tue, 14 Jan 2025 16:54:53 +0100
Subject: [PATCH 04/14] Headers that include/import stdlib according to macro

---
 include/boost/config/std/algorithm.hpp          | 5 +++++
 include/boost/config/std/any.hpp                | 5 +++++
 include/boost/config/std/array.hpp              | 5 +++++
 include/boost/config/std/atomic.hpp             | 5 +++++
 include/boost/config/std/barrier.hpp            | 5 +++++
 include/boost/config/std/bit.hpp                | 5 +++++
 include/boost/config/std/bitset.hpp             | 5 +++++
 include/boost/config/std/cassert.hpp            | 5 +++++
 include/boost/config/std/cctype.hpp             | 5 +++++
 include/boost/config/std/cerrno.hpp             | 5 +++++
 include/boost/config/std/cfenv.hpp              | 5 +++++
 include/boost/config/std/cfloat.hpp             | 5 +++++
 include/boost/config/std/charconv.hpp           | 5 +++++
 include/boost/config/std/chrono.hpp             | 5 +++++
 include/boost/config/std/cinttypes.hpp          | 5 +++++
 include/boost/config/std/climits.hpp            | 5 +++++
 include/boost/config/std/clocale.hpp            | 5 +++++
 include/boost/config/std/cmath.hpp              | 5 +++++
 include/boost/config/std/codecvt.hpp            | 5 +++++
 include/boost/config/std/compare.hpp            | 5 +++++
 include/boost/config/std/complex.hpp            | 5 +++++
 include/boost/config/std/concepts.hpp           | 5 +++++
 include/boost/config/std/condition_variable.hpp | 5 +++++
 include/boost/config/std/coroutine.hpp          | 5 +++++
 include/boost/config/std/csetjmp.hpp            | 5 +++++
 include/boost/config/std/csignal.hpp            | 5 +++++
 include/boost/config/std/cstdarg.hpp            | 5 +++++
 include/boost/config/std/cstddef.hpp            | 5 +++++
 include/boost/config/std/cstdint.hpp            | 5 +++++
 include/boost/config/std/cstdio.hpp             | 5 +++++
 include/boost/config/std/cstdlib.hpp            | 5 +++++
 include/boost/config/std/cstring.hpp            | 5 +++++
 include/boost/config/std/ctime.hpp              | 5 +++++
 include/boost/config/std/cuchar.hpp             | 5 +++++
 include/boost/config/std/cwchar.hpp             | 5 +++++
 include/boost/config/std/cwctype.hpp            | 5 +++++
 include/boost/config/std/debugging.hpp          | 5 +++++
 include/boost/config/std/deque.hpp              | 5 +++++
 include/boost/config/std/exception.hpp          | 5 +++++
 include/boost/config/std/execution.hpp          | 5 +++++
 include/boost/config/std/expected.hpp           | 5 +++++
 include/boost/config/std/filesystem.hpp         | 5 +++++
 include/boost/config/std/flat_map.hpp           | 5 +++++
 include/boost/config/std/flat_set.hpp           | 5 +++++
 include/boost/config/std/format.hpp             | 5 +++++
 include/boost/config/std/forward_list.hpp       | 5 +++++
 include/boost/config/std/fstream.hpp            | 5 +++++
 include/boost/config/std/functional.hpp         | 5 +++++
 include/boost/config/std/future.hpp             | 5 +++++
 include/boost/config/std/generator.hpp          | 5 +++++
 include/boost/config/std/hazard_pointer.hpp     | 5 +++++
 include/boost/config/std/initializer_list.hpp   | 5 +++++
 include/boost/config/std/inplace_vector.hpp     | 5 +++++
 include/boost/config/std/iomanip.hpp            | 5 +++++
 include/boost/config/std/ios.hpp                | 5 +++++
 include/boost/config/std/iosfwd.hpp             | 5 +++++
 include/boost/config/std/iostream.hpp           | 5 +++++
 include/boost/config/std/istream.hpp            | 5 +++++
 include/boost/config/std/iterator.hpp           | 5 +++++
 include/boost/config/std/latch.hpp              | 5 +++++
 include/boost/config/std/limits.hpp             | 5 +++++
 include/boost/config/std/linalg.hpp             | 5 +++++
 include/boost/config/std/list.hpp               | 5 +++++
 include/boost/config/std/locale.hpp             | 5 +++++
 include/boost/config/std/map.hpp                | 5 +++++
 include/boost/config/std/mdspan.hpp             | 5 +++++
 include/boost/config/std/memory.hpp             | 5 +++++
 include/boost/config/std/memory_resource.hpp    | 5 +++++
 include/boost/config/std/mutex.hpp              | 5 +++++
 include/boost/config/std/new.hpp                | 5 +++++
 include/boost/config/std/numbers.hpp            | 5 +++++
 include/boost/config/std/numeric.hpp            | 5 +++++
 include/boost/config/std/optional.hpp           | 5 +++++
 include/boost/config/std/ostream.hpp            | 5 +++++
 include/boost/config/std/print.hpp              | 5 +++++
 include/boost/config/std/queue.hpp              | 5 +++++
 include/boost/config/std/random.hpp             | 5 +++++
 include/boost/config/std/ranges.hpp             | 5 +++++
 include/boost/config/std/ratio.hpp              | 5 +++++
 include/boost/config/std/rcu.hpp                | 5 +++++
 include/boost/config/std/regex.hpp              | 5 +++++
 include/boost/config/std/scoped_allocator.hpp   | 5 +++++
 include/boost/config/std/semaphore.hpp          | 5 +++++
 include/boost/config/std/set.hpp                | 5 +++++
 include/boost/config/std/shared_mutex.hpp       | 5 +++++
 include/boost/config/std/simd.hpp               | 5 +++++
 include/boost/config/std/source_location.hpp    | 5 +++++
 include/boost/config/std/span.hpp               | 5 +++++
 include/boost/config/std/spanstream.hpp         | 5 +++++
 include/boost/config/std/sstream.hpp            | 5 +++++
 include/boost/config/std/stack.hpp              | 5 +++++
 include/boost/config/std/stacktrace.hpp         | 5 +++++
 include/boost/config/std/stdexcept.hpp          | 5 +++++
 include/boost/config/std/stdfloat.hpp           | 5 +++++
 include/boost/config/std/stop_token.hpp         | 5 +++++
 include/boost/config/std/streambuf.hpp          | 5 +++++
 include/boost/config/std/string.hpp             | 5 +++++
 include/boost/config/std/string_view.hpp        | 5 +++++
 include/boost/config/std/strstream.hpp          | 5 +++++
 include/boost/config/std/syncstream.hpp         | 5 +++++
 include/boost/config/std/system_error.hpp       | 5 +++++
 include/boost/config/std/text_encoding.hpp      | 5 +++++
 include/boost/config/std/thread.hpp             | 5 +++++
 include/boost/config/std/tuple.hpp              | 5 +++++
 include/boost/config/std/type_traits.hpp        | 5 +++++
 include/boost/config/std/typeindex.hpp          | 5 +++++
 include/boost/config/std/typeinfo.hpp           | 5 +++++
 include/boost/config/std/unordered_map.hpp      | 5 +++++
 include/boost/config/std/unordered_set.hpp      | 5 +++++
 include/boost/config/std/utility.hpp            | 5 +++++
 include/boost/config/std/valarray.hpp           | 5 +++++
 include/boost/config/std/variant.hpp            | 5 +++++
 include/boost/config/std/vector.hpp             | 5 +++++
 include/boost/config/std/version.hpp            | 5 +++++
 114 files changed, 570 insertions(+)
 create mode 100644 include/boost/config/std/algorithm.hpp
 create mode 100644 include/boost/config/std/any.hpp
 create mode 100644 include/boost/config/std/array.hpp
 create mode 100644 include/boost/config/std/atomic.hpp
 create mode 100644 include/boost/config/std/barrier.hpp
 create mode 100644 include/boost/config/std/bit.hpp
 create mode 100644 include/boost/config/std/bitset.hpp
 create mode 100644 include/boost/config/std/cassert.hpp
 create mode 100644 include/boost/config/std/cctype.hpp
 create mode 100644 include/boost/config/std/cerrno.hpp
 create mode 100644 include/boost/config/std/cfenv.hpp
 create mode 100644 include/boost/config/std/cfloat.hpp
 create mode 100644 include/boost/config/std/charconv.hpp
 create mode 100644 include/boost/config/std/chrono.hpp
 create mode 100644 include/boost/config/std/cinttypes.hpp
 create mode 100644 include/boost/config/std/climits.hpp
 create mode 100644 include/boost/config/std/clocale.hpp
 create mode 100644 include/boost/config/std/cmath.hpp
 create mode 100644 include/boost/config/std/codecvt.hpp
 create mode 100644 include/boost/config/std/compare.hpp
 create mode 100644 include/boost/config/std/complex.hpp
 create mode 100644 include/boost/config/std/concepts.hpp
 create mode 100644 include/boost/config/std/condition_variable.hpp
 create mode 100644 include/boost/config/std/coroutine.hpp
 create mode 100644 include/boost/config/std/csetjmp.hpp
 create mode 100644 include/boost/config/std/csignal.hpp
 create mode 100644 include/boost/config/std/cstdarg.hpp
 create mode 100644 include/boost/config/std/cstddef.hpp
 create mode 100644 include/boost/config/std/cstdint.hpp
 create mode 100644 include/boost/config/std/cstdio.hpp
 create mode 100644 include/boost/config/std/cstdlib.hpp
 create mode 100644 include/boost/config/std/cstring.hpp
 create mode 100644 include/boost/config/std/ctime.hpp
 create mode 100644 include/boost/config/std/cuchar.hpp
 create mode 100644 include/boost/config/std/cwchar.hpp
 create mode 100644 include/boost/config/std/cwctype.hpp
 create mode 100644 include/boost/config/std/debugging.hpp
 create mode 100644 include/boost/config/std/deque.hpp
 create mode 100644 include/boost/config/std/exception.hpp
 create mode 100644 include/boost/config/std/execution.hpp
 create mode 100644 include/boost/config/std/expected.hpp
 create mode 100644 include/boost/config/std/filesystem.hpp
 create mode 100644 include/boost/config/std/flat_map.hpp
 create mode 100644 include/boost/config/std/flat_set.hpp
 create mode 100644 include/boost/config/std/format.hpp
 create mode 100644 include/boost/config/std/forward_list.hpp
 create mode 100644 include/boost/config/std/fstream.hpp
 create mode 100644 include/boost/config/std/functional.hpp
 create mode 100644 include/boost/config/std/future.hpp
 create mode 100644 include/boost/config/std/generator.hpp
 create mode 100644 include/boost/config/std/hazard_pointer.hpp
 create mode 100644 include/boost/config/std/initializer_list.hpp
 create mode 100644 include/boost/config/std/inplace_vector.hpp
 create mode 100644 include/boost/config/std/iomanip.hpp
 create mode 100644 include/boost/config/std/ios.hpp
 create mode 100644 include/boost/config/std/iosfwd.hpp
 create mode 100644 include/boost/config/std/iostream.hpp
 create mode 100644 include/boost/config/std/istream.hpp
 create mode 100644 include/boost/config/std/iterator.hpp
 create mode 100644 include/boost/config/std/latch.hpp
 create mode 100644 include/boost/config/std/limits.hpp
 create mode 100644 include/boost/config/std/linalg.hpp
 create mode 100644 include/boost/config/std/list.hpp
 create mode 100644 include/boost/config/std/locale.hpp
 create mode 100644 include/boost/config/std/map.hpp
 create mode 100644 include/boost/config/std/mdspan.hpp
 create mode 100644 include/boost/config/std/memory.hpp
 create mode 100644 include/boost/config/std/memory_resource.hpp
 create mode 100644 include/boost/config/std/mutex.hpp
 create mode 100644 include/boost/config/std/new.hpp
 create mode 100644 include/boost/config/std/numbers.hpp
 create mode 100644 include/boost/config/std/numeric.hpp
 create mode 100644 include/boost/config/std/optional.hpp
 create mode 100644 include/boost/config/std/ostream.hpp
 create mode 100644 include/boost/config/std/print.hpp
 create mode 100644 include/boost/config/std/queue.hpp
 create mode 100644 include/boost/config/std/random.hpp
 create mode 100644 include/boost/config/std/ranges.hpp
 create mode 100644 include/boost/config/std/ratio.hpp
 create mode 100644 include/boost/config/std/rcu.hpp
 create mode 100644 include/boost/config/std/regex.hpp
 create mode 100644 include/boost/config/std/scoped_allocator.hpp
 create mode 100644 include/boost/config/std/semaphore.hpp
 create mode 100644 include/boost/config/std/set.hpp
 create mode 100644 include/boost/config/std/shared_mutex.hpp
 create mode 100644 include/boost/config/std/simd.hpp
 create mode 100644 include/boost/config/std/source_location.hpp
 create mode 100644 include/boost/config/std/span.hpp
 create mode 100644 include/boost/config/std/spanstream.hpp
 create mode 100644 include/boost/config/std/sstream.hpp
 create mode 100644 include/boost/config/std/stack.hpp
 create mode 100644 include/boost/config/std/stacktrace.hpp
 create mode 100644 include/boost/config/std/stdexcept.hpp
 create mode 100644 include/boost/config/std/stdfloat.hpp
 create mode 100644 include/boost/config/std/stop_token.hpp
 create mode 100644 include/boost/config/std/streambuf.hpp
 create mode 100644 include/boost/config/std/string.hpp
 create mode 100644 include/boost/config/std/string_view.hpp
 create mode 100644 include/boost/config/std/strstream.hpp
 create mode 100644 include/boost/config/std/syncstream.hpp
 create mode 100644 include/boost/config/std/system_error.hpp
 create mode 100644 include/boost/config/std/text_encoding.hpp
 create mode 100644 include/boost/config/std/thread.hpp
 create mode 100644 include/boost/config/std/tuple.hpp
 create mode 100644 include/boost/config/std/type_traits.hpp
 create mode 100644 include/boost/config/std/typeindex.hpp
 create mode 100644 include/boost/config/std/typeinfo.hpp
 create mode 100644 include/boost/config/std/unordered_map.hpp
 create mode 100644 include/boost/config/std/unordered_set.hpp
 create mode 100644 include/boost/config/std/utility.hpp
 create mode 100644 include/boost/config/std/valarray.hpp
 create mode 100644 include/boost/config/std/variant.hpp
 create mode 100644 include/boost/config/std/vector.hpp
 create mode 100644 include/boost/config/std/version.hpp

diff --git a/include/boost/config/std/algorithm.hpp b/include/boost/config/std/algorithm.hpp
new file mode 100644
index 000000000..718e1d3ed
--- /dev/null
+++ b/include/boost/config/std/algorithm.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <algorithm>
+#endif
diff --git a/include/boost/config/std/any.hpp b/include/boost/config/std/any.hpp
new file mode 100644
index 000000000..b939eda58
--- /dev/null
+++ b/include/boost/config/std/any.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <any>
+#endif
diff --git a/include/boost/config/std/array.hpp b/include/boost/config/std/array.hpp
new file mode 100644
index 000000000..89a3ae7c5
--- /dev/null
+++ b/include/boost/config/std/array.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <array>
+#endif
diff --git a/include/boost/config/std/atomic.hpp b/include/boost/config/std/atomic.hpp
new file mode 100644
index 000000000..8f67670ad
--- /dev/null
+++ b/include/boost/config/std/atomic.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <atomic>
+#endif
diff --git a/include/boost/config/std/barrier.hpp b/include/boost/config/std/barrier.hpp
new file mode 100644
index 000000000..9eb1380a2
--- /dev/null
+++ b/include/boost/config/std/barrier.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <barrier>
+#endif
diff --git a/include/boost/config/std/bit.hpp b/include/boost/config/std/bit.hpp
new file mode 100644
index 000000000..aad82433f
--- /dev/null
+++ b/include/boost/config/std/bit.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <bit>
+#endif
diff --git a/include/boost/config/std/bitset.hpp b/include/boost/config/std/bitset.hpp
new file mode 100644
index 000000000..316f4b8ae
--- /dev/null
+++ b/include/boost/config/std/bitset.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <bitset>
+#endif
diff --git a/include/boost/config/std/cassert.hpp b/include/boost/config/std/cassert.hpp
new file mode 100644
index 000000000..27dc8d9fb
--- /dev/null
+++ b/include/boost/config/std/cassert.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cassert>
+#endif
diff --git a/include/boost/config/std/cctype.hpp b/include/boost/config/std/cctype.hpp
new file mode 100644
index 000000000..69cdfda7c
--- /dev/null
+++ b/include/boost/config/std/cctype.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cctype>
+#endif
diff --git a/include/boost/config/std/cerrno.hpp b/include/boost/config/std/cerrno.hpp
new file mode 100644
index 000000000..66f72455b
--- /dev/null
+++ b/include/boost/config/std/cerrno.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cerrno>
+#endif
diff --git a/include/boost/config/std/cfenv.hpp b/include/boost/config/std/cfenv.hpp
new file mode 100644
index 000000000..017d92131
--- /dev/null
+++ b/include/boost/config/std/cfenv.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cfenv>
+#endif
diff --git a/include/boost/config/std/cfloat.hpp b/include/boost/config/std/cfloat.hpp
new file mode 100644
index 000000000..fb3acfece
--- /dev/null
+++ b/include/boost/config/std/cfloat.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cfloat>
+#endif
diff --git a/include/boost/config/std/charconv.hpp b/include/boost/config/std/charconv.hpp
new file mode 100644
index 000000000..736f0aa82
--- /dev/null
+++ b/include/boost/config/std/charconv.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <charconv>
+#endif
diff --git a/include/boost/config/std/chrono.hpp b/include/boost/config/std/chrono.hpp
new file mode 100644
index 000000000..618e5ac90
--- /dev/null
+++ b/include/boost/config/std/chrono.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <chrono>
+#endif
diff --git a/include/boost/config/std/cinttypes.hpp b/include/boost/config/std/cinttypes.hpp
new file mode 100644
index 000000000..1783e45cd
--- /dev/null
+++ b/include/boost/config/std/cinttypes.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cinttypes>
+#endif
diff --git a/include/boost/config/std/climits.hpp b/include/boost/config/std/climits.hpp
new file mode 100644
index 000000000..2216c5c9f
--- /dev/null
+++ b/include/boost/config/std/climits.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <climits>
+#endif
diff --git a/include/boost/config/std/clocale.hpp b/include/boost/config/std/clocale.hpp
new file mode 100644
index 000000000..c4793e6d4
--- /dev/null
+++ b/include/boost/config/std/clocale.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <clocale>
+#endif
diff --git a/include/boost/config/std/cmath.hpp b/include/boost/config/std/cmath.hpp
new file mode 100644
index 000000000..f442afdfc
--- /dev/null
+++ b/include/boost/config/std/cmath.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cmath>
+#endif
diff --git a/include/boost/config/std/codecvt.hpp b/include/boost/config/std/codecvt.hpp
new file mode 100644
index 000000000..dcfeec06f
--- /dev/null
+++ b/include/boost/config/std/codecvt.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <codecvt>
+#endif
diff --git a/include/boost/config/std/compare.hpp b/include/boost/config/std/compare.hpp
new file mode 100644
index 000000000..578a1d381
--- /dev/null
+++ b/include/boost/config/std/compare.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <compare>
+#endif
diff --git a/include/boost/config/std/complex.hpp b/include/boost/config/std/complex.hpp
new file mode 100644
index 000000000..cda8f18cb
--- /dev/null
+++ b/include/boost/config/std/complex.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <complex>
+#endif
diff --git a/include/boost/config/std/concepts.hpp b/include/boost/config/std/concepts.hpp
new file mode 100644
index 000000000..f20af3ff2
--- /dev/null
+++ b/include/boost/config/std/concepts.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <concepts>
+#endif
diff --git a/include/boost/config/std/condition_variable.hpp b/include/boost/config/std/condition_variable.hpp
new file mode 100644
index 000000000..4d382b452
--- /dev/null
+++ b/include/boost/config/std/condition_variable.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <condition_variable>
+#endif
diff --git a/include/boost/config/std/coroutine.hpp b/include/boost/config/std/coroutine.hpp
new file mode 100644
index 000000000..36e3d190c
--- /dev/null
+++ b/include/boost/config/std/coroutine.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <coroutine>
+#endif
diff --git a/include/boost/config/std/csetjmp.hpp b/include/boost/config/std/csetjmp.hpp
new file mode 100644
index 000000000..8fc1905f3
--- /dev/null
+++ b/include/boost/config/std/csetjmp.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <csetjmp>
+#endif
diff --git a/include/boost/config/std/csignal.hpp b/include/boost/config/std/csignal.hpp
new file mode 100644
index 000000000..33fa17d43
--- /dev/null
+++ b/include/boost/config/std/csignal.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <csignal>
+#endif
diff --git a/include/boost/config/std/cstdarg.hpp b/include/boost/config/std/cstdarg.hpp
new file mode 100644
index 000000000..fcf19771a
--- /dev/null
+++ b/include/boost/config/std/cstdarg.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cstdarg>
+#endif
diff --git a/include/boost/config/std/cstddef.hpp b/include/boost/config/std/cstddef.hpp
new file mode 100644
index 000000000..c603336c8
--- /dev/null
+++ b/include/boost/config/std/cstddef.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cstddef>
+#endif
diff --git a/include/boost/config/std/cstdint.hpp b/include/boost/config/std/cstdint.hpp
new file mode 100644
index 000000000..5af80b09f
--- /dev/null
+++ b/include/boost/config/std/cstdint.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cstdint>
+#endif
diff --git a/include/boost/config/std/cstdio.hpp b/include/boost/config/std/cstdio.hpp
new file mode 100644
index 000000000..87cc23bfa
--- /dev/null
+++ b/include/boost/config/std/cstdio.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cstdio>
+#endif
diff --git a/include/boost/config/std/cstdlib.hpp b/include/boost/config/std/cstdlib.hpp
new file mode 100644
index 000000000..b6a9adf93
--- /dev/null
+++ b/include/boost/config/std/cstdlib.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cstdlib>
+#endif
diff --git a/include/boost/config/std/cstring.hpp b/include/boost/config/std/cstring.hpp
new file mode 100644
index 000000000..aea67ea46
--- /dev/null
+++ b/include/boost/config/std/cstring.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cstring>
+#endif
diff --git a/include/boost/config/std/ctime.hpp b/include/boost/config/std/ctime.hpp
new file mode 100644
index 000000000..c1efd1d16
--- /dev/null
+++ b/include/boost/config/std/ctime.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <ctime>
+#endif
diff --git a/include/boost/config/std/cuchar.hpp b/include/boost/config/std/cuchar.hpp
new file mode 100644
index 000000000..a12ef5af9
--- /dev/null
+++ b/include/boost/config/std/cuchar.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cuchar>
+#endif
diff --git a/include/boost/config/std/cwchar.hpp b/include/boost/config/std/cwchar.hpp
new file mode 100644
index 000000000..959f06b59
--- /dev/null
+++ b/include/boost/config/std/cwchar.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cwchar>
+#endif
diff --git a/include/boost/config/std/cwctype.hpp b/include/boost/config/std/cwctype.hpp
new file mode 100644
index 000000000..321fab7b3
--- /dev/null
+++ b/include/boost/config/std/cwctype.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <cwctype>
+#endif
diff --git a/include/boost/config/std/debugging.hpp b/include/boost/config/std/debugging.hpp
new file mode 100644
index 000000000..5dbfa272f
--- /dev/null
+++ b/include/boost/config/std/debugging.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <debugging>
+#endif
diff --git a/include/boost/config/std/deque.hpp b/include/boost/config/std/deque.hpp
new file mode 100644
index 000000000..8f9c52c3f
--- /dev/null
+++ b/include/boost/config/std/deque.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <deque>
+#endif
diff --git a/include/boost/config/std/exception.hpp b/include/boost/config/std/exception.hpp
new file mode 100644
index 000000000..008568201
--- /dev/null
+++ b/include/boost/config/std/exception.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <exception>
+#endif
diff --git a/include/boost/config/std/execution.hpp b/include/boost/config/std/execution.hpp
new file mode 100644
index 000000000..adc178e69
--- /dev/null
+++ b/include/boost/config/std/execution.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <execution>
+#endif
diff --git a/include/boost/config/std/expected.hpp b/include/boost/config/std/expected.hpp
new file mode 100644
index 000000000..a9a78d58b
--- /dev/null
+++ b/include/boost/config/std/expected.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <expected>
+#endif
diff --git a/include/boost/config/std/filesystem.hpp b/include/boost/config/std/filesystem.hpp
new file mode 100644
index 000000000..34c5a0c0a
--- /dev/null
+++ b/include/boost/config/std/filesystem.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <filesystem>
+#endif
diff --git a/include/boost/config/std/flat_map.hpp b/include/boost/config/std/flat_map.hpp
new file mode 100644
index 000000000..c9b6a5c24
--- /dev/null
+++ b/include/boost/config/std/flat_map.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <flat_map>
+#endif
diff --git a/include/boost/config/std/flat_set.hpp b/include/boost/config/std/flat_set.hpp
new file mode 100644
index 000000000..69d198b5c
--- /dev/null
+++ b/include/boost/config/std/flat_set.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <flat_set>
+#endif
diff --git a/include/boost/config/std/format.hpp b/include/boost/config/std/format.hpp
new file mode 100644
index 000000000..cb1266c01
--- /dev/null
+++ b/include/boost/config/std/format.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <format>
+#endif
diff --git a/include/boost/config/std/forward_list.hpp b/include/boost/config/std/forward_list.hpp
new file mode 100644
index 000000000..86be13878
--- /dev/null
+++ b/include/boost/config/std/forward_list.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <forward_list>
+#endif
diff --git a/include/boost/config/std/fstream.hpp b/include/boost/config/std/fstream.hpp
new file mode 100644
index 000000000..d0a00dd3d
--- /dev/null
+++ b/include/boost/config/std/fstream.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <fstream>
+#endif
diff --git a/include/boost/config/std/functional.hpp b/include/boost/config/std/functional.hpp
new file mode 100644
index 000000000..8f9653190
--- /dev/null
+++ b/include/boost/config/std/functional.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <functional>
+#endif
diff --git a/include/boost/config/std/future.hpp b/include/boost/config/std/future.hpp
new file mode 100644
index 000000000..39840cfdc
--- /dev/null
+++ b/include/boost/config/std/future.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <future>
+#endif
diff --git a/include/boost/config/std/generator.hpp b/include/boost/config/std/generator.hpp
new file mode 100644
index 000000000..ba7bbd6d4
--- /dev/null
+++ b/include/boost/config/std/generator.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <generator>
+#endif
diff --git a/include/boost/config/std/hazard_pointer.hpp b/include/boost/config/std/hazard_pointer.hpp
new file mode 100644
index 000000000..add894ef8
--- /dev/null
+++ b/include/boost/config/std/hazard_pointer.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <hazard_pointer>
+#endif
diff --git a/include/boost/config/std/initializer_list.hpp b/include/boost/config/std/initializer_list.hpp
new file mode 100644
index 000000000..3cea4eb2d
--- /dev/null
+++ b/include/boost/config/std/initializer_list.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <initializer_list>
+#endif
diff --git a/include/boost/config/std/inplace_vector.hpp b/include/boost/config/std/inplace_vector.hpp
new file mode 100644
index 000000000..f4dcbcfb4
--- /dev/null
+++ b/include/boost/config/std/inplace_vector.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <inplace_vector>
+#endif
diff --git a/include/boost/config/std/iomanip.hpp b/include/boost/config/std/iomanip.hpp
new file mode 100644
index 000000000..ac105a1b0
--- /dev/null
+++ b/include/boost/config/std/iomanip.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <iomanip>
+#endif
diff --git a/include/boost/config/std/ios.hpp b/include/boost/config/std/ios.hpp
new file mode 100644
index 000000000..ef81219ca
--- /dev/null
+++ b/include/boost/config/std/ios.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <ios>
+#endif
diff --git a/include/boost/config/std/iosfwd.hpp b/include/boost/config/std/iosfwd.hpp
new file mode 100644
index 000000000..ef4e0fef9
--- /dev/null
+++ b/include/boost/config/std/iosfwd.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <iosfwd>
+#endif
diff --git a/include/boost/config/std/iostream.hpp b/include/boost/config/std/iostream.hpp
new file mode 100644
index 000000000..ac12abfcd
--- /dev/null
+++ b/include/boost/config/std/iostream.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <iostream>
+#endif
diff --git a/include/boost/config/std/istream.hpp b/include/boost/config/std/istream.hpp
new file mode 100644
index 000000000..f2e4dda8a
--- /dev/null
+++ b/include/boost/config/std/istream.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <istream>
+#endif
diff --git a/include/boost/config/std/iterator.hpp b/include/boost/config/std/iterator.hpp
new file mode 100644
index 000000000..3a7c5b7db
--- /dev/null
+++ b/include/boost/config/std/iterator.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <iterator>
+#endif
diff --git a/include/boost/config/std/latch.hpp b/include/boost/config/std/latch.hpp
new file mode 100644
index 000000000..48b41f2cb
--- /dev/null
+++ b/include/boost/config/std/latch.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <latch>
+#endif
diff --git a/include/boost/config/std/limits.hpp b/include/boost/config/std/limits.hpp
new file mode 100644
index 000000000..d45779455
--- /dev/null
+++ b/include/boost/config/std/limits.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <limits>
+#endif
diff --git a/include/boost/config/std/linalg.hpp b/include/boost/config/std/linalg.hpp
new file mode 100644
index 000000000..e4ff89e4b
--- /dev/null
+++ b/include/boost/config/std/linalg.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <linalg>
+#endif
diff --git a/include/boost/config/std/list.hpp b/include/boost/config/std/list.hpp
new file mode 100644
index 000000000..edf810718
--- /dev/null
+++ b/include/boost/config/std/list.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <list>
+#endif
diff --git a/include/boost/config/std/locale.hpp b/include/boost/config/std/locale.hpp
new file mode 100644
index 000000000..5a243cb26
--- /dev/null
+++ b/include/boost/config/std/locale.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <locale>
+#endif
diff --git a/include/boost/config/std/map.hpp b/include/boost/config/std/map.hpp
new file mode 100644
index 000000000..2d5a393f4
--- /dev/null
+++ b/include/boost/config/std/map.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <map>
+#endif
diff --git a/include/boost/config/std/mdspan.hpp b/include/boost/config/std/mdspan.hpp
new file mode 100644
index 000000000..8e2727a49
--- /dev/null
+++ b/include/boost/config/std/mdspan.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <mdspan>
+#endif
diff --git a/include/boost/config/std/memory.hpp b/include/boost/config/std/memory.hpp
new file mode 100644
index 000000000..d9a3ae135
--- /dev/null
+++ b/include/boost/config/std/memory.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <memory>
+#endif
diff --git a/include/boost/config/std/memory_resource.hpp b/include/boost/config/std/memory_resource.hpp
new file mode 100644
index 000000000..35bb3b075
--- /dev/null
+++ b/include/boost/config/std/memory_resource.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <memory_resource>
+#endif
diff --git a/include/boost/config/std/mutex.hpp b/include/boost/config/std/mutex.hpp
new file mode 100644
index 000000000..df184c67f
--- /dev/null
+++ b/include/boost/config/std/mutex.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <mutex>
+#endif
diff --git a/include/boost/config/std/new.hpp b/include/boost/config/std/new.hpp
new file mode 100644
index 000000000..081ab0cf7
--- /dev/null
+++ b/include/boost/config/std/new.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <new>
+#endif
diff --git a/include/boost/config/std/numbers.hpp b/include/boost/config/std/numbers.hpp
new file mode 100644
index 000000000..9b7a9a02e
--- /dev/null
+++ b/include/boost/config/std/numbers.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <numbers>
+#endif
diff --git a/include/boost/config/std/numeric.hpp b/include/boost/config/std/numeric.hpp
new file mode 100644
index 000000000..740f08293
--- /dev/null
+++ b/include/boost/config/std/numeric.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <numeric>
+#endif
diff --git a/include/boost/config/std/optional.hpp b/include/boost/config/std/optional.hpp
new file mode 100644
index 000000000..21133ed45
--- /dev/null
+++ b/include/boost/config/std/optional.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <optional>
+#endif
diff --git a/include/boost/config/std/ostream.hpp b/include/boost/config/std/ostream.hpp
new file mode 100644
index 000000000..780588552
--- /dev/null
+++ b/include/boost/config/std/ostream.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <ostream>
+#endif
diff --git a/include/boost/config/std/print.hpp b/include/boost/config/std/print.hpp
new file mode 100644
index 000000000..fcc74370a
--- /dev/null
+++ b/include/boost/config/std/print.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <print>
+#endif
diff --git a/include/boost/config/std/queue.hpp b/include/boost/config/std/queue.hpp
new file mode 100644
index 000000000..ce5267e99
--- /dev/null
+++ b/include/boost/config/std/queue.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <queue>
+#endif
diff --git a/include/boost/config/std/random.hpp b/include/boost/config/std/random.hpp
new file mode 100644
index 000000000..562cfd7f7
--- /dev/null
+++ b/include/boost/config/std/random.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <random>
+#endif
diff --git a/include/boost/config/std/ranges.hpp b/include/boost/config/std/ranges.hpp
new file mode 100644
index 000000000..a65708e12
--- /dev/null
+++ b/include/boost/config/std/ranges.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <ranges>
+#endif
diff --git a/include/boost/config/std/ratio.hpp b/include/boost/config/std/ratio.hpp
new file mode 100644
index 000000000..19e1f11e4
--- /dev/null
+++ b/include/boost/config/std/ratio.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <ratio>
+#endif
diff --git a/include/boost/config/std/rcu.hpp b/include/boost/config/std/rcu.hpp
new file mode 100644
index 000000000..fecac1edc
--- /dev/null
+++ b/include/boost/config/std/rcu.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <rcu>
+#endif
diff --git a/include/boost/config/std/regex.hpp b/include/boost/config/std/regex.hpp
new file mode 100644
index 000000000..294133080
--- /dev/null
+++ b/include/boost/config/std/regex.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <regex>
+#endif
diff --git a/include/boost/config/std/scoped_allocator.hpp b/include/boost/config/std/scoped_allocator.hpp
new file mode 100644
index 000000000..94d9eba03
--- /dev/null
+++ b/include/boost/config/std/scoped_allocator.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <scoped_allocator>
+#endif
diff --git a/include/boost/config/std/semaphore.hpp b/include/boost/config/std/semaphore.hpp
new file mode 100644
index 000000000..96b258175
--- /dev/null
+++ b/include/boost/config/std/semaphore.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <semaphore>
+#endif
diff --git a/include/boost/config/std/set.hpp b/include/boost/config/std/set.hpp
new file mode 100644
index 000000000..f903f7cf8
--- /dev/null
+++ b/include/boost/config/std/set.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <set>
+#endif
diff --git a/include/boost/config/std/shared_mutex.hpp b/include/boost/config/std/shared_mutex.hpp
new file mode 100644
index 000000000..cdc9ad63c
--- /dev/null
+++ b/include/boost/config/std/shared_mutex.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <shared_mutex>
+#endif
diff --git a/include/boost/config/std/simd.hpp b/include/boost/config/std/simd.hpp
new file mode 100644
index 000000000..7b96876cf
--- /dev/null
+++ b/include/boost/config/std/simd.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <simd>
+#endif
diff --git a/include/boost/config/std/source_location.hpp b/include/boost/config/std/source_location.hpp
new file mode 100644
index 000000000..cf0beb4d1
--- /dev/null
+++ b/include/boost/config/std/source_location.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <source_location>
+#endif
diff --git a/include/boost/config/std/span.hpp b/include/boost/config/std/span.hpp
new file mode 100644
index 000000000..9ceacb4b6
--- /dev/null
+++ b/include/boost/config/std/span.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <span>
+#endif
diff --git a/include/boost/config/std/spanstream.hpp b/include/boost/config/std/spanstream.hpp
new file mode 100644
index 000000000..cd6b1281e
--- /dev/null
+++ b/include/boost/config/std/spanstream.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <spanstream>
+#endif
diff --git a/include/boost/config/std/sstream.hpp b/include/boost/config/std/sstream.hpp
new file mode 100644
index 000000000..7ce330365
--- /dev/null
+++ b/include/boost/config/std/sstream.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <sstream>
+#endif
diff --git a/include/boost/config/std/stack.hpp b/include/boost/config/std/stack.hpp
new file mode 100644
index 000000000..2e3c58faf
--- /dev/null
+++ b/include/boost/config/std/stack.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <stack>
+#endif
diff --git a/include/boost/config/std/stacktrace.hpp b/include/boost/config/std/stacktrace.hpp
new file mode 100644
index 000000000..a498e19b7
--- /dev/null
+++ b/include/boost/config/std/stacktrace.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <stacktrace>
+#endif
diff --git a/include/boost/config/std/stdexcept.hpp b/include/boost/config/std/stdexcept.hpp
new file mode 100644
index 000000000..9473297e7
--- /dev/null
+++ b/include/boost/config/std/stdexcept.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <stdexcept>
+#endif
diff --git a/include/boost/config/std/stdfloat.hpp b/include/boost/config/std/stdfloat.hpp
new file mode 100644
index 000000000..38b9c62b9
--- /dev/null
+++ b/include/boost/config/std/stdfloat.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <stdfloat>
+#endif
diff --git a/include/boost/config/std/stop_token.hpp b/include/boost/config/std/stop_token.hpp
new file mode 100644
index 000000000..1c9dd4b2a
--- /dev/null
+++ b/include/boost/config/std/stop_token.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <stop_token>
+#endif
diff --git a/include/boost/config/std/streambuf.hpp b/include/boost/config/std/streambuf.hpp
new file mode 100644
index 000000000..cd67c057c
--- /dev/null
+++ b/include/boost/config/std/streambuf.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <streambuf>
+#endif
diff --git a/include/boost/config/std/string.hpp b/include/boost/config/std/string.hpp
new file mode 100644
index 000000000..322414be0
--- /dev/null
+++ b/include/boost/config/std/string.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <string>
+#endif
diff --git a/include/boost/config/std/string_view.hpp b/include/boost/config/std/string_view.hpp
new file mode 100644
index 000000000..a30f920e6
--- /dev/null
+++ b/include/boost/config/std/string_view.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <string_view>
+#endif
diff --git a/include/boost/config/std/strstream.hpp b/include/boost/config/std/strstream.hpp
new file mode 100644
index 000000000..abbd45564
--- /dev/null
+++ b/include/boost/config/std/strstream.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <strstream>
+#endif
diff --git a/include/boost/config/std/syncstream.hpp b/include/boost/config/std/syncstream.hpp
new file mode 100644
index 000000000..f1f13176c
--- /dev/null
+++ b/include/boost/config/std/syncstream.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <syncstream>
+#endif
diff --git a/include/boost/config/std/system_error.hpp b/include/boost/config/std/system_error.hpp
new file mode 100644
index 000000000..2d21d9957
--- /dev/null
+++ b/include/boost/config/std/system_error.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <system_error>
+#endif
diff --git a/include/boost/config/std/text_encoding.hpp b/include/boost/config/std/text_encoding.hpp
new file mode 100644
index 000000000..0de6bc933
--- /dev/null
+++ b/include/boost/config/std/text_encoding.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <text_encoding>
+#endif
diff --git a/include/boost/config/std/thread.hpp b/include/boost/config/std/thread.hpp
new file mode 100644
index 000000000..b62889a4a
--- /dev/null
+++ b/include/boost/config/std/thread.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <thread>
+#endif
diff --git a/include/boost/config/std/tuple.hpp b/include/boost/config/std/tuple.hpp
new file mode 100644
index 000000000..f00b5864f
--- /dev/null
+++ b/include/boost/config/std/tuple.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <tuple>
+#endif
diff --git a/include/boost/config/std/type_traits.hpp b/include/boost/config/std/type_traits.hpp
new file mode 100644
index 000000000..395429bba
--- /dev/null
+++ b/include/boost/config/std/type_traits.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <type_traits>
+#endif
diff --git a/include/boost/config/std/typeindex.hpp b/include/boost/config/std/typeindex.hpp
new file mode 100644
index 000000000..752e75c8d
--- /dev/null
+++ b/include/boost/config/std/typeindex.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <typeindex>
+#endif
diff --git a/include/boost/config/std/typeinfo.hpp b/include/boost/config/std/typeinfo.hpp
new file mode 100644
index 000000000..e2a584510
--- /dev/null
+++ b/include/boost/config/std/typeinfo.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <typeinfo>
+#endif
diff --git a/include/boost/config/std/unordered_map.hpp b/include/boost/config/std/unordered_map.hpp
new file mode 100644
index 000000000..ac747d6fc
--- /dev/null
+++ b/include/boost/config/std/unordered_map.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <unordered_map>
+#endif
diff --git a/include/boost/config/std/unordered_set.hpp b/include/boost/config/std/unordered_set.hpp
new file mode 100644
index 000000000..ae272d168
--- /dev/null
+++ b/include/boost/config/std/unordered_set.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <unordered_set>
+#endif
diff --git a/include/boost/config/std/utility.hpp b/include/boost/config/std/utility.hpp
new file mode 100644
index 000000000..e023cb355
--- /dev/null
+++ b/include/boost/config/std/utility.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <utility>
+#endif
diff --git a/include/boost/config/std/valarray.hpp b/include/boost/config/std/valarray.hpp
new file mode 100644
index 000000000..4dd18cf74
--- /dev/null
+++ b/include/boost/config/std/valarray.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <valarray>
+#endif
diff --git a/include/boost/config/std/variant.hpp b/include/boost/config/std/variant.hpp
new file mode 100644
index 000000000..210b2fa13
--- /dev/null
+++ b/include/boost/config/std/variant.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <variant>
+#endif
diff --git a/include/boost/config/std/vector.hpp b/include/boost/config/std/vector.hpp
new file mode 100644
index 000000000..a86e89401
--- /dev/null
+++ b/include/boost/config/std/vector.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <vector>
+#endif
diff --git a/include/boost/config/std/version.hpp b/include/boost/config/std/version.hpp
new file mode 100644
index 000000000..186d5a0b3
--- /dev/null
+++ b/include/boost/config/std/version.hpp
@@ -0,0 +1,5 @@
+#ifdef BOOST_USE_MODULES
+import std;
+#else
+#include <version>
+#endif

From 94e4c169db3892d387d24e4bdb9728108f5b8f60 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Wed, 10 Sep 2025 19:18:56 +0200
Subject: [PATCH 05/14] BOOST_CONFIG_SKIP_IMPORT_STD

---
 include/boost/config/std/algorithm.hpp          | 2 ++
 include/boost/config/std/any.hpp                | 2 ++
 include/boost/config/std/array.hpp              | 2 ++
 include/boost/config/std/atomic.hpp             | 2 ++
 include/boost/config/std/barrier.hpp            | 2 ++
 include/boost/config/std/bit.hpp                | 2 ++
 include/boost/config/std/bitset.hpp             | 2 ++
 include/boost/config/std/cassert.hpp            | 2 ++
 include/boost/config/std/cctype.hpp             | 2 ++
 include/boost/config/std/cerrno.hpp             | 2 ++
 include/boost/config/std/cfenv.hpp              | 2 ++
 include/boost/config/std/cfloat.hpp             | 2 ++
 include/boost/config/std/charconv.hpp           | 2 ++
 include/boost/config/std/chrono.hpp             | 2 ++
 include/boost/config/std/cinttypes.hpp          | 2 ++
 include/boost/config/std/climits.hpp            | 2 ++
 include/boost/config/std/clocale.hpp            | 2 ++
 include/boost/config/std/cmath.hpp              | 2 ++
 include/boost/config/std/codecvt.hpp            | 2 ++
 include/boost/config/std/compare.hpp            | 2 ++
 include/boost/config/std/complex.hpp            | 2 ++
 include/boost/config/std/concepts.hpp           | 2 ++
 include/boost/config/std/condition_variable.hpp | 2 ++
 include/boost/config/std/coroutine.hpp          | 2 ++
 include/boost/config/std/csetjmp.hpp            | 2 ++
 include/boost/config/std/csignal.hpp            | 2 ++
 include/boost/config/std/cstdarg.hpp            | 2 ++
 include/boost/config/std/cstddef.hpp            | 2 ++
 include/boost/config/std/cstdint.hpp            | 2 ++
 include/boost/config/std/cstdio.hpp             | 2 ++
 include/boost/config/std/cstdlib.hpp            | 2 ++
 include/boost/config/std/cstring.hpp            | 2 ++
 include/boost/config/std/ctime.hpp              | 2 ++
 include/boost/config/std/cuchar.hpp             | 2 ++
 include/boost/config/std/cwchar.hpp             | 2 ++
 include/boost/config/std/cwctype.hpp            | 2 ++
 include/boost/config/std/debugging.hpp          | 2 ++
 include/boost/config/std/deque.hpp              | 2 ++
 include/boost/config/std/exception.hpp          | 2 ++
 include/boost/config/std/execution.hpp          | 2 ++
 include/boost/config/std/expected.hpp           | 2 ++
 include/boost/config/std/filesystem.hpp         | 2 ++
 include/boost/config/std/flat_map.hpp           | 2 ++
 include/boost/config/std/flat_set.hpp           | 2 ++
 include/boost/config/std/format.hpp             | 2 ++
 include/boost/config/std/forward_list.hpp       | 2 ++
 include/boost/config/std/fstream.hpp            | 2 ++
 include/boost/config/std/functional.hpp         | 2 ++
 include/boost/config/std/future.hpp             | 2 ++
 include/boost/config/std/generator.hpp          | 2 ++
 include/boost/config/std/hazard_pointer.hpp     | 2 ++
 include/boost/config/std/initializer_list.hpp   | 2 ++
 include/boost/config/std/inplace_vector.hpp     | 2 ++
 include/boost/config/std/iomanip.hpp            | 2 ++
 include/boost/config/std/ios.hpp                | 2 ++
 include/boost/config/std/iosfwd.hpp             | 2 ++
 include/boost/config/std/iostream.hpp           | 2 ++
 include/boost/config/std/istream.hpp            | 2 ++
 include/boost/config/std/iterator.hpp           | 2 ++
 include/boost/config/std/latch.hpp              | 2 ++
 include/boost/config/std/limits.hpp             | 2 ++
 include/boost/config/std/linalg.hpp             | 2 ++
 include/boost/config/std/list.hpp               | 2 ++
 include/boost/config/std/locale.hpp             | 2 ++
 include/boost/config/std/map.hpp                | 2 ++
 include/boost/config/std/mdspan.hpp             | 2 ++
 include/boost/config/std/memory.hpp             | 2 ++
 include/boost/config/std/memory_resource.hpp    | 2 ++
 include/boost/config/std/mutex.hpp              | 2 ++
 include/boost/config/std/new.hpp                | 2 ++
 include/boost/config/std/numbers.hpp            | 2 ++
 include/boost/config/std/numeric.hpp            | 2 ++
 include/boost/config/std/optional.hpp           | 2 ++
 include/boost/config/std/ostream.hpp            | 2 ++
 include/boost/config/std/print.hpp              | 2 ++
 include/boost/config/std/queue.hpp              | 2 ++
 include/boost/config/std/random.hpp             | 2 ++
 include/boost/config/std/ranges.hpp             | 2 ++
 include/boost/config/std/ratio.hpp              | 2 ++
 include/boost/config/std/rcu.hpp                | 2 ++
 include/boost/config/std/regex.hpp              | 2 ++
 include/boost/config/std/scoped_allocator.hpp   | 2 ++
 include/boost/config/std/semaphore.hpp          | 2 ++
 include/boost/config/std/set.hpp                | 2 ++
 include/boost/config/std/shared_mutex.hpp       | 2 ++
 include/boost/config/std/simd.hpp               | 2 ++
 include/boost/config/std/source_location.hpp    | 2 ++
 include/boost/config/std/span.hpp               | 2 ++
 include/boost/config/std/spanstream.hpp         | 2 ++
 include/boost/config/std/sstream.hpp            | 2 ++
 include/boost/config/std/stack.hpp              | 2 ++
 include/boost/config/std/stacktrace.hpp         | 2 ++
 include/boost/config/std/stdexcept.hpp          | 2 ++
 include/boost/config/std/stdfloat.hpp           | 2 ++
 include/boost/config/std/stop_token.hpp         | 2 ++
 include/boost/config/std/streambuf.hpp          | 2 ++
 include/boost/config/std/string.hpp             | 2 ++
 include/boost/config/std/string_view.hpp        | 2 ++
 include/boost/config/std/strstream.hpp          | 2 ++
 include/boost/config/std/syncstream.hpp         | 2 ++
 include/boost/config/std/system_error.hpp       | 2 ++
 include/boost/config/std/text_encoding.hpp      | 2 ++
 include/boost/config/std/thread.hpp             | 2 ++
 include/boost/config/std/tuple.hpp              | 2 ++
 include/boost/config/std/type_traits.hpp        | 2 ++
 include/boost/config/std/typeindex.hpp          | 2 ++
 include/boost/config/std/typeinfo.hpp           | 2 ++
 include/boost/config/std/unordered_map.hpp      | 2 ++
 include/boost/config/std/unordered_set.hpp      | 2 ++
 include/boost/config/std/utility.hpp            | 2 ++
 include/boost/config/std/valarray.hpp           | 2 ++
 include/boost/config/std/variant.hpp            | 2 ++
 include/boost/config/std/vector.hpp             | 2 ++
 include/boost/config/std/version.hpp            | 2 ++
 114 files changed, 228 insertions(+)

diff --git a/include/boost/config/std/algorithm.hpp b/include/boost/config/std/algorithm.hpp
index 718e1d3ed..e65e98c72 100644
--- a/include/boost/config/std/algorithm.hpp
+++ b/include/boost/config/std/algorithm.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <algorithm>
 #endif
diff --git a/include/boost/config/std/any.hpp b/include/boost/config/std/any.hpp
index b939eda58..88873c87f 100644
--- a/include/boost/config/std/any.hpp
+++ b/include/boost/config/std/any.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <any>
 #endif
diff --git a/include/boost/config/std/array.hpp b/include/boost/config/std/array.hpp
index 89a3ae7c5..4ae9d11af 100644
--- a/include/boost/config/std/array.hpp
+++ b/include/boost/config/std/array.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <array>
 #endif
diff --git a/include/boost/config/std/atomic.hpp b/include/boost/config/std/atomic.hpp
index 8f67670ad..325bc7ef4 100644
--- a/include/boost/config/std/atomic.hpp
+++ b/include/boost/config/std/atomic.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <atomic>
 #endif
diff --git a/include/boost/config/std/barrier.hpp b/include/boost/config/std/barrier.hpp
index 9eb1380a2..35d51bfe3 100644
--- a/include/boost/config/std/barrier.hpp
+++ b/include/boost/config/std/barrier.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <barrier>
 #endif
diff --git a/include/boost/config/std/bit.hpp b/include/boost/config/std/bit.hpp
index aad82433f..d0e39bf77 100644
--- a/include/boost/config/std/bit.hpp
+++ b/include/boost/config/std/bit.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <bit>
 #endif
diff --git a/include/boost/config/std/bitset.hpp b/include/boost/config/std/bitset.hpp
index 316f4b8ae..b6fa07660 100644
--- a/include/boost/config/std/bitset.hpp
+++ b/include/boost/config/std/bitset.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <bitset>
 #endif
diff --git a/include/boost/config/std/cassert.hpp b/include/boost/config/std/cassert.hpp
index 27dc8d9fb..7ea486079 100644
--- a/include/boost/config/std/cassert.hpp
+++ b/include/boost/config/std/cassert.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cassert>
 #endif
diff --git a/include/boost/config/std/cctype.hpp b/include/boost/config/std/cctype.hpp
index 69cdfda7c..05749d16c 100644
--- a/include/boost/config/std/cctype.hpp
+++ b/include/boost/config/std/cctype.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cctype>
 #endif
diff --git a/include/boost/config/std/cerrno.hpp b/include/boost/config/std/cerrno.hpp
index 66f72455b..e172658e9 100644
--- a/include/boost/config/std/cerrno.hpp
+++ b/include/boost/config/std/cerrno.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cerrno>
 #endif
diff --git a/include/boost/config/std/cfenv.hpp b/include/boost/config/std/cfenv.hpp
index 017d92131..5d361ff99 100644
--- a/include/boost/config/std/cfenv.hpp
+++ b/include/boost/config/std/cfenv.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cfenv>
 #endif
diff --git a/include/boost/config/std/cfloat.hpp b/include/boost/config/std/cfloat.hpp
index fb3acfece..66e632507 100644
--- a/include/boost/config/std/cfloat.hpp
+++ b/include/boost/config/std/cfloat.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cfloat>
 #endif
diff --git a/include/boost/config/std/charconv.hpp b/include/boost/config/std/charconv.hpp
index 736f0aa82..23c3ac739 100644
--- a/include/boost/config/std/charconv.hpp
+++ b/include/boost/config/std/charconv.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <charconv>
 #endif
diff --git a/include/boost/config/std/chrono.hpp b/include/boost/config/std/chrono.hpp
index 618e5ac90..963bbc784 100644
--- a/include/boost/config/std/chrono.hpp
+++ b/include/boost/config/std/chrono.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <chrono>
 #endif
diff --git a/include/boost/config/std/cinttypes.hpp b/include/boost/config/std/cinttypes.hpp
index 1783e45cd..18243247c 100644
--- a/include/boost/config/std/cinttypes.hpp
+++ b/include/boost/config/std/cinttypes.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cinttypes>
 #endif
diff --git a/include/boost/config/std/climits.hpp b/include/boost/config/std/climits.hpp
index 2216c5c9f..d71e388e6 100644
--- a/include/boost/config/std/climits.hpp
+++ b/include/boost/config/std/climits.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <climits>
 #endif
diff --git a/include/boost/config/std/clocale.hpp b/include/boost/config/std/clocale.hpp
index c4793e6d4..4a9210b19 100644
--- a/include/boost/config/std/clocale.hpp
+++ b/include/boost/config/std/clocale.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <clocale>
 #endif
diff --git a/include/boost/config/std/cmath.hpp b/include/boost/config/std/cmath.hpp
index f442afdfc..925820ad6 100644
--- a/include/boost/config/std/cmath.hpp
+++ b/include/boost/config/std/cmath.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cmath>
 #endif
diff --git a/include/boost/config/std/codecvt.hpp b/include/boost/config/std/codecvt.hpp
index dcfeec06f..b2b28e86b 100644
--- a/include/boost/config/std/codecvt.hpp
+++ b/include/boost/config/std/codecvt.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <codecvt>
 #endif
diff --git a/include/boost/config/std/compare.hpp b/include/boost/config/std/compare.hpp
index 578a1d381..07781601c 100644
--- a/include/boost/config/std/compare.hpp
+++ b/include/boost/config/std/compare.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <compare>
 #endif
diff --git a/include/boost/config/std/complex.hpp b/include/boost/config/std/complex.hpp
index cda8f18cb..228a9e2dd 100644
--- a/include/boost/config/std/complex.hpp
+++ b/include/boost/config/std/complex.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <complex>
 #endif
diff --git a/include/boost/config/std/concepts.hpp b/include/boost/config/std/concepts.hpp
index f20af3ff2..e19c89922 100644
--- a/include/boost/config/std/concepts.hpp
+++ b/include/boost/config/std/concepts.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <concepts>
 #endif
diff --git a/include/boost/config/std/condition_variable.hpp b/include/boost/config/std/condition_variable.hpp
index 4d382b452..06dd3ebbf 100644
--- a/include/boost/config/std/condition_variable.hpp
+++ b/include/boost/config/std/condition_variable.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <condition_variable>
 #endif
diff --git a/include/boost/config/std/coroutine.hpp b/include/boost/config/std/coroutine.hpp
index 36e3d190c..6f9a1c08e 100644
--- a/include/boost/config/std/coroutine.hpp
+++ b/include/boost/config/std/coroutine.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <coroutine>
 #endif
diff --git a/include/boost/config/std/csetjmp.hpp b/include/boost/config/std/csetjmp.hpp
index 8fc1905f3..c60cb6eb2 100644
--- a/include/boost/config/std/csetjmp.hpp
+++ b/include/boost/config/std/csetjmp.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <csetjmp>
 #endif
diff --git a/include/boost/config/std/csignal.hpp b/include/boost/config/std/csignal.hpp
index 33fa17d43..2aa094705 100644
--- a/include/boost/config/std/csignal.hpp
+++ b/include/boost/config/std/csignal.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <csignal>
 #endif
diff --git a/include/boost/config/std/cstdarg.hpp b/include/boost/config/std/cstdarg.hpp
index fcf19771a..72d3dbd90 100644
--- a/include/boost/config/std/cstdarg.hpp
+++ b/include/boost/config/std/cstdarg.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cstdarg>
 #endif
diff --git a/include/boost/config/std/cstddef.hpp b/include/boost/config/std/cstddef.hpp
index c603336c8..a7ed563d7 100644
--- a/include/boost/config/std/cstddef.hpp
+++ b/include/boost/config/std/cstddef.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cstddef>
 #endif
diff --git a/include/boost/config/std/cstdint.hpp b/include/boost/config/std/cstdint.hpp
index 5af80b09f..7916c1c16 100644
--- a/include/boost/config/std/cstdint.hpp
+++ b/include/boost/config/std/cstdint.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cstdint>
 #endif
diff --git a/include/boost/config/std/cstdio.hpp b/include/boost/config/std/cstdio.hpp
index 87cc23bfa..473be9203 100644
--- a/include/boost/config/std/cstdio.hpp
+++ b/include/boost/config/std/cstdio.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cstdio>
 #endif
diff --git a/include/boost/config/std/cstdlib.hpp b/include/boost/config/std/cstdlib.hpp
index b6a9adf93..72ab34b82 100644
--- a/include/boost/config/std/cstdlib.hpp
+++ b/include/boost/config/std/cstdlib.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cstdlib>
 #endif
diff --git a/include/boost/config/std/cstring.hpp b/include/boost/config/std/cstring.hpp
index aea67ea46..396b0026d 100644
--- a/include/boost/config/std/cstring.hpp
+++ b/include/boost/config/std/cstring.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cstring>
 #endif
diff --git a/include/boost/config/std/ctime.hpp b/include/boost/config/std/ctime.hpp
index c1efd1d16..f4298e4db 100644
--- a/include/boost/config/std/ctime.hpp
+++ b/include/boost/config/std/ctime.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <ctime>
 #endif
diff --git a/include/boost/config/std/cuchar.hpp b/include/boost/config/std/cuchar.hpp
index a12ef5af9..bbabc89be 100644
--- a/include/boost/config/std/cuchar.hpp
+++ b/include/boost/config/std/cuchar.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cuchar>
 #endif
diff --git a/include/boost/config/std/cwchar.hpp b/include/boost/config/std/cwchar.hpp
index 959f06b59..275e7b26e 100644
--- a/include/boost/config/std/cwchar.hpp
+++ b/include/boost/config/std/cwchar.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cwchar>
 #endif
diff --git a/include/boost/config/std/cwctype.hpp b/include/boost/config/std/cwctype.hpp
index 321fab7b3..a660a50bd 100644
--- a/include/boost/config/std/cwctype.hpp
+++ b/include/boost/config/std/cwctype.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <cwctype>
 #endif
diff --git a/include/boost/config/std/debugging.hpp b/include/boost/config/std/debugging.hpp
index 5dbfa272f..df54df6d2 100644
--- a/include/boost/config/std/debugging.hpp
+++ b/include/boost/config/std/debugging.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <debugging>
 #endif
diff --git a/include/boost/config/std/deque.hpp b/include/boost/config/std/deque.hpp
index 8f9c52c3f..45f532f9f 100644
--- a/include/boost/config/std/deque.hpp
+++ b/include/boost/config/std/deque.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <deque>
 #endif
diff --git a/include/boost/config/std/exception.hpp b/include/boost/config/std/exception.hpp
index 008568201..b0954abc1 100644
--- a/include/boost/config/std/exception.hpp
+++ b/include/boost/config/std/exception.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <exception>
 #endif
diff --git a/include/boost/config/std/execution.hpp b/include/boost/config/std/execution.hpp
index adc178e69..009b22a6d 100644
--- a/include/boost/config/std/execution.hpp
+++ b/include/boost/config/std/execution.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <execution>
 #endif
diff --git a/include/boost/config/std/expected.hpp b/include/boost/config/std/expected.hpp
index a9a78d58b..af115445d 100644
--- a/include/boost/config/std/expected.hpp
+++ b/include/boost/config/std/expected.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <expected>
 #endif
diff --git a/include/boost/config/std/filesystem.hpp b/include/boost/config/std/filesystem.hpp
index 34c5a0c0a..8825c90fb 100644
--- a/include/boost/config/std/filesystem.hpp
+++ b/include/boost/config/std/filesystem.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <filesystem>
 #endif
diff --git a/include/boost/config/std/flat_map.hpp b/include/boost/config/std/flat_map.hpp
index c9b6a5c24..3d26601bb 100644
--- a/include/boost/config/std/flat_map.hpp
+++ b/include/boost/config/std/flat_map.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <flat_map>
 #endif
diff --git a/include/boost/config/std/flat_set.hpp b/include/boost/config/std/flat_set.hpp
index 69d198b5c..307e5859e 100644
--- a/include/boost/config/std/flat_set.hpp
+++ b/include/boost/config/std/flat_set.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <flat_set>
 #endif
diff --git a/include/boost/config/std/format.hpp b/include/boost/config/std/format.hpp
index cb1266c01..9bb5c3d07 100644
--- a/include/boost/config/std/format.hpp
+++ b/include/boost/config/std/format.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <format>
 #endif
diff --git a/include/boost/config/std/forward_list.hpp b/include/boost/config/std/forward_list.hpp
index 86be13878..074af6212 100644
--- a/include/boost/config/std/forward_list.hpp
+++ b/include/boost/config/std/forward_list.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <forward_list>
 #endif
diff --git a/include/boost/config/std/fstream.hpp b/include/boost/config/std/fstream.hpp
index d0a00dd3d..327b0c16f 100644
--- a/include/boost/config/std/fstream.hpp
+++ b/include/boost/config/std/fstream.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <fstream>
 #endif
diff --git a/include/boost/config/std/functional.hpp b/include/boost/config/std/functional.hpp
index 8f9653190..b793d78f4 100644
--- a/include/boost/config/std/functional.hpp
+++ b/include/boost/config/std/functional.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <functional>
 #endif
diff --git a/include/boost/config/std/future.hpp b/include/boost/config/std/future.hpp
index 39840cfdc..651c4e05b 100644
--- a/include/boost/config/std/future.hpp
+++ b/include/boost/config/std/future.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <future>
 #endif
diff --git a/include/boost/config/std/generator.hpp b/include/boost/config/std/generator.hpp
index ba7bbd6d4..e09ac9a4b 100644
--- a/include/boost/config/std/generator.hpp
+++ b/include/boost/config/std/generator.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <generator>
 #endif
diff --git a/include/boost/config/std/hazard_pointer.hpp b/include/boost/config/std/hazard_pointer.hpp
index add894ef8..9336078eb 100644
--- a/include/boost/config/std/hazard_pointer.hpp
+++ b/include/boost/config/std/hazard_pointer.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <hazard_pointer>
 #endif
diff --git a/include/boost/config/std/initializer_list.hpp b/include/boost/config/std/initializer_list.hpp
index 3cea4eb2d..a3ba92431 100644
--- a/include/boost/config/std/initializer_list.hpp
+++ b/include/boost/config/std/initializer_list.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <initializer_list>
 #endif
diff --git a/include/boost/config/std/inplace_vector.hpp b/include/boost/config/std/inplace_vector.hpp
index f4dcbcfb4..9030cbf1d 100644
--- a/include/boost/config/std/inplace_vector.hpp
+++ b/include/boost/config/std/inplace_vector.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <inplace_vector>
 #endif
diff --git a/include/boost/config/std/iomanip.hpp b/include/boost/config/std/iomanip.hpp
index ac105a1b0..7bb81e162 100644
--- a/include/boost/config/std/iomanip.hpp
+++ b/include/boost/config/std/iomanip.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <iomanip>
 #endif
diff --git a/include/boost/config/std/ios.hpp b/include/boost/config/std/ios.hpp
index ef81219ca..55157cf37 100644
--- a/include/boost/config/std/ios.hpp
+++ b/include/boost/config/std/ios.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <ios>
 #endif
diff --git a/include/boost/config/std/iosfwd.hpp b/include/boost/config/std/iosfwd.hpp
index ef4e0fef9..19a8abc9f 100644
--- a/include/boost/config/std/iosfwd.hpp
+++ b/include/boost/config/std/iosfwd.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <iosfwd>
 #endif
diff --git a/include/boost/config/std/iostream.hpp b/include/boost/config/std/iostream.hpp
index ac12abfcd..7714d27c0 100644
--- a/include/boost/config/std/iostream.hpp
+++ b/include/boost/config/std/iostream.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <iostream>
 #endif
diff --git a/include/boost/config/std/istream.hpp b/include/boost/config/std/istream.hpp
index f2e4dda8a..345028410 100644
--- a/include/boost/config/std/istream.hpp
+++ b/include/boost/config/std/istream.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <istream>
 #endif
diff --git a/include/boost/config/std/iterator.hpp b/include/boost/config/std/iterator.hpp
index 3a7c5b7db..460cf7026 100644
--- a/include/boost/config/std/iterator.hpp
+++ b/include/boost/config/std/iterator.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <iterator>
 #endif
diff --git a/include/boost/config/std/latch.hpp b/include/boost/config/std/latch.hpp
index 48b41f2cb..f2d333286 100644
--- a/include/boost/config/std/latch.hpp
+++ b/include/boost/config/std/latch.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <latch>
 #endif
diff --git a/include/boost/config/std/limits.hpp b/include/boost/config/std/limits.hpp
index d45779455..49bb2d7e8 100644
--- a/include/boost/config/std/limits.hpp
+++ b/include/boost/config/std/limits.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <limits>
 #endif
diff --git a/include/boost/config/std/linalg.hpp b/include/boost/config/std/linalg.hpp
index e4ff89e4b..f5760bf5b 100644
--- a/include/boost/config/std/linalg.hpp
+++ b/include/boost/config/std/linalg.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <linalg>
 #endif
diff --git a/include/boost/config/std/list.hpp b/include/boost/config/std/list.hpp
index edf810718..aeda9ae26 100644
--- a/include/boost/config/std/list.hpp
+++ b/include/boost/config/std/list.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <list>
 #endif
diff --git a/include/boost/config/std/locale.hpp b/include/boost/config/std/locale.hpp
index 5a243cb26..84d1238c4 100644
--- a/include/boost/config/std/locale.hpp
+++ b/include/boost/config/std/locale.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <locale>
 #endif
diff --git a/include/boost/config/std/map.hpp b/include/boost/config/std/map.hpp
index 2d5a393f4..ff8d933cf 100644
--- a/include/boost/config/std/map.hpp
+++ b/include/boost/config/std/map.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <map>
 #endif
diff --git a/include/boost/config/std/mdspan.hpp b/include/boost/config/std/mdspan.hpp
index 8e2727a49..6db35f9c1 100644
--- a/include/boost/config/std/mdspan.hpp
+++ b/include/boost/config/std/mdspan.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <mdspan>
 #endif
diff --git a/include/boost/config/std/memory.hpp b/include/boost/config/std/memory.hpp
index d9a3ae135..f53d1c086 100644
--- a/include/boost/config/std/memory.hpp
+++ b/include/boost/config/std/memory.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <memory>
 #endif
diff --git a/include/boost/config/std/memory_resource.hpp b/include/boost/config/std/memory_resource.hpp
index 35bb3b075..63a852b70 100644
--- a/include/boost/config/std/memory_resource.hpp
+++ b/include/boost/config/std/memory_resource.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <memory_resource>
 #endif
diff --git a/include/boost/config/std/mutex.hpp b/include/boost/config/std/mutex.hpp
index df184c67f..8417dee85 100644
--- a/include/boost/config/std/mutex.hpp
+++ b/include/boost/config/std/mutex.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <mutex>
 #endif
diff --git a/include/boost/config/std/new.hpp b/include/boost/config/std/new.hpp
index 081ab0cf7..fdc382d4b 100644
--- a/include/boost/config/std/new.hpp
+++ b/include/boost/config/std/new.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <new>
 #endif
diff --git a/include/boost/config/std/numbers.hpp b/include/boost/config/std/numbers.hpp
index 9b7a9a02e..749b52a42 100644
--- a/include/boost/config/std/numbers.hpp
+++ b/include/boost/config/std/numbers.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <numbers>
 #endif
diff --git a/include/boost/config/std/numeric.hpp b/include/boost/config/std/numeric.hpp
index 740f08293..07c57d3e1 100644
--- a/include/boost/config/std/numeric.hpp
+++ b/include/boost/config/std/numeric.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <numeric>
 #endif
diff --git a/include/boost/config/std/optional.hpp b/include/boost/config/std/optional.hpp
index 21133ed45..9934c4afc 100644
--- a/include/boost/config/std/optional.hpp
+++ b/include/boost/config/std/optional.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <optional>
 #endif
diff --git a/include/boost/config/std/ostream.hpp b/include/boost/config/std/ostream.hpp
index 780588552..5ae0fdd85 100644
--- a/include/boost/config/std/ostream.hpp
+++ b/include/boost/config/std/ostream.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <ostream>
 #endif
diff --git a/include/boost/config/std/print.hpp b/include/boost/config/std/print.hpp
index fcc74370a..701a2f5fe 100644
--- a/include/boost/config/std/print.hpp
+++ b/include/boost/config/std/print.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <print>
 #endif
diff --git a/include/boost/config/std/queue.hpp b/include/boost/config/std/queue.hpp
index ce5267e99..f645dcb41 100644
--- a/include/boost/config/std/queue.hpp
+++ b/include/boost/config/std/queue.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <queue>
 #endif
diff --git a/include/boost/config/std/random.hpp b/include/boost/config/std/random.hpp
index 562cfd7f7..27dacec61 100644
--- a/include/boost/config/std/random.hpp
+++ b/include/boost/config/std/random.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <random>
 #endif
diff --git a/include/boost/config/std/ranges.hpp b/include/boost/config/std/ranges.hpp
index a65708e12..1222e26db 100644
--- a/include/boost/config/std/ranges.hpp
+++ b/include/boost/config/std/ranges.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <ranges>
 #endif
diff --git a/include/boost/config/std/ratio.hpp b/include/boost/config/std/ratio.hpp
index 19e1f11e4..03929d394 100644
--- a/include/boost/config/std/ratio.hpp
+++ b/include/boost/config/std/ratio.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <ratio>
 #endif
diff --git a/include/boost/config/std/rcu.hpp b/include/boost/config/std/rcu.hpp
index fecac1edc..6dab7e0ca 100644
--- a/include/boost/config/std/rcu.hpp
+++ b/include/boost/config/std/rcu.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <rcu>
 #endif
diff --git a/include/boost/config/std/regex.hpp b/include/boost/config/std/regex.hpp
index 294133080..4086fc1d9 100644
--- a/include/boost/config/std/regex.hpp
+++ b/include/boost/config/std/regex.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <regex>
 #endif
diff --git a/include/boost/config/std/scoped_allocator.hpp b/include/boost/config/std/scoped_allocator.hpp
index 94d9eba03..ecde9cfc4 100644
--- a/include/boost/config/std/scoped_allocator.hpp
+++ b/include/boost/config/std/scoped_allocator.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <scoped_allocator>
 #endif
diff --git a/include/boost/config/std/semaphore.hpp b/include/boost/config/std/semaphore.hpp
index 96b258175..acccba5e1 100644
--- a/include/boost/config/std/semaphore.hpp
+++ b/include/boost/config/std/semaphore.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <semaphore>
 #endif
diff --git a/include/boost/config/std/set.hpp b/include/boost/config/std/set.hpp
index f903f7cf8..3d6d867f6 100644
--- a/include/boost/config/std/set.hpp
+++ b/include/boost/config/std/set.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <set>
 #endif
diff --git a/include/boost/config/std/shared_mutex.hpp b/include/boost/config/std/shared_mutex.hpp
index cdc9ad63c..36b4fe37f 100644
--- a/include/boost/config/std/shared_mutex.hpp
+++ b/include/boost/config/std/shared_mutex.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <shared_mutex>
 #endif
diff --git a/include/boost/config/std/simd.hpp b/include/boost/config/std/simd.hpp
index 7b96876cf..606f5d806 100644
--- a/include/boost/config/std/simd.hpp
+++ b/include/boost/config/std/simd.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <simd>
 #endif
diff --git a/include/boost/config/std/source_location.hpp b/include/boost/config/std/source_location.hpp
index cf0beb4d1..bc4397706 100644
--- a/include/boost/config/std/source_location.hpp
+++ b/include/boost/config/std/source_location.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <source_location>
 #endif
diff --git a/include/boost/config/std/span.hpp b/include/boost/config/std/span.hpp
index 9ceacb4b6..e682f0075 100644
--- a/include/boost/config/std/span.hpp
+++ b/include/boost/config/std/span.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <span>
 #endif
diff --git a/include/boost/config/std/spanstream.hpp b/include/boost/config/std/spanstream.hpp
index cd6b1281e..0e9b82b4a 100644
--- a/include/boost/config/std/spanstream.hpp
+++ b/include/boost/config/std/spanstream.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <spanstream>
 #endif
diff --git a/include/boost/config/std/sstream.hpp b/include/boost/config/std/sstream.hpp
index 7ce330365..6ad2810fd 100644
--- a/include/boost/config/std/sstream.hpp
+++ b/include/boost/config/std/sstream.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <sstream>
 #endif
diff --git a/include/boost/config/std/stack.hpp b/include/boost/config/std/stack.hpp
index 2e3c58faf..cdb4706a3 100644
--- a/include/boost/config/std/stack.hpp
+++ b/include/boost/config/std/stack.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <stack>
 #endif
diff --git a/include/boost/config/std/stacktrace.hpp b/include/boost/config/std/stacktrace.hpp
index a498e19b7..29f543ada 100644
--- a/include/boost/config/std/stacktrace.hpp
+++ b/include/boost/config/std/stacktrace.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <stacktrace>
 #endif
diff --git a/include/boost/config/std/stdexcept.hpp b/include/boost/config/std/stdexcept.hpp
index 9473297e7..e5c7be036 100644
--- a/include/boost/config/std/stdexcept.hpp
+++ b/include/boost/config/std/stdexcept.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <stdexcept>
 #endif
diff --git a/include/boost/config/std/stdfloat.hpp b/include/boost/config/std/stdfloat.hpp
index 38b9c62b9..af1064b26 100644
--- a/include/boost/config/std/stdfloat.hpp
+++ b/include/boost/config/std/stdfloat.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <stdfloat>
 #endif
diff --git a/include/boost/config/std/stop_token.hpp b/include/boost/config/std/stop_token.hpp
index 1c9dd4b2a..2a359a88e 100644
--- a/include/boost/config/std/stop_token.hpp
+++ b/include/boost/config/std/stop_token.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <stop_token>
 #endif
diff --git a/include/boost/config/std/streambuf.hpp b/include/boost/config/std/streambuf.hpp
index cd67c057c..c12b70581 100644
--- a/include/boost/config/std/streambuf.hpp
+++ b/include/boost/config/std/streambuf.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <streambuf>
 #endif
diff --git a/include/boost/config/std/string.hpp b/include/boost/config/std/string.hpp
index 322414be0..180cee614 100644
--- a/include/boost/config/std/string.hpp
+++ b/include/boost/config/std/string.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <string>
 #endif
diff --git a/include/boost/config/std/string_view.hpp b/include/boost/config/std/string_view.hpp
index a30f920e6..a43aa03c8 100644
--- a/include/boost/config/std/string_view.hpp
+++ b/include/boost/config/std/string_view.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <string_view>
 #endif
diff --git a/include/boost/config/std/strstream.hpp b/include/boost/config/std/strstream.hpp
index abbd45564..ab49ef3d6 100644
--- a/include/boost/config/std/strstream.hpp
+++ b/include/boost/config/std/strstream.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <strstream>
 #endif
diff --git a/include/boost/config/std/syncstream.hpp b/include/boost/config/std/syncstream.hpp
index f1f13176c..65407f435 100644
--- a/include/boost/config/std/syncstream.hpp
+++ b/include/boost/config/std/syncstream.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <syncstream>
 #endif
diff --git a/include/boost/config/std/system_error.hpp b/include/boost/config/std/system_error.hpp
index 2d21d9957..4396ef0b6 100644
--- a/include/boost/config/std/system_error.hpp
+++ b/include/boost/config/std/system_error.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <system_error>
 #endif
diff --git a/include/boost/config/std/text_encoding.hpp b/include/boost/config/std/text_encoding.hpp
index 0de6bc933..388dd7c30 100644
--- a/include/boost/config/std/text_encoding.hpp
+++ b/include/boost/config/std/text_encoding.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <text_encoding>
 #endif
diff --git a/include/boost/config/std/thread.hpp b/include/boost/config/std/thread.hpp
index b62889a4a..297b8f54e 100644
--- a/include/boost/config/std/thread.hpp
+++ b/include/boost/config/std/thread.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <thread>
 #endif
diff --git a/include/boost/config/std/tuple.hpp b/include/boost/config/std/tuple.hpp
index f00b5864f..55d518840 100644
--- a/include/boost/config/std/tuple.hpp
+++ b/include/boost/config/std/tuple.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <tuple>
 #endif
diff --git a/include/boost/config/std/type_traits.hpp b/include/boost/config/std/type_traits.hpp
index 395429bba..3a25a7715 100644
--- a/include/boost/config/std/type_traits.hpp
+++ b/include/boost/config/std/type_traits.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <type_traits>
 #endif
diff --git a/include/boost/config/std/typeindex.hpp b/include/boost/config/std/typeindex.hpp
index 752e75c8d..4a6e3d4e7 100644
--- a/include/boost/config/std/typeindex.hpp
+++ b/include/boost/config/std/typeindex.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <typeindex>
 #endif
diff --git a/include/boost/config/std/typeinfo.hpp b/include/boost/config/std/typeinfo.hpp
index e2a584510..95b783fe6 100644
--- a/include/boost/config/std/typeinfo.hpp
+++ b/include/boost/config/std/typeinfo.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <typeinfo>
 #endif
diff --git a/include/boost/config/std/unordered_map.hpp b/include/boost/config/std/unordered_map.hpp
index ac747d6fc..cee5fb1f0 100644
--- a/include/boost/config/std/unordered_map.hpp
+++ b/include/boost/config/std/unordered_map.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <unordered_map>
 #endif
diff --git a/include/boost/config/std/unordered_set.hpp b/include/boost/config/std/unordered_set.hpp
index ae272d168..66f9319a7 100644
--- a/include/boost/config/std/unordered_set.hpp
+++ b/include/boost/config/std/unordered_set.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <unordered_set>
 #endif
diff --git a/include/boost/config/std/utility.hpp b/include/boost/config/std/utility.hpp
index e023cb355..a19e8c30c 100644
--- a/include/boost/config/std/utility.hpp
+++ b/include/boost/config/std/utility.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <utility>
 #endif
diff --git a/include/boost/config/std/valarray.hpp b/include/boost/config/std/valarray.hpp
index 4dd18cf74..289dd8c4f 100644
--- a/include/boost/config/std/valarray.hpp
+++ b/include/boost/config/std/valarray.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <valarray>
 #endif
diff --git a/include/boost/config/std/variant.hpp b/include/boost/config/std/variant.hpp
index 210b2fa13..b80a618d6 100644
--- a/include/boost/config/std/variant.hpp
+++ b/include/boost/config/std/variant.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <variant>
 #endif
diff --git a/include/boost/config/std/vector.hpp b/include/boost/config/std/vector.hpp
index a86e89401..458be26f2 100644
--- a/include/boost/config/std/vector.hpp
+++ b/include/boost/config/std/vector.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <vector>
 #endif
diff --git a/include/boost/config/std/version.hpp b/include/boost/config/std/version.hpp
index 186d5a0b3..49088eb38 100644
--- a/include/boost/config/std/version.hpp
+++ b/include/boost/config/std/version.hpp
@@ -1,5 +1,7 @@
 #ifdef BOOST_USE_MODULES
+#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+#endif
 #else
 #include <version>
 #endif

From 688c740c67e9d9863da29df60d39d7220282c501 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Fri, 30 Jan 2026 23:46:43 +0100
Subject: [PATCH 06/14] GCC support

---
 include/boost/config/compiler/gcc.hpp   | 8 ++++++--
 include/boost/config/platform/linux.hpp | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
index fc05a9186..7f373289f 100644
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -162,9 +162,13 @@
 // See https://svn.boost.org/trac/boost/ticket/11852
 //
 #ifdef __cplusplus
-#include <cstddef>
+#  if defined(__has_include) && __has_include(<version>)
+#    include <version>
+#  else
+#    include <cstddef>
+#  endif
 #else
-#include <stddef.h>
+#  include <stddef.h>
 #endif
 #if defined(_GLIBCXX_USE_FLOAT128) && !defined(__STRICT_ANSI__) && !defined(BOOST_NVCC_CXX03)
 # define BOOST_HAS_FLOAT128
diff --git a/include/boost/config/platform/linux.hpp b/include/boost/config/platform/linux.hpp
index c4eef8f80..614ac5b69 100644
--- a/include/boost/config/platform/linux.hpp
+++ b/include/boost/config/platform/linux.hpp
@@ -12,7 +12,11 @@
 
 // make sure we have __GLIBC_PREREQ if available at all
 #ifdef __cplusplus
-#include <cstdlib>
+#  if defined(__has_include) && __has_include(<version>)
+#    include <version> // lightweight and friendly to modules
+#  else
+#    include <cstdlib>
+#  endif
 #else
 #include <stdlib.h>
 #endif

From 7ef16a2b457933e1ef9b9107bed12fd30a20e667 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Tue, 24 Feb 2026 13:07:43 +0100
Subject: [PATCH 07/14] import compat for C headers

---
 include/boost/config/std/csetjmp.hpp | 1 +
 include/boost/config/std/csignal.hpp | 1 +
 include/boost/config/std/cstdarg.hpp | 1 +
 include/boost/config/std/cstddef.hpp | 1 +
 include/boost/config/std/cstdint.hpp | 1 +
 include/boost/config/std/cstdio.hpp  | 1 +
 include/boost/config/std/cstdlib.hpp | 1 +
 include/boost/config/std/cstring.hpp | 1 +
 include/boost/config/std/ctime.hpp   | 1 +
 include/boost/config/std/cuchar.hpp  | 1 +
 include/boost/config/std/cwchar.hpp  | 1 +
 include/boost/config/std/cwctype.hpp | 1 +
 12 files changed, 12 insertions(+)

diff --git a/include/boost/config/std/csetjmp.hpp b/include/boost/config/std/csetjmp.hpp
index c60cb6eb2..95417e0d6 100644
--- a/include/boost/config/std/csetjmp.hpp
+++ b/include/boost/config/std/csetjmp.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <csetjmp>
diff --git a/include/boost/config/std/csignal.hpp b/include/boost/config/std/csignal.hpp
index 2aa094705..74adf6166 100644
--- a/include/boost/config/std/csignal.hpp
+++ b/include/boost/config/std/csignal.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <csignal>
diff --git a/include/boost/config/std/cstdarg.hpp b/include/boost/config/std/cstdarg.hpp
index 72d3dbd90..ec7fc8210 100644
--- a/include/boost/config/std/cstdarg.hpp
+++ b/include/boost/config/std/cstdarg.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cstdarg>
diff --git a/include/boost/config/std/cstddef.hpp b/include/boost/config/std/cstddef.hpp
index a7ed563d7..5f52754b7 100644
--- a/include/boost/config/std/cstddef.hpp
+++ b/include/boost/config/std/cstddef.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cstddef>
diff --git a/include/boost/config/std/cstdint.hpp b/include/boost/config/std/cstdint.hpp
index 7916c1c16..f1a4b2ca3 100644
--- a/include/boost/config/std/cstdint.hpp
+++ b/include/boost/config/std/cstdint.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cstdint>
diff --git a/include/boost/config/std/cstdio.hpp b/include/boost/config/std/cstdio.hpp
index 473be9203..18837f9c1 100644
--- a/include/boost/config/std/cstdio.hpp
+++ b/include/boost/config/std/cstdio.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cstdio>
diff --git a/include/boost/config/std/cstdlib.hpp b/include/boost/config/std/cstdlib.hpp
index 72ab34b82..1c6538182 100644
--- a/include/boost/config/std/cstdlib.hpp
+++ b/include/boost/config/std/cstdlib.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cstdlib>
diff --git a/include/boost/config/std/cstring.hpp b/include/boost/config/std/cstring.hpp
index 396b0026d..70feb9b96 100644
--- a/include/boost/config/std/cstring.hpp
+++ b/include/boost/config/std/cstring.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cstring>
diff --git a/include/boost/config/std/ctime.hpp b/include/boost/config/std/ctime.hpp
index f4298e4db..dd0dff778 100644
--- a/include/boost/config/std/ctime.hpp
+++ b/include/boost/config/std/ctime.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <ctime>
diff --git a/include/boost/config/std/cuchar.hpp b/include/boost/config/std/cuchar.hpp
index bbabc89be..080522254 100644
--- a/include/boost/config/std/cuchar.hpp
+++ b/include/boost/config/std/cuchar.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cuchar>
diff --git a/include/boost/config/std/cwchar.hpp b/include/boost/config/std/cwchar.hpp
index 275e7b26e..885a55785 100644
--- a/include/boost/config/std/cwchar.hpp
+++ b/include/boost/config/std/cwchar.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cwchar>
diff --git a/include/boost/config/std/cwctype.hpp b/include/boost/config/std/cwctype.hpp
index a660a50bd..c81e0d7ae 100644
--- a/include/boost/config/std/cwctype.hpp
+++ b/include/boost/config/std/cwctype.hpp
@@ -1,6 +1,7 @@
 #ifdef BOOST_USE_MODULES
 #ifndef BOOST_CONFIG_SKIP_IMPORT_STD
 import std;
+import std.compat;
 #endif
 #else
 #include <cwctype>

From 1cb66c7630a71ba8de16920293ac421d6cf03165 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Thu, 26 Feb 2026 13:40:27 +0100
Subject: [PATCH 08/14] Module purview safe headers

---
 include/boost/config.hpp            | 5 +++++
 include/boost/config/workaround.hpp | 6 ++++++
 include/boost/cstdint.hpp           | 4 ++++
 include/boost/static_assert.hpp     | 2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/boost/config.hpp b/include/boost/config.hpp
index f00a98057..20d7b7237 100644
--- a/include/boost/config.hpp
+++ b/include/boost/config.hpp
@@ -14,6 +14,11 @@
 //           DO NOT MODIFY THIS FILE!
 //
 
+// Make the header safe to include from libraries supporting modules
+#if defined(BOOST_IN_MODULE_PURVIEW) && !defined(BOOST_CONFIG_HPP)
+#  error "Please #include <boost/config.hpp> in your module global fragment"
+#endif
+
 #ifndef BOOST_CONFIG_HPP
 #define BOOST_CONFIG_HPP
 
diff --git a/include/boost/config/workaround.hpp b/include/boost/config/workaround.hpp
index 95e319555..bea0c8b0f 100644
--- a/include/boost/config/workaround.hpp
+++ b/include/boost/config/workaround.hpp
@@ -2,6 +2,12 @@
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
+
+// Make the header safe to include from libraries supporting modules
+#if defined(BOOST_IN_MODULE_PURVIEW) && !defined(BOOST_CONFIG_WORKAROUND_HPP)
+#  error "Please #include <boost/config/workaround.hpp> in your module global fragment"
+#endif
+
 #ifndef BOOST_CONFIG_WORKAROUND_HPP
 #define BOOST_CONFIG_WORKAROUND_HPP
 
diff --git a/include/boost/cstdint.hpp b/include/boost/cstdint.hpp
index 967aacfd3..5ccbbfbc9 100644
--- a/include/boost/cstdint.hpp
+++ b/include/boost/cstdint.hpp
@@ -19,6 +19,10 @@
 //   29 Jun 00  Reimplement to avoid including stdint.h within namespace boost
 //    8 Aug 99  Initial version (Beman Dawes)
 
+// Make the header safe to include from libraries supporting modules
+#if defined(BOOST_IN_MODULE_PURVIEW) && !defined(BOOST_CSTDINT_HPP)
+#  error "Please #include <boost/cstdint.hpp> in your module global fragment"
+#endif
 
 #ifndef BOOST_CSTDINT_HPP
 #define BOOST_CSTDINT_HPP
diff --git a/include/boost/static_assert.hpp b/include/boost/static_assert.hpp
index 5aef6c638..88b75e8ff 100644
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@@ -16,7 +16,7 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
-#include <cstddef> //for std::size_t
+#include <boost/config/std/cstddef.hpp> //for std::size_t
 
 #if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__)
 //

From a63efa12ec0e6a8c5d8225a9c100d4e8dd0f3180 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Thu, 26 Feb 2026 13:40:40 +0100
Subject: [PATCH 09/14] Use BOOST_IN_MODULE_PURVIEW

---
 include/boost/config/std/algorithm.hpp          | 2 +-
 include/boost/config/std/any.hpp                | 2 +-
 include/boost/config/std/array.hpp              | 2 +-
 include/boost/config/std/atomic.hpp             | 2 +-
 include/boost/config/std/barrier.hpp            | 2 +-
 include/boost/config/std/bit.hpp                | 2 +-
 include/boost/config/std/bitset.hpp             | 2 +-
 include/boost/config/std/cassert.hpp            | 2 +-
 include/boost/config/std/cctype.hpp             | 2 +-
 include/boost/config/std/cerrno.hpp             | 2 +-
 include/boost/config/std/cfenv.hpp              | 2 +-
 include/boost/config/std/cfloat.hpp             | 2 +-
 include/boost/config/std/charconv.hpp           | 2 +-
 include/boost/config/std/chrono.hpp             | 2 +-
 include/boost/config/std/cinttypes.hpp          | 2 +-
 include/boost/config/std/climits.hpp            | 2 +-
 include/boost/config/std/clocale.hpp            | 2 +-
 include/boost/config/std/cmath.hpp              | 2 +-
 include/boost/config/std/codecvt.hpp            | 2 +-
 include/boost/config/std/compare.hpp            | 2 +-
 include/boost/config/std/complex.hpp            | 2 +-
 include/boost/config/std/concepts.hpp           | 2 +-
 include/boost/config/std/condition_variable.hpp | 2 +-
 include/boost/config/std/coroutine.hpp          | 2 +-
 include/boost/config/std/csetjmp.hpp            | 2 +-
 include/boost/config/std/csignal.hpp            | 2 +-
 include/boost/config/std/cstdarg.hpp            | 2 +-
 include/boost/config/std/cstddef.hpp            | 2 +-
 include/boost/config/std/cstdint.hpp            | 2 +-
 include/boost/config/std/cstdio.hpp             | 2 +-
 include/boost/config/std/cstdlib.hpp            | 2 +-
 include/boost/config/std/cstring.hpp            | 2 +-
 include/boost/config/std/ctime.hpp              | 2 +-
 include/boost/config/std/cuchar.hpp             | 2 +-
 include/boost/config/std/cwchar.hpp             | 2 +-
 include/boost/config/std/cwctype.hpp            | 2 +-
 include/boost/config/std/debugging.hpp          | 2 +-
 include/boost/config/std/deque.hpp              | 2 +-
 include/boost/config/std/exception.hpp          | 2 +-
 include/boost/config/std/execution.hpp          | 2 +-
 include/boost/config/std/expected.hpp           | 2 +-
 include/boost/config/std/filesystem.hpp         | 2 +-
 include/boost/config/std/flat_map.hpp           | 2 +-
 include/boost/config/std/flat_set.hpp           | 2 +-
 include/boost/config/std/format.hpp             | 2 +-
 include/boost/config/std/forward_list.hpp       | 2 +-
 include/boost/config/std/fstream.hpp            | 2 +-
 include/boost/config/std/functional.hpp         | 2 +-
 include/boost/config/std/future.hpp             | 2 +-
 include/boost/config/std/generator.hpp          | 2 +-
 include/boost/config/std/hazard_pointer.hpp     | 2 +-
 include/boost/config/std/initializer_list.hpp   | 2 +-
 include/boost/config/std/inplace_vector.hpp     | 2 +-
 include/boost/config/std/iomanip.hpp            | 2 +-
 include/boost/config/std/ios.hpp                | 2 +-
 include/boost/config/std/iosfwd.hpp             | 2 +-
 include/boost/config/std/iostream.hpp           | 2 +-
 include/boost/config/std/istream.hpp            | 2 +-
 include/boost/config/std/iterator.hpp           | 2 +-
 include/boost/config/std/latch.hpp              | 2 +-
 include/boost/config/std/limits.hpp             | 2 +-
 include/boost/config/std/linalg.hpp             | 2 +-
 include/boost/config/std/list.hpp               | 2 +-
 include/boost/config/std/locale.hpp             | 2 +-
 include/boost/config/std/map.hpp                | 2 +-
 include/boost/config/std/mdspan.hpp             | 2 +-
 include/boost/config/std/memory.hpp             | 2 +-
 include/boost/config/std/memory_resource.hpp    | 2 +-
 include/boost/config/std/mutex.hpp              | 2 +-
 include/boost/config/std/new.hpp                | 2 +-
 include/boost/config/std/numbers.hpp            | 2 +-
 include/boost/config/std/numeric.hpp            | 2 +-
 include/boost/config/std/optional.hpp           | 2 +-
 include/boost/config/std/ostream.hpp            | 2 +-
 include/boost/config/std/print.hpp              | 2 +-
 include/boost/config/std/queue.hpp              | 2 +-
 include/boost/config/std/random.hpp             | 2 +-
 include/boost/config/std/ranges.hpp             | 2 +-
 include/boost/config/std/ratio.hpp              | 2 +-
 include/boost/config/std/rcu.hpp                | 2 +-
 include/boost/config/std/regex.hpp              | 2 +-
 include/boost/config/std/scoped_allocator.hpp   | 2 +-
 include/boost/config/std/semaphore.hpp          | 2 +-
 include/boost/config/std/set.hpp                | 2 +-
 include/boost/config/std/shared_mutex.hpp       | 2 +-
 include/boost/config/std/simd.hpp               | 2 +-
 include/boost/config/std/source_location.hpp    | 2 +-
 include/boost/config/std/span.hpp               | 2 +-
 include/boost/config/std/spanstream.hpp         | 2 +-
 include/boost/config/std/sstream.hpp            | 2 +-
 include/boost/config/std/stack.hpp              | 2 +-
 include/boost/config/std/stacktrace.hpp         | 2 +-
 include/boost/config/std/stdexcept.hpp          | 2 +-
 include/boost/config/std/stdfloat.hpp           | 2 +-
 include/boost/config/std/stop_token.hpp         | 2 +-
 include/boost/config/std/streambuf.hpp          | 2 +-
 include/boost/config/std/string.hpp             | 2 +-
 include/boost/config/std/string_view.hpp        | 2 +-
 include/boost/config/std/strstream.hpp          | 2 +-
 include/boost/config/std/syncstream.hpp         | 2 +-
 include/boost/config/std/system_error.hpp       | 2 +-
 include/boost/config/std/text_encoding.hpp      | 2 +-
 include/boost/config/std/thread.hpp             | 2 +-
 include/boost/config/std/tuple.hpp              | 2 +-
 include/boost/config/std/type_traits.hpp        | 2 +-
 include/boost/config/std/typeindex.hpp          | 2 +-
 include/boost/config/std/typeinfo.hpp           | 2 +-
 include/boost/config/std/unordered_map.hpp      | 2 +-
 include/boost/config/std/unordered_set.hpp      | 2 +-
 include/boost/config/std/utility.hpp            | 2 +-
 include/boost/config/std/valarray.hpp           | 2 +-
 include/boost/config/std/variant.hpp            | 2 +-
 include/boost/config/std/vector.hpp             | 2 +-
 include/boost/config/std/version.hpp            | 2 +-
 114 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/include/boost/config/std/algorithm.hpp b/include/boost/config/std/algorithm.hpp
index e65e98c72..cddf31742 100644
--- a/include/boost/config/std/algorithm.hpp
+++ b/include/boost/config/std/algorithm.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/any.hpp b/include/boost/config/std/any.hpp
index 88873c87f..6cfec3daa 100644
--- a/include/boost/config/std/any.hpp
+++ b/include/boost/config/std/any.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/array.hpp b/include/boost/config/std/array.hpp
index 4ae9d11af..dd0fe0d58 100644
--- a/include/boost/config/std/array.hpp
+++ b/include/boost/config/std/array.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/atomic.hpp b/include/boost/config/std/atomic.hpp
index 325bc7ef4..5ea3bee21 100644
--- a/include/boost/config/std/atomic.hpp
+++ b/include/boost/config/std/atomic.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/barrier.hpp b/include/boost/config/std/barrier.hpp
index 35d51bfe3..1fb459c0b 100644
--- a/include/boost/config/std/barrier.hpp
+++ b/include/boost/config/std/barrier.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/bit.hpp b/include/boost/config/std/bit.hpp
index d0e39bf77..3fda6d527 100644
--- a/include/boost/config/std/bit.hpp
+++ b/include/boost/config/std/bit.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/bitset.hpp b/include/boost/config/std/bitset.hpp
index b6fa07660..c26467589 100644
--- a/include/boost/config/std/bitset.hpp
+++ b/include/boost/config/std/bitset.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/cassert.hpp b/include/boost/config/std/cassert.hpp
index 7ea486079..7fd38da7d 100644
--- a/include/boost/config/std/cassert.hpp
+++ b/include/boost/config/std/cassert.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/cctype.hpp b/include/boost/config/std/cctype.hpp
index 05749d16c..60af52714 100644
--- a/include/boost/config/std/cctype.hpp
+++ b/include/boost/config/std/cctype.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/cerrno.hpp b/include/boost/config/std/cerrno.hpp
index e172658e9..8b6eeec96 100644
--- a/include/boost/config/std/cerrno.hpp
+++ b/include/boost/config/std/cerrno.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/cfenv.hpp b/include/boost/config/std/cfenv.hpp
index 5d361ff99..290bf727e 100644
--- a/include/boost/config/std/cfenv.hpp
+++ b/include/boost/config/std/cfenv.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/cfloat.hpp b/include/boost/config/std/cfloat.hpp
index 66e632507..29e488b5a 100644
--- a/include/boost/config/std/cfloat.hpp
+++ b/include/boost/config/std/cfloat.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/charconv.hpp b/include/boost/config/std/charconv.hpp
index 23c3ac739..3313dcaf2 100644
--- a/include/boost/config/std/charconv.hpp
+++ b/include/boost/config/std/charconv.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/chrono.hpp b/include/boost/config/std/chrono.hpp
index 963bbc784..ee398e441 100644
--- a/include/boost/config/std/chrono.hpp
+++ b/include/boost/config/std/chrono.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/cinttypes.hpp b/include/boost/config/std/cinttypes.hpp
index 18243247c..5240b3036 100644
--- a/include/boost/config/std/cinttypes.hpp
+++ b/include/boost/config/std/cinttypes.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/climits.hpp b/include/boost/config/std/climits.hpp
index d71e388e6..98832a086 100644
--- a/include/boost/config/std/climits.hpp
+++ b/include/boost/config/std/climits.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/clocale.hpp b/include/boost/config/std/clocale.hpp
index 4a9210b19..fc97efa7b 100644
--- a/include/boost/config/std/clocale.hpp
+++ b/include/boost/config/std/clocale.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/cmath.hpp b/include/boost/config/std/cmath.hpp
index 925820ad6..400f6bf55 100644
--- a/include/boost/config/std/cmath.hpp
+++ b/include/boost/config/std/cmath.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/codecvt.hpp b/include/boost/config/std/codecvt.hpp
index b2b28e86b..8e2f218b2 100644
--- a/include/boost/config/std/codecvt.hpp
+++ b/include/boost/config/std/codecvt.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/compare.hpp b/include/boost/config/std/compare.hpp
index 07781601c..7f495c6c3 100644
--- a/include/boost/config/std/compare.hpp
+++ b/include/boost/config/std/compare.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/complex.hpp b/include/boost/config/std/complex.hpp
index 228a9e2dd..d2f170c5a 100644
--- a/include/boost/config/std/complex.hpp
+++ b/include/boost/config/std/complex.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/concepts.hpp b/include/boost/config/std/concepts.hpp
index e19c89922..478894ef6 100644
--- a/include/boost/config/std/concepts.hpp
+++ b/include/boost/config/std/concepts.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/condition_variable.hpp b/include/boost/config/std/condition_variable.hpp
index 06dd3ebbf..c5144909a 100644
--- a/include/boost/config/std/condition_variable.hpp
+++ b/include/boost/config/std/condition_variable.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/coroutine.hpp b/include/boost/config/std/coroutine.hpp
index 6f9a1c08e..457a3d948 100644
--- a/include/boost/config/std/coroutine.hpp
+++ b/include/boost/config/std/coroutine.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/csetjmp.hpp b/include/boost/config/std/csetjmp.hpp
index 95417e0d6..0b7dc712b 100644
--- a/include/boost/config/std/csetjmp.hpp
+++ b/include/boost/config/std/csetjmp.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/csignal.hpp b/include/boost/config/std/csignal.hpp
index 74adf6166..cf863c60d 100644
--- a/include/boost/config/std/csignal.hpp
+++ b/include/boost/config/std/csignal.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cstdarg.hpp b/include/boost/config/std/cstdarg.hpp
index ec7fc8210..28c3a1d83 100644
--- a/include/boost/config/std/cstdarg.hpp
+++ b/include/boost/config/std/cstdarg.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cstddef.hpp b/include/boost/config/std/cstddef.hpp
index 5f52754b7..cb8925462 100644
--- a/include/boost/config/std/cstddef.hpp
+++ b/include/boost/config/std/cstddef.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cstdint.hpp b/include/boost/config/std/cstdint.hpp
index f1a4b2ca3..f1337aeef 100644
--- a/include/boost/config/std/cstdint.hpp
+++ b/include/boost/config/std/cstdint.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cstdio.hpp b/include/boost/config/std/cstdio.hpp
index 18837f9c1..c26cfff8a 100644
--- a/include/boost/config/std/cstdio.hpp
+++ b/include/boost/config/std/cstdio.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cstdlib.hpp b/include/boost/config/std/cstdlib.hpp
index 1c6538182..e310822ac 100644
--- a/include/boost/config/std/cstdlib.hpp
+++ b/include/boost/config/std/cstdlib.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cstring.hpp b/include/boost/config/std/cstring.hpp
index 70feb9b96..853410d4b 100644
--- a/include/boost/config/std/cstring.hpp
+++ b/include/boost/config/std/cstring.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/ctime.hpp b/include/boost/config/std/ctime.hpp
index dd0dff778..0fe9d389f 100644
--- a/include/boost/config/std/ctime.hpp
+++ b/include/boost/config/std/ctime.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cuchar.hpp b/include/boost/config/std/cuchar.hpp
index 080522254..63596bec5 100644
--- a/include/boost/config/std/cuchar.hpp
+++ b/include/boost/config/std/cuchar.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cwchar.hpp b/include/boost/config/std/cwchar.hpp
index 885a55785..cac64e656 100644
--- a/include/boost/config/std/cwchar.hpp
+++ b/include/boost/config/std/cwchar.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/cwctype.hpp b/include/boost/config/std/cwctype.hpp
index c81e0d7ae..fdc368633 100644
--- a/include/boost/config/std/cwctype.hpp
+++ b/include/boost/config/std/cwctype.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 import std.compat;
 #endif
diff --git a/include/boost/config/std/debugging.hpp b/include/boost/config/std/debugging.hpp
index df54df6d2..ef9c0c0fc 100644
--- a/include/boost/config/std/debugging.hpp
+++ b/include/boost/config/std/debugging.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/deque.hpp b/include/boost/config/std/deque.hpp
index 45f532f9f..3d59b582c 100644
--- a/include/boost/config/std/deque.hpp
+++ b/include/boost/config/std/deque.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/exception.hpp b/include/boost/config/std/exception.hpp
index b0954abc1..34e2be3bc 100644
--- a/include/boost/config/std/exception.hpp
+++ b/include/boost/config/std/exception.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/execution.hpp b/include/boost/config/std/execution.hpp
index 009b22a6d..f2cedcd17 100644
--- a/include/boost/config/std/execution.hpp
+++ b/include/boost/config/std/execution.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/expected.hpp b/include/boost/config/std/expected.hpp
index af115445d..869052910 100644
--- a/include/boost/config/std/expected.hpp
+++ b/include/boost/config/std/expected.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/filesystem.hpp b/include/boost/config/std/filesystem.hpp
index 8825c90fb..dffa5fb98 100644
--- a/include/boost/config/std/filesystem.hpp
+++ b/include/boost/config/std/filesystem.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/flat_map.hpp b/include/boost/config/std/flat_map.hpp
index 3d26601bb..0c1feafdc 100644
--- a/include/boost/config/std/flat_map.hpp
+++ b/include/boost/config/std/flat_map.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/flat_set.hpp b/include/boost/config/std/flat_set.hpp
index 307e5859e..b8c044add 100644
--- a/include/boost/config/std/flat_set.hpp
+++ b/include/boost/config/std/flat_set.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/format.hpp b/include/boost/config/std/format.hpp
index 9bb5c3d07..94317aef6 100644
--- a/include/boost/config/std/format.hpp
+++ b/include/boost/config/std/format.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/forward_list.hpp b/include/boost/config/std/forward_list.hpp
index 074af6212..bad4058a7 100644
--- a/include/boost/config/std/forward_list.hpp
+++ b/include/boost/config/std/forward_list.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/fstream.hpp b/include/boost/config/std/fstream.hpp
index 327b0c16f..5f811c8e1 100644
--- a/include/boost/config/std/fstream.hpp
+++ b/include/boost/config/std/fstream.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/functional.hpp b/include/boost/config/std/functional.hpp
index b793d78f4..e6d26a87e 100644
--- a/include/boost/config/std/functional.hpp
+++ b/include/boost/config/std/functional.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/future.hpp b/include/boost/config/std/future.hpp
index 651c4e05b..445f0358c 100644
--- a/include/boost/config/std/future.hpp
+++ b/include/boost/config/std/future.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/generator.hpp b/include/boost/config/std/generator.hpp
index e09ac9a4b..390def89e 100644
--- a/include/boost/config/std/generator.hpp
+++ b/include/boost/config/std/generator.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/hazard_pointer.hpp b/include/boost/config/std/hazard_pointer.hpp
index 9336078eb..5e0cddcf6 100644
--- a/include/boost/config/std/hazard_pointer.hpp
+++ b/include/boost/config/std/hazard_pointer.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/initializer_list.hpp b/include/boost/config/std/initializer_list.hpp
index a3ba92431..33a79a2a1 100644
--- a/include/boost/config/std/initializer_list.hpp
+++ b/include/boost/config/std/initializer_list.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/inplace_vector.hpp b/include/boost/config/std/inplace_vector.hpp
index 9030cbf1d..b8d7bea57 100644
--- a/include/boost/config/std/inplace_vector.hpp
+++ b/include/boost/config/std/inplace_vector.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/iomanip.hpp b/include/boost/config/std/iomanip.hpp
index 7bb81e162..560cb56d4 100644
--- a/include/boost/config/std/iomanip.hpp
+++ b/include/boost/config/std/iomanip.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/ios.hpp b/include/boost/config/std/ios.hpp
index 55157cf37..f7c42a048 100644
--- a/include/boost/config/std/ios.hpp
+++ b/include/boost/config/std/ios.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/iosfwd.hpp b/include/boost/config/std/iosfwd.hpp
index 19a8abc9f..dc98b2ddd 100644
--- a/include/boost/config/std/iosfwd.hpp
+++ b/include/boost/config/std/iosfwd.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/iostream.hpp b/include/boost/config/std/iostream.hpp
index 7714d27c0..a8de1e351 100644
--- a/include/boost/config/std/iostream.hpp
+++ b/include/boost/config/std/iostream.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/istream.hpp b/include/boost/config/std/istream.hpp
index 345028410..f19230a46 100644
--- a/include/boost/config/std/istream.hpp
+++ b/include/boost/config/std/istream.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/iterator.hpp b/include/boost/config/std/iterator.hpp
index 460cf7026..914f24975 100644
--- a/include/boost/config/std/iterator.hpp
+++ b/include/boost/config/std/iterator.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/latch.hpp b/include/boost/config/std/latch.hpp
index f2d333286..0d10691eb 100644
--- a/include/boost/config/std/latch.hpp
+++ b/include/boost/config/std/latch.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/limits.hpp b/include/boost/config/std/limits.hpp
index 49bb2d7e8..b4e950999 100644
--- a/include/boost/config/std/limits.hpp
+++ b/include/boost/config/std/limits.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/linalg.hpp b/include/boost/config/std/linalg.hpp
index f5760bf5b..3b504c7e1 100644
--- a/include/boost/config/std/linalg.hpp
+++ b/include/boost/config/std/linalg.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/list.hpp b/include/boost/config/std/list.hpp
index aeda9ae26..4934d0d77 100644
--- a/include/boost/config/std/list.hpp
+++ b/include/boost/config/std/list.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/locale.hpp b/include/boost/config/std/locale.hpp
index 84d1238c4..698e9fd9f 100644
--- a/include/boost/config/std/locale.hpp
+++ b/include/boost/config/std/locale.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/map.hpp b/include/boost/config/std/map.hpp
index ff8d933cf..ed8555c75 100644
--- a/include/boost/config/std/map.hpp
+++ b/include/boost/config/std/map.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/mdspan.hpp b/include/boost/config/std/mdspan.hpp
index 6db35f9c1..78c8398d4 100644
--- a/include/boost/config/std/mdspan.hpp
+++ b/include/boost/config/std/mdspan.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/memory.hpp b/include/boost/config/std/memory.hpp
index f53d1c086..9cd488990 100644
--- a/include/boost/config/std/memory.hpp
+++ b/include/boost/config/std/memory.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/memory_resource.hpp b/include/boost/config/std/memory_resource.hpp
index 63a852b70..6c7efb005 100644
--- a/include/boost/config/std/memory_resource.hpp
+++ b/include/boost/config/std/memory_resource.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/mutex.hpp b/include/boost/config/std/mutex.hpp
index 8417dee85..7ba33fc38 100644
--- a/include/boost/config/std/mutex.hpp
+++ b/include/boost/config/std/mutex.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/new.hpp b/include/boost/config/std/new.hpp
index fdc382d4b..94e76491e 100644
--- a/include/boost/config/std/new.hpp
+++ b/include/boost/config/std/new.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/numbers.hpp b/include/boost/config/std/numbers.hpp
index 749b52a42..677725f91 100644
--- a/include/boost/config/std/numbers.hpp
+++ b/include/boost/config/std/numbers.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/numeric.hpp b/include/boost/config/std/numeric.hpp
index 07c57d3e1..0dc54f4e5 100644
--- a/include/boost/config/std/numeric.hpp
+++ b/include/boost/config/std/numeric.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/optional.hpp b/include/boost/config/std/optional.hpp
index 9934c4afc..a879b0179 100644
--- a/include/boost/config/std/optional.hpp
+++ b/include/boost/config/std/optional.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/ostream.hpp b/include/boost/config/std/ostream.hpp
index 5ae0fdd85..d75441996 100644
--- a/include/boost/config/std/ostream.hpp
+++ b/include/boost/config/std/ostream.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/print.hpp b/include/boost/config/std/print.hpp
index 701a2f5fe..99cca7aef 100644
--- a/include/boost/config/std/print.hpp
+++ b/include/boost/config/std/print.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/queue.hpp b/include/boost/config/std/queue.hpp
index f645dcb41..28c1bb213 100644
--- a/include/boost/config/std/queue.hpp
+++ b/include/boost/config/std/queue.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/random.hpp b/include/boost/config/std/random.hpp
index 27dacec61..96123a494 100644
--- a/include/boost/config/std/random.hpp
+++ b/include/boost/config/std/random.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/ranges.hpp b/include/boost/config/std/ranges.hpp
index 1222e26db..8217aa8dd 100644
--- a/include/boost/config/std/ranges.hpp
+++ b/include/boost/config/std/ranges.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/ratio.hpp b/include/boost/config/std/ratio.hpp
index 03929d394..4da477da9 100644
--- a/include/boost/config/std/ratio.hpp
+++ b/include/boost/config/std/ratio.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/rcu.hpp b/include/boost/config/std/rcu.hpp
index 6dab7e0ca..b8cbfd3aa 100644
--- a/include/boost/config/std/rcu.hpp
+++ b/include/boost/config/std/rcu.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/regex.hpp b/include/boost/config/std/regex.hpp
index 4086fc1d9..0878d00d4 100644
--- a/include/boost/config/std/regex.hpp
+++ b/include/boost/config/std/regex.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/scoped_allocator.hpp b/include/boost/config/std/scoped_allocator.hpp
index ecde9cfc4..9b7e95fc0 100644
--- a/include/boost/config/std/scoped_allocator.hpp
+++ b/include/boost/config/std/scoped_allocator.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/semaphore.hpp b/include/boost/config/std/semaphore.hpp
index acccba5e1..229621405 100644
--- a/include/boost/config/std/semaphore.hpp
+++ b/include/boost/config/std/semaphore.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/set.hpp b/include/boost/config/std/set.hpp
index 3d6d867f6..aec53155b 100644
--- a/include/boost/config/std/set.hpp
+++ b/include/boost/config/std/set.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/shared_mutex.hpp b/include/boost/config/std/shared_mutex.hpp
index 36b4fe37f..7e148edaa 100644
--- a/include/boost/config/std/shared_mutex.hpp
+++ b/include/boost/config/std/shared_mutex.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/simd.hpp b/include/boost/config/std/simd.hpp
index 606f5d806..b538ddeea 100644
--- a/include/boost/config/std/simd.hpp
+++ b/include/boost/config/std/simd.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/source_location.hpp b/include/boost/config/std/source_location.hpp
index bc4397706..639c55c52 100644
--- a/include/boost/config/std/source_location.hpp
+++ b/include/boost/config/std/source_location.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/span.hpp b/include/boost/config/std/span.hpp
index e682f0075..99ede1d3c 100644
--- a/include/boost/config/std/span.hpp
+++ b/include/boost/config/std/span.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/spanstream.hpp b/include/boost/config/std/spanstream.hpp
index 0e9b82b4a..26cc4256b 100644
--- a/include/boost/config/std/spanstream.hpp
+++ b/include/boost/config/std/spanstream.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/sstream.hpp b/include/boost/config/std/sstream.hpp
index 6ad2810fd..fdb5bf6e2 100644
--- a/include/boost/config/std/sstream.hpp
+++ b/include/boost/config/std/sstream.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/stack.hpp b/include/boost/config/std/stack.hpp
index cdb4706a3..58f262107 100644
--- a/include/boost/config/std/stack.hpp
+++ b/include/boost/config/std/stack.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/stacktrace.hpp b/include/boost/config/std/stacktrace.hpp
index 29f543ada..65d45f815 100644
--- a/include/boost/config/std/stacktrace.hpp
+++ b/include/boost/config/std/stacktrace.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/stdexcept.hpp b/include/boost/config/std/stdexcept.hpp
index e5c7be036..2039bec27 100644
--- a/include/boost/config/std/stdexcept.hpp
+++ b/include/boost/config/std/stdexcept.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/stdfloat.hpp b/include/boost/config/std/stdfloat.hpp
index af1064b26..b7339c6a4 100644
--- a/include/boost/config/std/stdfloat.hpp
+++ b/include/boost/config/std/stdfloat.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/stop_token.hpp b/include/boost/config/std/stop_token.hpp
index 2a359a88e..1cf3fd861 100644
--- a/include/boost/config/std/stop_token.hpp
+++ b/include/boost/config/std/stop_token.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/streambuf.hpp b/include/boost/config/std/streambuf.hpp
index c12b70581..91f712d37 100644
--- a/include/boost/config/std/streambuf.hpp
+++ b/include/boost/config/std/streambuf.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/string.hpp b/include/boost/config/std/string.hpp
index 180cee614..8a07d1743 100644
--- a/include/boost/config/std/string.hpp
+++ b/include/boost/config/std/string.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/string_view.hpp b/include/boost/config/std/string_view.hpp
index a43aa03c8..3a2fb592c 100644
--- a/include/boost/config/std/string_view.hpp
+++ b/include/boost/config/std/string_view.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/strstream.hpp b/include/boost/config/std/strstream.hpp
index ab49ef3d6..641679ae3 100644
--- a/include/boost/config/std/strstream.hpp
+++ b/include/boost/config/std/strstream.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/syncstream.hpp b/include/boost/config/std/syncstream.hpp
index 65407f435..41d8d74c4 100644
--- a/include/boost/config/std/syncstream.hpp
+++ b/include/boost/config/std/syncstream.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/system_error.hpp b/include/boost/config/std/system_error.hpp
index 4396ef0b6..85a760993 100644
--- a/include/boost/config/std/system_error.hpp
+++ b/include/boost/config/std/system_error.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/text_encoding.hpp b/include/boost/config/std/text_encoding.hpp
index 388dd7c30..5e65e3a81 100644
--- a/include/boost/config/std/text_encoding.hpp
+++ b/include/boost/config/std/text_encoding.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/thread.hpp b/include/boost/config/std/thread.hpp
index 297b8f54e..8ded7c048 100644
--- a/include/boost/config/std/thread.hpp
+++ b/include/boost/config/std/thread.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/tuple.hpp b/include/boost/config/std/tuple.hpp
index 55d518840..c91053818 100644
--- a/include/boost/config/std/tuple.hpp
+++ b/include/boost/config/std/tuple.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/type_traits.hpp b/include/boost/config/std/type_traits.hpp
index 3a25a7715..2b4aef6f6 100644
--- a/include/boost/config/std/type_traits.hpp
+++ b/include/boost/config/std/type_traits.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/typeindex.hpp b/include/boost/config/std/typeindex.hpp
index 4a6e3d4e7..f67c2677d 100644
--- a/include/boost/config/std/typeindex.hpp
+++ b/include/boost/config/std/typeindex.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/typeinfo.hpp b/include/boost/config/std/typeinfo.hpp
index 95b783fe6..2da8c296d 100644
--- a/include/boost/config/std/typeinfo.hpp
+++ b/include/boost/config/std/typeinfo.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/unordered_map.hpp b/include/boost/config/std/unordered_map.hpp
index cee5fb1f0..ae9e647ff 100644
--- a/include/boost/config/std/unordered_map.hpp
+++ b/include/boost/config/std/unordered_map.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/unordered_set.hpp b/include/boost/config/std/unordered_set.hpp
index 66f9319a7..87eb40862 100644
--- a/include/boost/config/std/unordered_set.hpp
+++ b/include/boost/config/std/unordered_set.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/utility.hpp b/include/boost/config/std/utility.hpp
index a19e8c30c..20e4555eb 100644
--- a/include/boost/config/std/utility.hpp
+++ b/include/boost/config/std/utility.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/valarray.hpp b/include/boost/config/std/valarray.hpp
index 289dd8c4f..178a58639 100644
--- a/include/boost/config/std/valarray.hpp
+++ b/include/boost/config/std/valarray.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/variant.hpp b/include/boost/config/std/variant.hpp
index b80a618d6..5c7e6b0c8 100644
--- a/include/boost/config/std/variant.hpp
+++ b/include/boost/config/std/variant.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/vector.hpp b/include/boost/config/std/vector.hpp
index 458be26f2..7b132bd56 100644
--- a/include/boost/config/std/vector.hpp
+++ b/include/boost/config/std/vector.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else
diff --git a/include/boost/config/std/version.hpp b/include/boost/config/std/version.hpp
index 49088eb38..0fe87105e 100644
--- a/include/boost/config/std/version.hpp
+++ b/include/boost/config/std/version.hpp
@@ -1,5 +1,5 @@
 #ifdef BOOST_USE_MODULES
-#ifndef BOOST_CONFIG_SKIP_IMPORT_STD
+#ifndef BOOST_IN_MODULE_PURVIEW
 import std;
 #endif
 #else

From 24dd9d9932dbee70b3f7fd0d3a5501b47a3fccc9 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Thu, 26 Feb 2026 20:11:33 +0100
Subject: [PATCH 10/14] gcc fixes

---
 include/boost/config/no_tr1/memory.hpp     | 2 +-
 include/boost/config/stdlib/libstdcpp3.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/config/no_tr1/memory.hpp b/include/boost/config/no_tr1/memory.hpp
index 2b5d20802..768d809a2 100644
--- a/include/boost/config/no_tr1/memory.hpp
+++ b/include/boost/config/no_tr1/memory.hpp
@@ -18,7 +18,7 @@
 #     define BOOST_CONFIG_NO_MEMORY_RECURSION
 #  endif
 
-#  include <memory>
+#  include <boost/config/std/memory.hpp>
 
 #  ifdef BOOST_CONFIG_NO_MEMORY_RECURSION
 #     undef BOOST_TR1_NO_RECURSION
diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp
index ad70936de..a86295985 100644
--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@@ -267,7 +267,7 @@ extern "C" char *gets (char *__s);
 #     if !_GLIBCXX_DEPRECATED
 #        define BOOST_NO_AUTO_PTR
 #     endif
-#  elif !defined(_GLIBCXX_USE_DEPRECATED) || !_GLIBCXX_USE_DEPRECATED
+#  elif !defined(_GLIBCXX_USE_DEPRECATED) || !_GLIBCXX_USE_DEPRECATED || defined(BOOST_USE_MODULES) // the std module doesn't export deprecated functionality
 #     define BOOST_NO_AUTO_PTR
 #     define BOOST_NO_CXX98_BINDERS
 #  endif

From f69c0c91fd53fea487f7a3ac307ba49fb3b08c93 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Thu, 26 Feb 2026 21:53:15 +0100
Subject: [PATCH 11/14] Missing memory replacement

---
 include/boost/config/no_tr1/memory.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/config/no_tr1/memory.hpp b/include/boost/config/no_tr1/memory.hpp
index 2b5d20802..768d809a2 100644
--- a/include/boost/config/no_tr1/memory.hpp
+++ b/include/boost/config/no_tr1/memory.hpp
@@ -18,7 +18,7 @@
 #     define BOOST_CONFIG_NO_MEMORY_RECURSION
 #  endif
 
-#  include <memory>
+#  include <boost/config/std/memory.hpp>
 
 #  ifdef BOOST_CONFIG_NO_MEMORY_RECURSION
 #     undef BOOST_TR1_NO_RECURSION

From 7048737b9460702fc0f71b9e2ab28c1c2c0638ef Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Thu, 5 Mar 2026 16:43:36 +0100
Subject: [PATCH 12/14] Fix old gcc versions that don't know about
 __has_include

---
 include/boost/config/compiler/gcc.hpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
index 7f373289f..6033493ae 100644
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -162,8 +162,12 @@
 // See https://svn.boost.org/trac/boost/ticket/11852
 //
 #ifdef __cplusplus
-#  if defined(__has_include) && __has_include(<version>)
-#    include <version>
+#  ifdef __has_include
+#    if __has_include(<version>)
+#      include <version>
+#    else
+#      include <cstddef>
+#    endif
 #  else
 #    include <cstddef>
 #  endif

From b21608afb41f0dcbdaa616bada153781e6cfb744 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Thu, 5 Mar 2026 20:25:32 +0100
Subject: [PATCH 13/14] Disable warnings header

---
 include/boost/config/disable_module_warnings.hpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 include/boost/config/disable_module_warnings.hpp

diff --git a/include/boost/config/disable_module_warnings.hpp b/include/boost/config/disable_module_warnings.hpp
new file mode 100644
index 000000000..75db379e4
--- /dev/null
+++ b/include/boost/config/disable_module_warnings.hpp
@@ -0,0 +1,15 @@
+// Copyright 2026 Ruben Perez
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#ifdef BOOST_USE_MODULES
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 5244)
+#endif
+#endif
\ No newline at end of file

From 051d29d28ebe771795c83c88233780ce966cc513 Mon Sep 17 00:00:00 2001
From: Ruben Perez <rubenperez038@gmail.com>
Date: Fri, 6 Mar 2026 07:31:40 +0100
Subject: [PATCH 14/14] Fix old gccs (2)

---
 include/boost/config/platform/linux.hpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/boost/config/platform/linux.hpp b/include/boost/config/platform/linux.hpp
index 614ac5b69..d5efc5ca6 100644
--- a/include/boost/config/platform/linux.hpp
+++ b/include/boost/config/platform/linux.hpp
@@ -12,13 +12,17 @@
 
 // make sure we have __GLIBC_PREREQ if available at all
 #ifdef __cplusplus
-#  if defined(__has_include) && __has_include(<version>)
-#    include <version> // lightweight and friendly to modules
+#  ifdef __has_include
+#    if __has_include(<version>)
+#      include <version> // lightweight and friendly to modules
+#    else
+#      include <cstdlib>
+#    endif
 #  else
 #    include <cstdlib>
 #  endif
 #else
-#include <stdlib.h>
+#  include <stdlib.h>
 #endif
 
 //