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/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
index fc05a9186..6033493ae 100644
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -162,9 +162,17 @@
 // See https://svn.boost.org/trac/boost/ticket/11852
 //
 #ifdef __cplusplus
-#include <cstddef>
+#  ifdef __has_include
+#    if __has_include(<version>)
+#      include <version>
+#    else
+#      include <cstddef>
+#    endif
+#  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/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
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/platform/linux.hpp b/include/boost/config/platform/linux.hpp
index c4eef8f80..d5efc5ca6 100644
--- a/include/boost/config/platform/linux.hpp
+++ b/include/boost/config/platform/linux.hpp
@@ -12,9 +12,17 @@
 
 // make sure we have __GLIBC_PREREQ if available at all
 #ifdef __cplusplus
-#include <cstdlib>
+#  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
 
 //
diff --git a/include/boost/config/std/algorithm.hpp b/include/boost/config/std/algorithm.hpp
new file mode 100644
index 000000000..cddf31742
--- /dev/null
+++ b/include/boost/config/std/algorithm.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..6cfec3daa
--- /dev/null
+++ b/include/boost/config/std/any.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..dd0fe0d58
--- /dev/null
+++ b/include/boost/config/std/array.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..5ea3bee21
--- /dev/null
+++ b/include/boost/config/std/atomic.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..1fb459c0b
--- /dev/null
+++ b/include/boost/config/std/barrier.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..3fda6d527
--- /dev/null
+++ b/include/boost/config/std/bit.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..c26467589
--- /dev/null
+++ b/include/boost/config/std/bitset.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..7fd38da7d
--- /dev/null
+++ b/include/boost/config/std/cassert.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..60af52714
--- /dev/null
+++ b/include/boost/config/std/cctype.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..8b6eeec96
--- /dev/null
+++ b/include/boost/config/std/cerrno.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..290bf727e
--- /dev/null
+++ b/include/boost/config/std/cfenv.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..29e488b5a
--- /dev/null
+++ b/include/boost/config/std/cfloat.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..3313dcaf2
--- /dev/null
+++ b/include/boost/config/std/charconv.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..ee398e441
--- /dev/null
+++ b/include/boost/config/std/chrono.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..5240b3036
--- /dev/null
+++ b/include/boost/config/std/cinttypes.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..98832a086
--- /dev/null
+++ b/include/boost/config/std/climits.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..fc97efa7b
--- /dev/null
+++ b/include/boost/config/std/clocale.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..400f6bf55
--- /dev/null
+++ b/include/boost/config/std/cmath.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..8e2f218b2
--- /dev/null
+++ b/include/boost/config/std/codecvt.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..7f495c6c3
--- /dev/null
+++ b/include/boost/config/std/compare.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..d2f170c5a
--- /dev/null
+++ b/include/boost/config/std/complex.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..478894ef6
--- /dev/null
+++ b/include/boost/config/std/concepts.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..c5144909a
--- /dev/null
+++ b/include/boost/config/std/condition_variable.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..457a3d948
--- /dev/null
+++ b/include/boost/config/std/coroutine.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..0b7dc712b
--- /dev/null
+++ b/include/boost/config/std/csetjmp.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..cf863c60d
--- /dev/null
+++ b/include/boost/config/std/csignal.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..28c3a1d83
--- /dev/null
+++ b/include/boost/config/std/cstdarg.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..cb8925462
--- /dev/null
+++ b/include/boost/config/std/cstddef.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..f1337aeef
--- /dev/null
+++ b/include/boost/config/std/cstdint.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..c26cfff8a
--- /dev/null
+++ b/include/boost/config/std/cstdio.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..e310822ac
--- /dev/null
+++ b/include/boost/config/std/cstdlib.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..853410d4b
--- /dev/null
+++ b/include/boost/config/std/cstring.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..0fe9d389f
--- /dev/null
+++ b/include/boost/config/std/ctime.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..63596bec5
--- /dev/null
+++ b/include/boost/config/std/cuchar.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..cac64e656
--- /dev/null
+++ b/include/boost/config/std/cwchar.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..fdc368633
--- /dev/null
+++ b/include/boost/config/std/cwctype.hpp
@@ -0,0 +1,8 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+import std.compat;
+#endif
+#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..ef9c0c0fc
--- /dev/null
+++ b/include/boost/config/std/debugging.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..3d59b582c
--- /dev/null
+++ b/include/boost/config/std/deque.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..34e2be3bc
--- /dev/null
+++ b/include/boost/config/std/exception.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..f2cedcd17
--- /dev/null
+++ b/include/boost/config/std/execution.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..869052910
--- /dev/null
+++ b/include/boost/config/std/expected.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..dffa5fb98
--- /dev/null
+++ b/include/boost/config/std/filesystem.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..0c1feafdc
--- /dev/null
+++ b/include/boost/config/std/flat_map.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..b8c044add
--- /dev/null
+++ b/include/boost/config/std/flat_set.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..94317aef6
--- /dev/null
+++ b/include/boost/config/std/format.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..bad4058a7
--- /dev/null
+++ b/include/boost/config/std/forward_list.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..5f811c8e1
--- /dev/null
+++ b/include/boost/config/std/fstream.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..e6d26a87e
--- /dev/null
+++ b/include/boost/config/std/functional.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..445f0358c
--- /dev/null
+++ b/include/boost/config/std/future.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..390def89e
--- /dev/null
+++ b/include/boost/config/std/generator.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..5e0cddcf6
--- /dev/null
+++ b/include/boost/config/std/hazard_pointer.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..33a79a2a1
--- /dev/null
+++ b/include/boost/config/std/initializer_list.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..b8d7bea57
--- /dev/null
+++ b/include/boost/config/std/inplace_vector.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..560cb56d4
--- /dev/null
+++ b/include/boost/config/std/iomanip.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..f7c42a048
--- /dev/null
+++ b/include/boost/config/std/ios.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..dc98b2ddd
--- /dev/null
+++ b/include/boost/config/std/iosfwd.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..a8de1e351
--- /dev/null
+++ b/include/boost/config/std/iostream.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..f19230a46
--- /dev/null
+++ b/include/boost/config/std/istream.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..914f24975
--- /dev/null
+++ b/include/boost/config/std/iterator.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..0d10691eb
--- /dev/null
+++ b/include/boost/config/std/latch.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..b4e950999
--- /dev/null
+++ b/include/boost/config/std/limits.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..3b504c7e1
--- /dev/null
+++ b/include/boost/config/std/linalg.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..4934d0d77
--- /dev/null
+++ b/include/boost/config/std/list.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..698e9fd9f
--- /dev/null
+++ b/include/boost/config/std/locale.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..ed8555c75
--- /dev/null
+++ b/include/boost/config/std/map.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..78c8398d4
--- /dev/null
+++ b/include/boost/config/std/mdspan.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..9cd488990
--- /dev/null
+++ b/include/boost/config/std/memory.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..6c7efb005
--- /dev/null
+++ b/include/boost/config/std/memory_resource.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..7ba33fc38
--- /dev/null
+++ b/include/boost/config/std/mutex.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..94e76491e
--- /dev/null
+++ b/include/boost/config/std/new.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..677725f91
--- /dev/null
+++ b/include/boost/config/std/numbers.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..0dc54f4e5
--- /dev/null
+++ b/include/boost/config/std/numeric.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..a879b0179
--- /dev/null
+++ b/include/boost/config/std/optional.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..d75441996
--- /dev/null
+++ b/include/boost/config/std/ostream.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..99cca7aef
--- /dev/null
+++ b/include/boost/config/std/print.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..28c1bb213
--- /dev/null
+++ b/include/boost/config/std/queue.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..96123a494
--- /dev/null
+++ b/include/boost/config/std/random.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..8217aa8dd
--- /dev/null
+++ b/include/boost/config/std/ranges.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..4da477da9
--- /dev/null
+++ b/include/boost/config/std/ratio.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..b8cbfd3aa
--- /dev/null
+++ b/include/boost/config/std/rcu.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..0878d00d4
--- /dev/null
+++ b/include/boost/config/std/regex.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..9b7e95fc0
--- /dev/null
+++ b/include/boost/config/std/scoped_allocator.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..229621405
--- /dev/null
+++ b/include/boost/config/std/semaphore.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..aec53155b
--- /dev/null
+++ b/include/boost/config/std/set.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..7e148edaa
--- /dev/null
+++ b/include/boost/config/std/shared_mutex.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..b538ddeea
--- /dev/null
+++ b/include/boost/config/std/simd.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..639c55c52
--- /dev/null
+++ b/include/boost/config/std/source_location.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..99ede1d3c
--- /dev/null
+++ b/include/boost/config/std/span.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..26cc4256b
--- /dev/null
+++ b/include/boost/config/std/spanstream.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..fdb5bf6e2
--- /dev/null
+++ b/include/boost/config/std/sstream.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..58f262107
--- /dev/null
+++ b/include/boost/config/std/stack.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..65d45f815
--- /dev/null
+++ b/include/boost/config/std/stacktrace.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..2039bec27
--- /dev/null
+++ b/include/boost/config/std/stdexcept.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..b7339c6a4
--- /dev/null
+++ b/include/boost/config/std/stdfloat.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..1cf3fd861
--- /dev/null
+++ b/include/boost/config/std/stop_token.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..91f712d37
--- /dev/null
+++ b/include/boost/config/std/streambuf.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..8a07d1743
--- /dev/null
+++ b/include/boost/config/std/string.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..3a2fb592c
--- /dev/null
+++ b/include/boost/config/std/string_view.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..641679ae3
--- /dev/null
+++ b/include/boost/config/std/strstream.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..41d8d74c4
--- /dev/null
+++ b/include/boost/config/std/syncstream.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..85a760993
--- /dev/null
+++ b/include/boost/config/std/system_error.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..5e65e3a81
--- /dev/null
+++ b/include/boost/config/std/text_encoding.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..8ded7c048
--- /dev/null
+++ b/include/boost/config/std/thread.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..c91053818
--- /dev/null
+++ b/include/boost/config/std/tuple.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..2b4aef6f6
--- /dev/null
+++ b/include/boost/config/std/type_traits.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..f67c2677d
--- /dev/null
+++ b/include/boost/config/std/typeindex.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..2da8c296d
--- /dev/null
+++ b/include/boost/config/std/typeinfo.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..ae9e647ff
--- /dev/null
+++ b/include/boost/config/std/unordered_map.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+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
new file mode 100644
index 000000000..87eb40862
--- /dev/null
+++ b/include/boost/config/std/unordered_set.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..20e4555eb
--- /dev/null
+++ b/include/boost/config/std/utility.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..178a58639
--- /dev/null
+++ b/include/boost/config/std/valarray.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..5c7e6b0c8
--- /dev/null
+++ b/include/boost/config/std/variant.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..7b132bd56
--- /dev/null
+++ b/include/boost/config/std/vector.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#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..0fe87105e
--- /dev/null
+++ b/include/boost/config/std/version.hpp
@@ -0,0 +1,7 @@
+#ifdef BOOST_USE_MODULES
+#ifndef BOOST_IN_MODULE_PURVIEW
+import std;
+#endif
+#else
+#include <version>
+#endif
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
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__)
 //