7 files changed, 10 insertions, 7 deletions
diff --git a/nihil.config/option.cc b/nihil.config/option.cc
index 5f163ac..5a09ca8 100644
--- a/nihil.config/option.cc
+++ b/nihil.config/option.cc
@@ -2,8 +2,8 @@
 module nihil.config;
 
 import nihil.std;
+import nihil.core;
 import nihil.ucl;
-import nihil.util;
 
 namespace nihil::config {
 
diff --git a/nihil.config/option.ccm b/nihil.config/option.ccm
index 8c64653..24a3339 100644
--- a/nihil.config/option.ccm
+++ b/nihil.config/option.ccm
@@ -2,7 +2,7 @@
 export module nihil.config:option;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 import nihil.ucl;
 
 namespace nihil::config {
diff --git a/nihil.config/read.ccm b/nihil.config/read.ccm
index 1c1b897..94e9157 100644
--- a/nihil.config/read.ccm
+++ b/nihil.config/read.ccm
@@ -2,9 +2,10 @@
 export module nihil.config:read;
 
 import nihil.std;
+import nihil.core;
 import nihil.posix;
 import nihil.ucl;
-import nihil.util;
+
 import :option;
 import :store;
 
diff --git a/nihil.config/store.cc b/nihil.config/store.cc
index ed8de1d..08850c4 100644
--- a/nihil.config/store.cc
+++ b/nihil.config/store.cc
@@ -2,8 +2,8 @@
 module nihil.config;
 
 import nihil.std;
+import nihil.core;
 import nihil.generator;
-import nihil.util;
 
 namespace nihil::config {
 
diff --git a/nihil.config/store.ccm b/nihil.config/store.ccm
index e4229a7..2ceb52b 100644
--- a/nihil.config/store.ccm
+++ b/nihil.config/store.ccm
@@ -5,7 +5,7 @@ export module nihil.config:store;
 
 import nihil.std;
 import nihil.generator;
-import nihil.util;
+import nihil.core;
 
 namespace nihil::config {
 
diff --git a/nihil.config/string.ccm b/nihil.config/string.ccm
index c5e7284..8a114d2 100644
--- a/nihil.config/string.ccm
+++ b/nihil.config/string.ccm
@@ -2,8 +2,9 @@
 export module nihil.config:string;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 import nihil.ucl;
+
 import :option;
 
 namespace nihil::config {
diff --git a/nihil.config/write.ccm b/nihil.config/write.ccm
index be2cfd7..00d7b52 100644
--- a/nihil.config/write.ccm
+++ b/nihil.config/write.ccm
@@ -2,9 +2,10 @@
 export module nihil.config:write;
 
 import nihil.std;
+import nihil.core;
 import nihil.posix;
 import nihil.ucl;
-import nihil.util;
+
 import :option;
 import :store;