18 files changed, 10 insertions, 22 deletions
diff --git a/nihil.ucl/CMakeLists.txt b/nihil.ucl/CMakeLists.txt
index df13e84..9d8ab3a 100644
--- a/nihil.ucl/CMakeLists.txt
+++ b/nihil.ucl/CMakeLists.txt
@@ -3,7 +3,7 @@
 pkg_check_modules(LIBUCL REQUIRED libucl)
 
 add_library(nihil.ucl STATIC)
-target_link_libraries(nihil.ucl PUBLIC nihil)
+target_link_libraries(nihil.ucl PRIVATE nihil.error nihil.monad)
 
 target_sources(nihil.ucl
 	PUBLIC FILE_SET modules TYPE CXX_MODULES FILES
diff --git a/nihil.ucl/boolean.cc b/nihil.ucl/boolean.cc
index 2a643b9..91f2b17 100644
--- a/nihil.ucl/boolean.cc
+++ b/nihil.ucl/boolean.cc
@@ -13,7 +13,7 @@ module;
 
 module nihil.ucl;
 
-import nihil;
+import nihil.error;
 
 namespace nihil::ucl {
 
diff --git a/nihil.ucl/errc.cc b/nihil.ucl/errc.cc
index fc1d9f8..0b65b86 100644
--- a/nihil.ucl/errc.cc
+++ b/nihil.ucl/errc.cc
@@ -9,8 +9,6 @@ module;
 
 module nihil.ucl;
 
-import nihil;
-
 namespace nihil::ucl {
 
 struct ucl_error_category final : std::error_category {
diff --git a/nihil.ucl/integer.cc b/nihil.ucl/integer.cc
index f4f08ef..825d8f6 100644
--- a/nihil.ucl/integer.cc
+++ b/nihil.ucl/integer.cc
@@ -13,7 +13,7 @@ module;
 
 module nihil.ucl;
 
-import nihil;
+import nihil.error;
 
 namespace nihil::ucl {
 
diff --git a/nihil.ucl/integer.ccm b/nihil.ucl/integer.ccm
index d5ac72a..0ea490c 100644
--- a/nihil.ucl/integer.ccm
+++ b/nihil.ucl/integer.ccm
@@ -15,7 +15,6 @@ module;
 
 export module nihil.ucl:integer;
 
-import nihil;
 import :object;
 import :type;
 
diff --git a/nihil.ucl/object.cc b/nihil.ucl/object.cc
index ee4968b..9a150fb 100644
--- a/nihil.ucl/object.cc
+++ b/nihil.ucl/object.cc
@@ -12,8 +12,6 @@ module;
 
 module nihil.ucl;
 
-import nihil;
-
 namespace nihil::ucl {
 
 object::object(ref_t, ::ucl_object_t const *object)
diff --git a/nihil.ucl/object.ccm b/nihil.ucl/object.ccm
index 40f2088..dffb54e 100644
--- a/nihil.ucl/object.ccm
+++ b/nihil.ucl/object.ccm
@@ -18,7 +18,6 @@ module;
 
 export module nihil.ucl:object;
 
-import nihil;
 import :type;
 
 namespace nihil::ucl {
diff --git a/nihil.ucl/object_cast.ccm b/nihil.ucl/object_cast.ccm
index 07588a1..3fa9eba 100644
--- a/nihil.ucl/object_cast.ccm
+++ b/nihil.ucl/object_cast.ccm
@@ -12,7 +12,7 @@ module;
 
 export module nihil.ucl:object_cast;
 
-import nihil;
+import nihil.monad;
 import :type;
 import :object;
 import :array;
diff --git a/nihil.ucl/parser.cc b/nihil.ucl/parser.cc
index 2288c4c..0a08670 100644
--- a/nihil.ucl/parser.cc
+++ b/nihil.ucl/parser.cc
@@ -12,7 +12,7 @@ module;
 
 module nihil.ucl;
 
-import nihil;
+import nihil.error;
 
 namespace nihil::ucl {
 
diff --git a/nihil.ucl/parser.ccm b/nihil.ucl/parser.ccm
index 2630c81..20e5c66 100644
--- a/nihil.ucl/parser.ccm
+++ b/nihil.ucl/parser.ccm
@@ -16,7 +16,7 @@ module;
 
 export module nihil.ucl:parser;
 
-import nihil;
+import nihil.monad;
 import :object;
 import :map;
 
diff --git a/nihil.ucl/real.cc b/nihil.ucl/real.cc
index b3d50c3..6d9e082 100644
--- a/nihil.ucl/real.cc
+++ b/nihil.ucl/real.cc
@@ -15,7 +15,7 @@ module;
 
 module nihil.ucl;
 
-import nihil;
+import nihil.error;
 
 namespace nihil::ucl {
 
diff --git a/nihil.ucl/string.cc b/nihil.ucl/string.cc
index 0fc9808..67e97f4 100644
--- a/nihil.ucl/string.cc
+++ b/nihil.ucl/string.cc
@@ -14,7 +14,7 @@ module;
 
 module nihil.ucl;
 
-import nihil;
+import nihil.error;
 
 namespace nihil::ucl {
 
diff --git a/nihil.ucl/string.ccm b/nihil.ucl/string.ccm
index 9127b2d..c757bf1 100644
--- a/nihil.ucl/string.ccm
+++ b/nihil.ucl/string.ccm
@@ -14,7 +14,6 @@ module;
 
 export module nihil.ucl:string;
 
-import nihil;
 import :object;
 import :type;
 
diff --git a/nihil.ucl/tests/CMakeLists.txt b/nihil.ucl/tests/CMakeLists.txt
index 93559a7..0257b4f 100644
--- a/nihil.ucl/tests/CMakeLists.txt
+++ b/nihil.ucl/tests/CMakeLists.txt
@@ -13,9 +13,7 @@ add_executable(nihil.ucl.test
 	string.cc
 )
 
-target_link_libraries(nihil.ucl.test PRIVATE
-	nihil nihil.ucl
-	Catch2::Catch2WithMain)
+target_link_libraries(nihil.ucl.test PRIVATE nihil.ucl Catch2::Catch2WithMain)
 
 find_package(Catch2 REQUIRED)
 
diff --git a/nihil.ucl/tests/array.cc b/nihil.ucl/tests/array.cc
index 37928aa..866fa45 100644
--- a/nihil.ucl/tests/array.cc
+++ b/nihil.ucl/tests/array.cc
@@ -11,7 +11,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <ucl.h>
 
-import nihil;
 import nihil.ucl;
 
 TEST_CASE("ucl: array: invariants", "[ucl]")
diff --git a/nihil.ucl/tests/emit.cc b/nihil.ucl/tests/emit.cc
index d75255b..a7dcd71 100644
--- a/nihil.ucl/tests/emit.cc
+++ b/nihil.ucl/tests/emit.cc
@@ -7,7 +7,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-import nihil;
 import nihil.ucl;
 
 TEST_CASE("ucl: emit to std::ostream", "[ucl]")
diff --git a/nihil.ucl/tests/parse.cc b/nihil.ucl/tests/parse.cc
index c56974e..43ce219 100644
--- a/nihil.ucl/tests/parse.cc
+++ b/nihil.ucl/tests/parse.cc
@@ -7,7 +7,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 
-import nihil;
 import nihil.ucl;
 
 TEST_CASE("ucl parse: iterate array", "[ucl]")
diff --git a/nihil.ucl/type.ccm b/nihil.ucl/type.ccm
index cd98c01..f3b3aef 100644
--- a/nihil.ucl/type.ccm
+++ b/nihil.ucl/type.ccm
@@ -13,7 +13,7 @@ module;
 
 export module nihil.ucl:type;
 
-import nihil;
+import nihil.error;
 
 namespace nihil::ucl {