13 files changed, 18 insertions, 61 deletions
diff --git a/nihil.generator/CMakeLists.txt b/nihil.generator/CMakeLists.txt
index e521159..d9eb854 100644
--- a/nihil.generator/CMakeLists.txt
+++ b/nihil.generator/CMakeLists.txt
@@ -1,6 +1,7 @@
 # This source code is released into the public domain.
 
 add_library(nihil.generator STATIC)
+target_link_libraries(nihil.generator PRIVATE nihil.std)
 target_sources(nihil.generator
 	PUBLIC FILE_SET modules TYPE CXX_MODULES FILES
 	nihil.generator.ccm
diff --git a/nihil.generator/byte_allocator.ccm b/nihil.generator/byte_allocator.ccm
index 6d46ec6..86b2edf 100644
--- a/nihil.generator/byte_allocator.ccm
+++ b/nihil.generator/byte_allocator.ccm
@@ -11,13 +11,10 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <memory>
-#include <type_traits>
-
 export module nihil.generator:byte_allocator;
 
+import nihil.std;
+
 namespace nihil {
 
 template <typename Alloc>
diff --git a/nihil.generator/coroutine_traits.ccm b/nihil.generator/coroutine_traits.ccm
index 2a9d51d..fde4393 100644
--- a/nihil.generator/coroutine_traits.ccm
+++ b/nihil.generator/coroutine_traits.ccm
@@ -11,13 +11,9 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <coroutine>
-#include <memory>
-
 export module nihil.generator:coroutine_traits;
 
+import nihil.std;
 import :byte_allocator;
 import :forward;
 import :generator_promise;
diff --git a/nihil.generator/elements_of.ccm b/nihil.generator/elements_of.ccm
index 0e34eb9..74c8b76 100644
--- a/nihil.generator/elements_of.ccm
+++ b/nihil.generator/elements_of.ccm
@@ -11,12 +11,9 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <concepts>
-
 export module nihil.generator:elements_of;
 
+import nihil.std;
 import :util;
 
 namespace nihil {
diff --git a/nihil.generator/forward.ccm b/nihil.generator/forward.ccm
index 8d5ca4d..71e0ddd 100644
--- a/nihil.generator/forward.ccm
+++ b/nihil.generator/forward.ccm
@@ -11,12 +11,9 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <type_traits>
-
 export module nihil.generator:forward;
 
+import nihil.std;
 import :util;
 
 namespace nihil {
diff --git a/nihil.generator/generator.ccm b/nihil.generator/generator.ccm
index 96790a8..7627052 100644
--- a/nihil.generator/generator.ccm
+++ b/nihil.generator/generator.ccm
@@ -14,15 +14,10 @@
 module;
 
 #include <cassert>
-#include <coroutine>
-#include <exception>
-#include <memory>
-#include <ranges>
-#include <type_traits>
-#include <utility>
 
 export module nihil.generator:generator;
 
+import nihil.std;
 import :byte_allocator;
 import :coroutine_traits;
 import :elements_of;
diff --git a/nihil.generator/generator.test.cc b/nihil.generator/generator.test.cc
index 49272b4..59a2c45 100644
--- a/nihil.generator/generator.test.cc
+++ b/nihil.generator/generator.test.cc
@@ -1,13 +1,8 @@
-/*
- * This source code is released into the public domain.
- */
-
-#include <coroutine>
-#include <ranges>
-#include <vector>
+// This source code is released into the public domain.
 
 #include <catch2/catch_test_macros.hpp>
 
+import nihil.std;
 import nihil.generator;
 
 TEST_CASE("generator: basic", "[generator]") 
diff --git a/nihil.generator/generator_promise.ccm b/nihil.generator/generator_promise.ccm
index b0fd4b1..3e8aa8c 100644
--- a/nihil.generator/generator_promise.ccm
+++ b/nihil.generator/generator_promise.ccm
@@ -11,13 +11,9 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <coroutine>
-#include <ranges>
-
 export module nihil.generator:generator_promise;
 
+import nihil.std;
 import :forward;
 import :generator_promise_base;
 import :promise_base_alloc;
diff --git a/nihil.generator/generator_promise_base.ccm b/nihil.generator/generator_promise_base.ccm
index fec9b1b..30c3011 100644
--- a/nihil.generator/generator_promise_base.ccm
+++ b/nihil.generator/generator_promise_base.ccm
@@ -11,14 +11,9 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <coroutine>
-#include <exception>
-#include <memory>
-
 export module nihil.generator:generator_promise_base;
 
+import nihil.std;
 import :elements_of;
 import :forward;
 import :manual_lifetime;
diff --git a/nihil.generator/manual_lifetime.ccm b/nihil.generator/manual_lifetime.ccm
index 963e6c9..4a383ad 100644
--- a/nihil.generator/manual_lifetime.ccm
+++ b/nihil.generator/manual_lifetime.ccm
@@ -11,13 +11,10 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <concepts>
-#include <memory>
-
 export module nihil.generator:manual_lifetime;
 
+import nihil.std;
+
 namespace nihil {
 
 template <typename T>
diff --git a/nihil.generator/nihil.generator.ccm b/nihil.generator/nihil.generator.ccm
index 550a4c7..fc6a097 100644
--- a/nihil.generator/nihil.generator.ccm
+++ b/nihil.generator/nihil.generator.ccm
@@ -11,12 +11,10 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <ranges>
-
 export module nihil.generator;
 
+import nihil.std;
+
 export import :coroutine_traits;
 export import :elements_of;
 export import :generator;
diff --git a/nihil.generator/promise_base_alloc.ccm b/nihil.generator/promise_base_alloc.ccm
index e59fc57..7fd544b 100644
--- a/nihil.generator/promise_base_alloc.ccm
+++ b/nihil.generator/promise_base_alloc.ccm
@@ -11,13 +11,9 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <cstdlib>
-#include <memory>
-
 export module nihil.generator:promise_base_alloc;
 
+import nihil.std;
 import :util;
 
 namespace nihil {
diff --git a/nihil.generator/util.ccm b/nihil.generator/util.ccm
index 4d732b9..259499a 100644
--- a/nihil.generator/util.ccm
+++ b/nihil.generator/util.ccm
@@ -11,13 +11,10 @@
 // (See accompanying file LICENSE or http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-module;
-
-#include <concepts>
-#include <memory>
-
 export module nihil.generator:util;
 
+import nihil.std;
+
 namespace nihil {
 
 export struct use_allocator_arg {};