1 files changed, 9 insertions, 18 deletions
diff --git a/nihil.config/store.ccm b/nihil.config/store.ccm
index 4d37ce0..0a92ef0 100644
--- a/nihil.config/store.ccm
+++ b/nihil.config/store.ccm
@@ -1,25 +1,16 @@
-/*
- * This source code is released into the public domain.
- */
-
-module;
-
-/*
- * The configuration store.  There should only be one of these.
- */
-
-#include <coroutine>
-#include <expected>
-#include <string>
-#include <map>
-
+// This source code is released into the public domain.
 export module nihil.config:store;
 
+// The configuration store.  There should only be one of these.
+
+import nihil.std;
+import nihil.error;
 import nihil.generator;
-import :option;
 
 namespace nihil::config {
 
+export struct option;
+
 struct store final {
 	/*
 	 * Get the global config store.
@@ -57,8 +48,8 @@ struct store final {
 	// Not movable or copyable.
 	store(store const &) = delete;
 	store(store &&) = delete;
-	store& operator=(store const &) = delete;
-	store& operator=(store &&) = delete;
+	auto operator=(store const &) -> store & = delete;
+	auto operator=(store &&) -> store & = delete;
 
 private:
 	store();