11 files changed, 23 insertions, 11 deletions
diff --git a/nihil.config/CMakeLists.txt b/nihil.config/CMakeLists.txt
index fb2c1db..8a52d3c 100644
--- a/nihil.config/CMakeLists.txt
+++ b/nihil.config/CMakeLists.txt
@@ -1,7 +1,12 @@
 # This source code is released into the public domain.
 
 add_library(nihil.config STATIC)
-target_link_libraries(nihil.config PUBLIC nihil nihil.ucl)
+target_link_libraries(nihil.config PRIVATE
+	nihil.error
+	nihil.generator
+	nihil.posix
+	nihil.ucl
+)
 target_sources(nihil.config
 	PUBLIC FILE_SET modules TYPE CXX_MODULES FILES
 	nihil.config.ccm
diff --git a/nihil.config/option.cc b/nihil.config/option.cc
index 588a48f..bcaf167 100644
--- a/nihil.config/option.cc
+++ b/nihil.config/option.cc
@@ -11,7 +11,8 @@ module;
 
 module nihil.config;
 
-import nihil;
+import nihil.error;
+import nihil.monad;
 import nihil.ucl;
 
 namespace nihil::config {
diff --git a/nihil.config/option.ccm b/nihil.config/option.ccm
index c6ebcae..4b95793 100644
--- a/nihil.config/option.ccm
+++ b/nihil.config/option.ccm
@@ -10,7 +10,7 @@ module;
 
 export module nihil.config:option;
 
-import nihil;
+import nihil.error;
 import nihil.ucl;
 
 namespace nihil::config {
diff --git a/nihil.config/read.cc b/nihil.config/read.cc
index e7def91..48484fb 100644
--- a/nihil.config/read.cc
+++ b/nihil.config/read.cc
@@ -13,7 +13,9 @@ module;
 
 module nihil.config;
 
-import nihil;
+import nihil.error;
+import nihil.monad;
+import nihil.posix;
 import nihil.ucl;
 
 namespace nihil::config {
diff --git a/nihil.config/read.ccm b/nihil.config/read.ccm
index fca78eb..9cf28c9 100644
--- a/nihil.config/read.ccm
+++ b/nihil.config/read.ccm
@@ -9,7 +9,7 @@ module;
 
 export module nihil.config:read;
 
-import nihil;
+import nihil.error;
 
 namespace nihil::config {
 
diff --git a/nihil.config/store.cc b/nihil.config/store.cc
index 6f93677..0fb8cc0 100644
--- a/nihil.config/store.cc
+++ b/nihil.config/store.cc
@@ -12,7 +12,9 @@ module;
 
 module nihil.config;
 
-import nihil;
+import nihil.error;
+import nihil.generator;
+import nihil.monad;
 
 namespace nihil::config {
 
diff --git a/nihil.config/store.ccm b/nihil.config/store.ccm
index 03d09d3..4d37ce0 100644
--- a/nihil.config/store.ccm
+++ b/nihil.config/store.ccm
@@ -15,7 +15,7 @@ module;
 
 export module nihil.config:store;
 
-import nihil;
+import nihil.generator;
 import :option;
 
 namespace nihil::config {
diff --git a/nihil.config/string.cc b/nihil.config/string.cc
index 7d0c038..0ca4605 100644
--- a/nihil.config/string.cc
+++ b/nihil.config/string.cc
@@ -11,7 +11,8 @@ module;
 
 module nihil.config;
 
-import nihil;
+import nihil.error;
+import nihil.monad;
 import nihil.ucl;
 
 namespace nihil::config {
diff --git a/nihil.config/string.ccm b/nihil.config/string.ccm
index b6a7e05..668bbc0 100644
--- a/nihil.config/string.ccm
+++ b/nihil.config/string.ccm
@@ -10,7 +10,6 @@ module;
 
 export module nihil.config:string;
 
-import nihil;
 import nihil.ucl;
 import :option;
 
diff --git a/nihil.config/write.cc b/nihil.config/write.cc
index 8c02c43..80125a8 100644
--- a/nihil.config/write.cc
+++ b/nihil.config/write.cc
@@ -12,7 +12,9 @@ module;
 
 module nihil.config;
 
-import nihil;
+import nihil.error;
+import nihil.monad;
+import nihil.posix;
 import nihil.ucl;
 
 namespace nihil::config {
diff --git a/nihil.config/write.ccm b/nihil.config/write.ccm
index 8fb8151..564bb20 100644
--- a/nihil.config/write.ccm
+++ b/nihil.config/write.ccm
@@ -9,7 +9,7 @@ module;
 
 export module nihil.config:write;
 
-import nihil;
+import nihil.error;
 
 namespace nihil::config {