diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc
index c001f1eca..f57d84229 100644
--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@@ -1,17 +1,17 @@
-#include "archive.hh"
-#include "binary-cache-store.hh"
-#include "compression.hh"
-#include "derivations.hh"
-#include "fs-accessor.hh"
-#include "nar-info.hh"
-#include "sync.hh"
-#include "remote-fs-accessor.hh"
-#include "nar-info-disk-cache.hh" // IWYU pragma: keep
-#include "nar-accessor.hh"
-#include "temporary-dir.hh"
-#include "thread-pool.hh"
-#include "signals.hh"
-#include "strings.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/binary-cache-store.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libstore/remote-fs-accessor.hh"
+#include "lix/libstore/nar-info-disk-cache.hh" // IWYU pragma: keep
+#include "lix/libstore/nar-accessor.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
 
 #include <chrono>
 #include <regex>
diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh
index 2ad26cc65..b58c391be 100644
--- a/src/libstore/binary-cache-store.hh
+++ b/src/libstore/binary-cache-store.hh
@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "crypto.hh"
-#include "store-api.hh"
-#include "log-store.hh"
+#include "lix/libstore/crypto.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/log-store.hh"
 
-#include "pool.hh"
+#include "lix/libutil/pool.hh"
 
 #include <atomic>
 
diff --git a/src/libstore/build-result.cc b/src/libstore/build-result.cc
index de280c13f..d7d570af7 100644
--- a/src/libstore/build-result.cc
+++ b/src/libstore/build-result.cc
@@ -1,4 +1,4 @@
-#include "build-result.hh"
+#include "lix/libstore/build-result.hh"
 
 namespace nix {
 
diff --git a/src/libstore/build-result.hh b/src/libstore/build-result.hh
index 846c6c9b9..ef7e64982 100644
--- a/src/libstore/build-result.hh
+++ b/src/libstore/build-result.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "realisation.hh"
-#include "derived-path.hh"
-#include "comparator.hh"
+#include "lix/libstore/realisation.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libutil/comparator.hh"
 
 #include <string>
 #include <chrono>
diff --git a/src/libstore/build/child.cc b/src/libstore/build/child.cc
index 3b675d8b4..631a1aa6f 100644
--- a/src/libstore/build/child.cc
+++ b/src/libstore/build/child.cc
@@ -1,5 +1,5 @@
-#include "current-process.hh"
-#include "logging.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libutil/logging.hh"
 
 namespace nix {
 
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index d54c08b3b..edea769ac 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -1,16 +1,16 @@
-#include "derivation-goal.hh"
-#include "file-system.hh"
-#include "hook-instance.hh"
-#include "worker.hh"
-#include "finally.hh"
-#include "compression.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh" // IWYU pragma: keep
-#include "local-store.hh" // TODO remove, along with remaining downcasts
-#include "logging-json.hh"
-#include "substitution-goal.hh"
-#include "drv-output-substitution-goal.hh"
-#include "strings.hh"
+#include "lix/libstore/build/derivation-goal.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/build/hook-instance.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh" // IWYU pragma: keep
+#include "lix/libstore/local-store.hh" // TODO remove, along with remaining downcasts
+#include "lix/libutil/logging-json.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libstore/build/drv-output-substitution-goal.hh"
+#include "lix/libutil/strings.hh"
 
 #include <boost/outcome/try.hpp>
 #include <fstream>
diff --git a/src/libstore/build/derivation-goal.hh b/src/libstore/build/derivation-goal.hh
index 6dd58afd2..ca5ba542b 100644
--- a/src/libstore/build/derivation-goal.hh
+++ b/src/libstore/build/derivation-goal.hh
@@ -1,13 +1,13 @@
 #pragma once
 ///@file
 
-#include "notifying-counter.hh"
-#include "parsed-derivations.hh"
-#include "lock.hh"
-#include "outputs-spec.hh"
-#include "store-api.hh"
-#include "pathlocks.hh"
-#include "goal.hh"
+#include "lix/libutil/notifying-counter.hh"
+#include "lix/libstore/parsed-derivations.hh"
+#include "lix/libstore/lock.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libstore/build/goal.hh"
 #include <kj/time.h>
 
 namespace nix {
diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc
index f04beb884..0e3f5545f 100644
--- a/src/libstore/build/drv-output-substitution-goal.cc
+++ b/src/libstore/build/drv-output-substitution-goal.cc
@@ -1,9 +1,9 @@
-#include "drv-output-substitution-goal.hh"
-#include "build-result.hh"
-#include "finally.hh"
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "signals.hh"
+#include "lix/libstore/build/drv-output-substitution-goal.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libutil/signals.hh"
 #include <kj/array.h>
 #include <kj/async.h>
 #include <kj/vector.h>
diff --git a/src/libstore/build/drv-output-substitution-goal.hh b/src/libstore/build/drv-output-substitution-goal.hh
index f959e2a7b..f82a68a27 100644
--- a/src/libstore/build/drv-output-substitution-goal.hh
+++ b/src/libstore/build/drv-output-substitution-goal.hh
@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "notifying-counter.hh"
-#include "store-api.hh"
-#include "goal.hh"
-#include "realisation.hh"
+#include "lix/libutil/notifying-counter.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build/goal.hh"
+#include "lix/libstore/realisation.hh"
 #include <future>
 
 namespace nix {
diff --git a/src/libstore/build/entry-points.cc b/src/libstore/build/entry-points.cc
index 36ad35be0..65e5fb29b 100644
--- a/src/libstore/build/entry-points.cc
+++ b/src/libstore/build/entry-points.cc
@@ -1,8 +1,8 @@
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "derivation-goal.hh"
-#include "local-store.hh"
-#include "strings.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libstore/build/derivation-goal.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/build/goal.cc b/src/libstore/build/goal.cc
index db16e2cf8..53dd6c087 100644
--- a/src/libstore/build/goal.cc
+++ b/src/libstore/build/goal.cc
@@ -1,6 +1,6 @@
-#include "goal.hh"
-#include "async-collect.hh"
-#include "worker.hh"
+#include "lix/libstore/build/goal.hh"
+#include "lix/libutil/async-collect.hh"
+#include "lix/libstore/build/worker.hh"
 #include <boost/outcome/try.hpp>
 #include <kj/time.h>
 
diff --git a/src/libstore/build/goal.hh b/src/libstore/build/goal.hh
index 5b66a2c08..8b4043d10 100644
--- a/src/libstore/build/goal.hh
+++ b/src/libstore/build/goal.hh
@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "async-semaphore.hh"
-#include "result.hh"
-#include "types.hh"
-#include "store-api.hh"
-#include "build-result.hh"
+#include "lix/libutil/async-semaphore.hh"
+#include "lix/libutil/result.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build-result.hh"
 #include <concepts> // IWYU pragma: keep
 #include <kj/async.h>
 
diff --git a/src/libstore/build/hook-instance.cc b/src/libstore/build/hook-instance.cc
index 6c5cffcf9..c4e82919b 100644
--- a/src/libstore/build/hook-instance.cc
+++ b/src/libstore/build/hook-instance.cc
@@ -1,9 +1,9 @@
-#include "child.hh"
-#include "error.hh"
-#include "file-system.hh"
-#include "globals.hh"
-#include "hook-instance.hh"
-#include "strings.hh"
+#include "lix/libstore/build/child.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/build/hook-instance.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/build/hook-instance.hh b/src/libstore/build/hook-instance.hh
index b8632d299..38fd85ccb 100644
--- a/src/libstore/build/hook-instance.hh
+++ b/src/libstore/build/hook-instance.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "logging.hh"
-#include "processes.hh"
-#include "serialise.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/serialise.hh"
 
 namespace nix {
 
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
index a507c4078..17b374546 100644
--- a/src/libstore/build/local-derivation-goal.cc
+++ b/src/libstore/build/local-derivation-goal.cc
@@ -1,24 +1,24 @@
-#include "local-derivation-goal.hh"
-#include "error.hh"
-#include "indirect-root-store.hh"
-#include "machines.hh"
-#include "store-api.hh"
-#include "temporary-dir.hh"
-#include "worker.hh"
-#include "builtins.hh"
-#include "builtins/buildenv.hh"
-#include "path-references.hh"
-#include "archive.hh"
-#include "daemon.hh"
-#include "topo-sort.hh"
-#include "json-utils.hh"
-#include "cgroup.hh"
-#include "personality.hh"
-#include "namespaces.hh"
-#include "child.hh"
-#include "unix-domain-socket.hh"
-#include "mount.hh"
-#include "strings.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libstore/indirect-root-store.hh"
+#include "lix/libstore/machines.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libstore/builtins.hh"
+#include "lix/libstore/builtins/buildenv.hh"
+#include "lix/libstore/path-references.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/daemon.hh"
+#include "lix/libutil/topo-sort.hh"
+#include "lix/libutil/json-utils.hh"
+#include "lix/libutil/cgroup.hh"
+#include "lix/libstore/build/personality.hh"
+#include "lix/libutil/namespaces.hh"
+#include "lix/libstore/build/child.hh"
+#include "lix/libutil/unix-domain-socket.hh"
+#include "lix/libutil/mount.hh"
+#include "lix/libutil/strings.hh"
 
 #include <regex>
 #include <queue>
diff --git a/src/libstore/build/local-derivation-goal.hh b/src/libstore/build/local-derivation-goal.hh
index cd6ea2b55..cfd31ef81 100644
--- a/src/libstore/build/local-derivation-goal.hh
+++ b/src/libstore/build/local-derivation-goal.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "derivation-goal.hh"
-#include "local-store.hh"
-#include "processes.hh"
+#include "lix/libstore/build/derivation-goal.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libutil/processes.hh"
 
 namespace nix {
 
diff --git a/src/libstore/build/personality.cc b/src/libstore/build/personality.cc
index 1a6201758..a9ccc568e 100644
--- a/src/libstore/build/personality.cc
+++ b/src/libstore/build/personality.cc
@@ -1,5 +1,5 @@
-#include "personality.hh"
-#include "globals.hh"
+#include "lix/libstore/build/personality.hh"
+#include "lix/libstore/globals.hh"
 
 #if __linux__
 #include <sys/utsname.h>
diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc
index 2d0c594ac..a464632c3 100644
--- a/src/libstore/build/substitution-goal.cc
+++ b/src/libstore/build/substitution-goal.cc
@@ -1,8 +1,8 @@
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "nar-info.hh"
-#include "signals.hh"
-#include "finally.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/finally.hh"
 #include <boost/outcome/try.hpp>
 #include <kj/array.h>
 #include <kj/vector.h>
diff --git a/src/libstore/build/substitution-goal.hh b/src/libstore/build/substitution-goal.hh
index 18b4262a4..af67abf49 100644
--- a/src/libstore/build/substitution-goal.hh
+++ b/src/libstore/build/substitution-goal.hh
@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "lock.hh"
-#include "notifying-counter.hh"
-#include "store-api.hh"
-#include "goal.hh"
+#include "lix/libstore/lock.hh"
+#include "lix/libutil/notifying-counter.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build/goal.hh"
 
 namespace nix {
 
diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc
index 2a764b193..e9e6efe74 100644
--- a/src/libstore/build/worker.cc
+++ b/src/libstore/build/worker.cc
@@ -1,12 +1,12 @@
-#include "async-collect.hh"
-#include "charptr-cast.hh"
-#include "worker.hh"
-#include "finally.hh"
-#include "substitution-goal.hh"
-#include "drv-output-substitution-goal.hh"
-#include "local-derivation-goal.hh"
-#include "signals.hh"
-#include "hook-instance.hh" // IWYU pragma: keep
+#include "lix/libutil/async-collect.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libstore/build/drv-output-substitution-goal.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/build/hook-instance.hh" // IWYU pragma: keep
 #include <boost/outcome/try.hpp>
 #include <kj/vector.h>
 
diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh
index 369e58b41..0fa12d719 100644
--- a/src/libstore/build/worker.hh
+++ b/src/libstore/build/worker.hh
@@ -1,14 +1,14 @@
 #pragma once
 ///@file
 
-#include "async-semaphore.hh"
-#include "concepts.hh"
-#include "notifying-counter.hh"
-#include "types.hh"
-#include "lock.hh"
-#include "store-api.hh"
-#include "goal.hh"
-#include "realisation.hh"
+#include "lix/libutil/async-semaphore.hh"
+#include "lix/libutil/concepts.hh"
+#include "lix/libutil/notifying-counter.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/lock.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build/goal.hh"
+#include "lix/libstore/realisation.hh"
 
 #include <future>
 #include <kj/async-io.h>
diff --git a/src/libstore/builtins.hh b/src/libstore/builtins.hh
index e20d14b90..db39db1da 100644
--- a/src/libstore/builtins.hh
+++ b/src/libstore/builtins.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "derivations.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 
diff --git a/src/libstore/builtins/buildenv.cc b/src/libstore/builtins/buildenv.cc
index 9fe5f6660..2d6cac388 100644
--- a/src/libstore/builtins/buildenv.cc
+++ b/src/libstore/builtins/buildenv.cc
@@ -1,5 +1,5 @@
-#include "buildenv.hh"
-#include "strings.hh"
+#include "lix/libstore/builtins/buildenv.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/libstore/builtins/buildenv.hh b/src/libstore/builtins/buildenv.hh
index 0923c2adb..f01834acf 100644
--- a/src/libstore/builtins/buildenv.hh
+++ b/src/libstore/builtins/buildenv.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "derivations.hh"
-#include "store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/builtins/fetchurl.cc b/src/libstore/builtins/fetchurl.cc
index 06ab0505a..8dd9bf7ab 100644
--- a/src/libstore/builtins/fetchurl.cc
+++ b/src/libstore/builtins/fetchurl.cc
@@ -1,9 +1,9 @@
-#include "builtins.hh"
-#include "filetransfer.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "compression.hh"
-#include "strings.hh"
+#include "lix/libstore/builtins.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/builtins/unpack-channel.cc b/src/libstore/builtins/unpack-channel.cc
index ba04bb16c..1fc6afd2b 100644
--- a/src/libstore/builtins/unpack-channel.cc
+++ b/src/libstore/builtins/unpack-channel.cc
@@ -1,5 +1,5 @@
-#include "builtins.hh"
-#include "tarfile.hh"
+#include "lix/libstore/builtins.hh"
+#include "lix/libutil/tarfile.hh"
 
 namespace nix {
 
diff --git a/src/libstore/common-protocol-impl.hh b/src/libstore/common-protocol-impl.hh
index 387f848ed..f5447c008 100644
--- a/src/libstore/common-protocol-impl.hh
+++ b/src/libstore/common-protocol-impl.hh
@@ -8,8 +8,8 @@
  * contributing guide.
  */
 
-#include "common-protocol.hh"
-#include "length-prefixed-protocol-helper.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/length-prefixed-protocol-helper.hh"
 
 namespace nix {
 
diff --git a/src/libstore/common-protocol.cc b/src/libstore/common-protocol.cc
index 4e2b2df31..d0385c9c6 100644
--- a/src/libstore/common-protocol.cc
+++ b/src/libstore/common-protocol.cc
@@ -1,9 +1,9 @@
-#include "serialise.hh"
-#include "path-with-outputs.hh"
-#include "store-api.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "derivations.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh"
+#include "lix/libstore/derivations.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libstore/common-protocol.hh b/src/libstore/common-protocol.hh
index 2118ca5fe..a45d2390e 100644
--- a/src/libstore/common-protocol.hh
+++ b/src/libstore/common-protocol.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "serialise.hh"
+#include "lix/libutil/serialise.hh"
 
 namespace nix {
 
diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc
index dae311609..29b621e13 100644
--- a/src/libstore/content-address.cc
+++ b/src/libstore/content-address.cc
@@ -1,7 +1,7 @@
-#include "args.hh"
-#include "content-address.hh"
-#include "split.hh"
-#include "strings.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libstore/content-address.hh"
+#include "lix/libutil/split.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/content-address.hh b/src/libstore/content-address.hh
index 200543704..118ddd4d7 100644
--- a/src/libstore/content-address.hh
+++ b/src/libstore/content-address.hh
@@ -2,10 +2,10 @@
 ///@file
 
 #include <variant>
-#include "hash.hh"
-#include "path.hh"
-#include "comparator.hh"
-#include "variant-wrapper.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/variant-wrapper.hh"
 
 namespace nix {
 
diff --git a/src/libstore/crypto.cc b/src/libstore/crypto.cc
index 6f4a36735..650e05e06 100644
--- a/src/libstore/crypto.cc
+++ b/src/libstore/crypto.cc
@@ -1,8 +1,8 @@
-#include "charptr-cast.hh"
-#include "crypto.hh"
-#include "file-system.hh"
-#include "globals.hh"
-#include "strings.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libstore/crypto.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sodium.h>
 
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 93b405c01..236050089 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -1,19 +1,19 @@
-#include "daemon.hh"
-#include "monitor-fd.hh"
-#include "worker-protocol.hh"
-#include "worker-protocol-impl.hh"
-#include "build-result.hh" // IWYU pragma: keep
-#include "store-api.hh"
-#include "store-cast.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
-#include "indirect-root-store.hh"
-#include "path-with-outputs.hh"
-#include "finally.hh"
-#include "archive.hh"
-#include "derivations.hh"
-#include "strings.hh"
-#include "args.hh"
+#include "lix/libstore/daemon.hh"
+#include "lix/libutil/monitor-fd.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/worker-protocol-impl.hh"
+#include "lix/libstore/build-result.hh" // IWYU pragma: keep
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/store-cast.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/log-store.hh"
+#include "lix/libstore/indirect-root-store.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/args.hh"
 
 #include <sstream>
 
diff --git a/src/libstore/daemon.hh b/src/libstore/daemon.hh
index 1964c0d99..9e004ec6c 100644
--- a/src/libstore/daemon.hh
+++ b/src/libstore/daemon.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "serialise.hh"
-#include "store-api.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix::daemon {
 
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 93baa9f20..5b1e189f0 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -1,13 +1,13 @@
-#include "derivations.hh"
-#include "downstream-placeholder.hh"
-#include "store-api.hh"
-#include "globals.hh"
-#include "types.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "json-utils.hh"
-#include "strings.hh"
-#include "backed-string-view.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/downstream-placeholder.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh"
+#include "lix/libutil/json-utils.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/backed-string-view.hh"
 
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index f83dde621..909c701b2 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -1,15 +1,15 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "types.hh"
-#include "hash.hh"
-#include "content-address.hh"
-#include "repair-flag.hh"
-#include "derived-path-map.hh"
-#include "sync.hh"
-#include "comparator.hh"
-#include "variant-wrapper.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/content-address.hh"
+#include "lix/libutil/repair-flag.hh"
+#include "lix/libstore/derived-path-map.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/variant-wrapper.hh"
 
 #include <map>
 #include <variant>
diff --git a/src/libstore/derived-path-map.cc b/src/libstore/derived-path-map.cc
index 5982c04b3..d8c833b28 100644
--- a/src/libstore/derived-path-map.cc
+++ b/src/libstore/derived-path-map.cc
@@ -1,4 +1,4 @@
-#include "derived-path-map.hh"
+#include "lix/libstore/derived-path-map.hh"
 
 namespace nix {
 
diff --git a/src/libstore/derived-path-map.hh b/src/libstore/derived-path-map.hh
index 393cdedf7..1efe7a267 100644
--- a/src/libstore/derived-path-map.hh
+++ b/src/libstore/derived-path-map.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "derived-path.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/derived-path.hh"
 
 namespace nix {
 
diff --git a/src/libstore/derived-path.cc b/src/libstore/derived-path.cc
index 22977c7b1..f042f234b 100644
--- a/src/libstore/derived-path.cc
+++ b/src/libstore/derived-path.cc
@@ -1,5 +1,5 @@
-#include "derived-path.hh"
-#include "store-api.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libstore/derived-path.hh b/src/libstore/derived-path.hh
index b75415aec..d110ce434 100644
--- a/src/libstore/derived-path.hh
+++ b/src/libstore/derived-path.hh
@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "config.hh"
-#include "path.hh"
-#include "outputs-spec.hh"
-#include "comparator.hh"
-#include "ref.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/ref.hh"
 
 #include <variant>
 
diff --git a/src/libstore/downstream-placeholder.cc b/src/libstore/downstream-placeholder.cc
index d6af5c951..d725c967b 100644
--- a/src/libstore/downstream-placeholder.cc
+++ b/src/libstore/downstream-placeholder.cc
@@ -1,5 +1,5 @@
-#include "downstream-placeholder.hh"
-#include "derivations.hh"
+#include "lix/libstore/downstream-placeholder.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 
diff --git a/src/libstore/downstream-placeholder.hh b/src/libstore/downstream-placeholder.hh
index c911ecea2..c53864f3d 100644
--- a/src/libstore/downstream-placeholder.hh
+++ b/src/libstore/downstream-placeholder.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "hash.hh"
-#include "path.hh"
-#include "derived-path.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/derived-path.hh"
 
 namespace nix {
 
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index f14b7ddd1..39ac49177 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -1,5 +1,5 @@
-#include "dummy-store.hh"
-#include "store-api.hh"
+#include "lix/libstore/dummy-store.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/export-import.cc b/src/libstore/export-import.cc
index 2ccb7f213..50305464f 100644
--- a/src/libstore/export-import.cc
+++ b/src/libstore/export-import.cc
@@ -1,8 +1,8 @@
-#include "serialise.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh"
 
 #include <algorithm>
 
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
index c29132d9c..68ead1d82 100644
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -1,10 +1,10 @@
-#include "filetransfer.hh"
-#include "namespaces.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "s3.hh"
-#include "signals.hh"
-#include "strings.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/namespaces.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/s3.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
 #include <cstddef>
 
 #include <cstdio>
diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh
index 417102dde..1891904b0 100644
--- a/src/libstore/filetransfer.hh
+++ b/src/libstore/filetransfer.hh
@@ -1,12 +1,12 @@
 #pragma once
 ///@file
 
-#include "box_ptr.hh"
-#include "ref.hh"
-#include "logging.hh"
-#include "serialise.hh"
-#include "types.hh"
-#include "config.hh"
+#include "lix/libutil/box_ptr.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/config.hh"
 
 #include <string>
 #include <future>
diff --git a/src/libstore/fs-accessor.hh b/src/libstore/fs-accessor.hh
index 1df19e647..b32ac4e72 100644
--- a/src/libstore/fs-accessor.hh
+++ b/src/libstore/fs-accessor.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 
diff --git a/src/libstore/gc-store.hh b/src/libstore/gc-store.hh
index 88c997247..516c7d2f0 100644
--- a/src/libstore/gc-store.hh
+++ b/src/libstore/gc-store.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 
 namespace nix {
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 72a32823a..18a7e6026 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -1,11 +1,11 @@
-#include "globals.hh"
-#include "local-store.hh"
-#include "pathlocks.hh"
-#include "processes.hh"
-#include "signals.hh"
-#include "finally.hh"
-#include "unix-domain-socket.hh"
-#include "strings.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/unix-domain-socket.hh"
+#include "lix/libutil/strings.hh"
 
 #include <queue>
 #include <regex>
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index bd7e7abb5..6ecf65769 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -1,13 +1,13 @@
-#include "environment-variables.hh"
-#include "globals.hh"
-#include "file-system.hh"
-#include "logging.hh"
-#include "strings.hh"
-#include "users.hh"
-#include "args.hh"
-#include "abstract-setting-to-json.hh"
-#include "compute-levels.hh"
-#include "current-process.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/abstract-setting-to-json.hh"
+#include "lix/libutil/compute-levels.hh"
+#include "lix/libutil/current-process.hh"
 
 #include <algorithm>
 #include <mutex>
@@ -25,23 +25,23 @@
 #include <dlfcn.h>
 #endif
 
-#include "config-impl.hh"
+#include "lix/libutil/config-impl.hh"
 
 #ifdef __APPLE__
-#include "processes.hh"
+#include "lix/libutil/processes.hh"
 #include <curl/curl.h>
 #include <sys/sysctl.h>
 #endif
 
 // All built-in store implementations.
-#include "dummy-store.hh"
-#include "http-binary-cache-store.hh"
-#include "legacy-ssh-store.hh"
-#include "local-binary-cache-store.hh"
-#include "local-store.hh"
-#include "s3-binary-cache-store.hh"
-#include "ssh-store.hh"
-#include "uds-remote-store.hh"
+#include "lix/libstore/dummy-store.hh"
+#include "lix/libstore/http-binary-cache-store.hh"
+#include "lix/libstore/legacy-ssh-store.hh"
+#include "lix/libstore/local-binary-cache-store.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/s3-binary-cache-store.hh"
+#include "lix/libstore/ssh-store.hh"
+#include "lix/libstore/uds-remote-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 6c0a62741..c5e149233 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "environment-variables.hh"
-#include "types.hh"
-#include "config.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/config.hh"
 
 #include <map>
 #include <limits>
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index 778892943..260ede2a4 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -1,8 +1,8 @@
-#include "http-binary-cache-store.hh"
-#include "binary-cache-store.hh"
-#include "filetransfer.hh"
-#include "globals.hh"
-#include "nar-info-disk-cache.hh"
+#include "lix/libstore/http-binary-cache-store.hh"
+#include "lix/libstore/binary-cache-store.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
 
 namespace nix {
 
diff --git a/src/libstore/indirect-root-store.hh b/src/libstore/indirect-root-store.hh
index 59e45af45..9bfa1f68b 100644
--- a/src/libstore/indirect-root-store.hh
+++ b/src/libstore/indirect-root-store.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "local-fs-store.hh"
+#include "lix/libstore/local-fs-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 4433b411d..4a0b33a0b 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -1,16 +1,16 @@
-#include "legacy-ssh-store.hh"
-#include "archive.hh"
-#include "pool.hh"
-#include "remote-store.hh"
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
-#include "build-result.hh"
-#include "store-api.hh"
-#include "path-with-outputs.hh"
-#include "ssh.hh"
-#include "ssh-store.hh"
-#include "strings.hh"
-#include "derivations.hh"
+#include "lix/libstore/legacy-ssh-store.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libutil/pool.hh"
+#include "lix/libstore/remote-store.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/ssh.hh"
+#include "lix/libstore/ssh-store.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 
diff --git a/src/libstore/length-prefixed-protocol-helper.hh b/src/libstore/length-prefixed-protocol-helper.hh
index 423bc77b8..5119a9536 100644
--- a/src/libstore/length-prefixed-protocol-helper.hh
+++ b/src/libstore/length-prefixed-protocol-helper.hh
@@ -6,8 +6,8 @@
  * Used by both the Worker and Serve protocols.
  */
 
-#include "types.hh"
-#include "serialise.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/serialise.hh"
 
 namespace nix {
 
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index 2f6a092e1..de66bee98 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -1,7 +1,7 @@
-#include "local-binary-cache-store.hh"
-#include "binary-cache-store.hh"
-#include "globals.hh"
-#include "nar-info-disk-cache.hh"
+#include "lix/libstore/local-binary-cache-store.hh"
+#include "lix/libstore/binary-cache-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
 
 #include <atomic>
 
diff --git a/src/libstore/local-fs-store.cc b/src/libstore/local-fs-store.cc
index b5b1959be..52d9c04f5 100644
--- a/src/libstore/local-fs-store.cc
+++ b/src/libstore/local-fs-store.cc
@@ -1,10 +1,10 @@
-#include "archive.hh"
-#include "fs-accessor.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "globals.hh"
-#include "compression.hh"
-#include "derivations.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 
diff --git a/src/libstore/local-fs-store.hh b/src/libstore/local-fs-store.hh
index 5b7a149cb..bebddeb56 100644
--- a/src/libstore/local-fs-store.hh
+++ b/src/libstore/local-fs-store.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/log-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index cb7f97841..7a3cf62d7 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1,17 +1,17 @@
-#include "local-store.hh"
-#include "globals.hh"
-#include "archive.hh"
-#include "pathlocks.hh"
-#include "temporary-dir.hh"
-#include "worker-protocol.hh"
-#include "derivations.hh"
-#include "nar-info.hh"
-#include "references.hh"
-#include "topo-sort.hh"
-#include "signals.hh"
-#include "finally.hh"
-#include "compression.hh"
-#include "strings.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/topo-sort.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libutil/strings.hh"
 
 #include <algorithm>
 #include <cstring>
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 1913aa192..6a88faa21 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "sqlite.hh"
+#include "lix/libstore/sqlite.hh"
 
-#include "store-api.hh"
-#include "indirect-root-store.hh"
-#include "sync.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/indirect-root-store.hh"
+#include "lix/libutil/sync.hh"
 
 #include <chrono>
 #include <future>
diff --git a/src/libstore/lock.cc b/src/libstore/lock.cc
index 377499c0a..397199f57 100644
--- a/src/libstore/lock.cc
+++ b/src/libstore/lock.cc
@@ -1,8 +1,8 @@
-#include "lock.hh"
-#include "logging.hh"
-#include "file-system.hh"
-#include "globals.hh"
-#include "pathlocks.hh"
+#include "lix/libstore/lock.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/pathlocks.hh"
 
 #include <pwd.h>
 #include <grp.h>
diff --git a/src/libstore/log-store.cc b/src/libstore/log-store.cc
index 8a26832ab..f8364fb89 100644
--- a/src/libstore/log-store.cc
+++ b/src/libstore/log-store.cc
@@ -1,4 +1,4 @@
-#include "log-store.hh"
+#include "lix/libstore/log-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/log-store.hh b/src/libstore/log-store.hh
index a84f7dbeb..a6153fc56 100644
--- a/src/libstore/log-store.hh
+++ b/src/libstore/log-store.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 
 namespace nix {
diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc
index 7314e3177..b5a1bfea0 100644
--- a/src/libstore/machines.cc
+++ b/src/libstore/machines.cc
@@ -1,7 +1,7 @@
-#include "machines.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "strings.hh"
+#include "lix/libstore/machines.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/strings.hh"
 
 #include <algorithm>
 
diff --git a/src/libstore/machines.hh b/src/libstore/machines.hh
index 56d9bed30..2430347c7 100644
--- a/src/libstore/machines.hh
+++ b/src/libstore/machines.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "ref.hh"
+#include "lix/libutil/ref.hh"
 #include <set>
 #include <vector>
 
diff --git a/src/libstore/make-content-addressed.cc b/src/libstore/make-content-addressed.cc
index 0c592ce22..cdc3ad122 100644
--- a/src/libstore/make-content-addressed.cc
+++ b/src/libstore/make-content-addressed.cc
@@ -1,6 +1,6 @@
-#include "make-content-addressed.hh"
-#include "references.hh"
-#include "strings.hh"
+#include "lix/libstore/make-content-addressed.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/make-content-addressed.hh b/src/libstore/make-content-addressed.hh
index 60bb2b477..13240ca1d 100644
--- a/src/libstore/make-content-addressed.hh
+++ b/src/libstore/make-content-addressed.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index 7ea7c189a..2dac16892 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -1,12 +1,12 @@
-#include "derivations.hh"
-#include "parsed-derivations.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "thread-pool.hh"
-#include "topo-sort.hh"
-#include "closure.hh"
-#include "filetransfer.hh"
-#include "strings.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/parsed-derivations.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "lix/libutil/topo-sort.hh"
+#include "lix/libutil/closure.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/names.cc b/src/libstore/names.cc
index d72530d6f..b4102218d 100644
--- a/src/libstore/names.cc
+++ b/src/libstore/names.cc
@@ -1,5 +1,5 @@
-#include "names.hh"
-#include "strings.hh"
+#include "lix/libstore/names.hh"
+#include "lix/libutil/strings.hh"
 
 #include <regex>
 
diff --git a/src/libstore/names.hh b/src/libstore/names.hh
index a6909d545..0c98b3c56 100644
--- a/src/libstore/names.hh
+++ b/src/libstore/names.hh
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 
diff --git a/src/libstore/nar-accessor.cc b/src/libstore/nar-accessor.cc
index f228004a9..d409a0019 100644
--- a/src/libstore/nar-accessor.cc
+++ b/src/libstore/nar-accessor.cc
@@ -1,5 +1,5 @@
-#include "nar-accessor.hh"
-#include "archive.hh"
+#include "lix/libstore/nar-accessor.hh"
+#include "lix/libutil/archive.hh"
 
 #include <map>
 #include <memory>
diff --git a/src/libstore/nar-accessor.hh b/src/libstore/nar-accessor.hh
index 4299daf1b..e334e460b 100644
--- a/src/libstore/nar-accessor.hh
+++ b/src/libstore/nar-accessor.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "fs-accessor.hh"
-#include "ref.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libutil/ref.hh"
 
 #include <functional>
 
diff --git a/src/libstore/nar-info-disk-cache.cc b/src/libstore/nar-info-disk-cache.cc
index c83a8fbfb..fe088dd7b 100644
--- a/src/libstore/nar-info-disk-cache.cc
+++ b/src/libstore/nar-info-disk-cache.cc
@@ -1,10 +1,10 @@
-#include "nar-info-disk-cache.hh"
-#include "logging.hh"
-#include "sync.hh"
-#include "sqlite.hh"
-#include "globals.hh"
-#include "users.hh"
-#include "strings.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libstore/sqlite.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sqlite3.h>
 #include <nlohmann/json.hpp>
diff --git a/src/libstore/nar-info-disk-cache.hh b/src/libstore/nar-info-disk-cache.hh
index bbd1d05d5..a41e3bcca 100644
--- a/src/libstore/nar-info-disk-cache.hh
+++ b/src/libstore/nar-info-disk-cache.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "ref.hh"
-#include "nar-info.hh"
-#include "realisation.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libstore/realisation.hh"
 
 namespace nix {
 
diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc
index 0434873df..fc11d4c8d 100644
--- a/src/libstore/nar-info.cc
+++ b/src/libstore/nar-info.cc
@@ -1,6 +1,6 @@
-#include "strings.hh"
-#include "nar-info.hh"
-#include "store-api.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/nar-info.hh b/src/libstore/nar-info.hh
index 5dbdafac3..5f0819461 100644
--- a/src/libstore/nar-info.hh
+++ b/src/libstore/nar-info.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "hash.hh"
-#include "path-info.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/path-info.hh"
 
 namespace nix {
 
diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc
index 67004387c..2effe5f88 100644
--- a/src/libstore/optimise-store.cc
+++ b/src/libstore/optimise-store.cc
@@ -1,7 +1,7 @@
-#include "local-store.hh"
-#include "globals.hh"
-#include "signals.hh"
-#include "strings.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
 
 #include <cstring>
 #include <sys/types.h>
diff --git a/src/libstore/outputs-spec.cc b/src/libstore/outputs-spec.cc
index 0d740c324..b073d3d72 100644
--- a/src/libstore/outputs-spec.cc
+++ b/src/libstore/outputs-spec.cc
@@ -1,10 +1,10 @@
 #include <regex>
 #include <nlohmann/json.hpp>
 
-#include "regex-combinators.hh"
-#include "outputs-spec.hh"
-#include "path-regex.hh"
-#include "strings.hh"
+#include "lix/libutil/regex-combinators.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libstore/path-regex.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/outputs-spec.hh b/src/libstore/outputs-spec.hh
index 1ef99a5fc..2e2170c33 100644
--- a/src/libstore/outputs-spec.hh
+++ b/src/libstore/outputs-spec.hh
@@ -6,10 +6,10 @@
 #include <set>
 #include <variant>
 
-#include "comparator.hh"
-#include "json-impls.hh"
-#include "comparator.hh"
-#include "variant-wrapper.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/json-impls.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/variant-wrapper.hh"
 
 namespace nix {
 
diff --git a/src/libstore/parsed-derivations.cc b/src/libstore/parsed-derivations.cc
index 1b2ec914d..324c6906e 100644
--- a/src/libstore/parsed-derivations.cc
+++ b/src/libstore/parsed-derivations.cc
@@ -1,5 +1,5 @@
-#include "parsed-derivations.hh"
-#include "strings.hh"
+#include "lix/libstore/parsed-derivations.hh"
+#include "lix/libutil/strings.hh"
 
 #include <nlohmann/json.hpp>
 #include <regex>
diff --git a/src/libstore/parsed-derivations.hh b/src/libstore/parsed-derivations.hh
index 71085a604..36621d01d 100644
--- a/src/libstore/parsed-derivations.hh
+++ b/src/libstore/parsed-derivations.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "derivations.hh"
-#include "store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <nlohmann/json_fwd.hpp>
 
diff --git a/src/libstore/path-info.cc b/src/libstore/path-info.cc
index 54519a867..d0b0aacd5 100644
--- a/src/libstore/path-info.cc
+++ b/src/libstore/path-info.cc
@@ -1,6 +1,6 @@
-#include "path-info.hh"
-#include "store-api.hh"
-#include "strings.hh"
+#include "lix/libstore/path-info.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/path-info.hh b/src/libstore/path-info.hh
index c4c4a6366..ad022e752 100644
--- a/src/libstore/path-info.hh
+++ b/src/libstore/path-info.hh
@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "crypto.hh"
-#include "path.hh"
-#include "hash.hh"
-#include "content-address.hh"
+#include "lix/libstore/crypto.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/content-address.hh"
 
 #include <string>
 #include <optional>
diff --git a/src/libstore/path-references.cc b/src/libstore/path-references.cc
index d2ed85e52..74ae4ebf8 100644
--- a/src/libstore/path-references.cc
+++ b/src/libstore/path-references.cc
@@ -1,6 +1,6 @@
-#include "path-references.hh"
-#include "hash.hh"
-#include "archive.hh"
+#include "lix/libstore/path-references.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libutil/archive.hh"
 
 #include <map>
 
diff --git a/src/libstore/path-references.hh b/src/libstore/path-references.hh
index 0553003f8..0298e2d8f 100644
--- a/src/libstore/path-references.hh
+++ b/src/libstore/path-references.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "references.hh"
-#include "path.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libstore/path.hh"
 
 namespace nix {
 
diff --git a/src/libstore/path-with-outputs.cc b/src/libstore/path-with-outputs.cc
index c49531acb..8b6f5eacb 100644
--- a/src/libstore/path-with-outputs.cc
+++ b/src/libstore/path-with-outputs.cc
@@ -1,6 +1,6 @@
-#include "path-with-outputs.hh"
-#include "store-api.hh"
-#include "strings.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/path-with-outputs.hh b/src/libstore/path-with-outputs.hh
index 8e2da1908..32ad57fc8 100644
--- a/src/libstore/path-with-outputs.hh
+++ b/src/libstore/path-with-outputs.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "derived-path.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/derived-path.hh"
 
 namespace nix {
 
diff --git a/src/libstore/path.cc b/src/libstore/path.cc
index 82ed20285..8e818a9ca 100644
--- a/src/libstore/path.cc
+++ b/src/libstore/path.cc
@@ -1,4 +1,4 @@
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <sodium.h>
 
diff --git a/src/libstore/path.hh b/src/libstore/path.hh
index 09b4710c1..0b855b98c 100644
--- a/src/libstore/path.hh
+++ b/src/libstore/path.hh
@@ -4,7 +4,7 @@
 #include <string_view>
 #include <string>
 
-#include "types.hh" // IWYU pragma: keep
+#include "lix/libutil/types.hh" // IWYU pragma: keep
 
 namespace nix {
 
diff --git a/src/libstore/pathlocks.cc b/src/libstore/pathlocks.cc
index 3225857ec..8c990ef4a 100644
--- a/src/libstore/pathlocks.cc
+++ b/src/libstore/pathlocks.cc
@@ -1,6 +1,6 @@
-#include "pathlocks.hh"
-#include "logging.hh"
-#include "signals.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/signals.hh"
 
 #include <cerrno>
 
diff --git a/src/libstore/pathlocks.hh b/src/libstore/pathlocks.hh
index feb0f5548..3f46c873a 100644
--- a/src/libstore/pathlocks.hh
+++ b/src/libstore/pathlocks.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "error.hh"
-#include "file-descriptor.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-descriptor.hh"
 
 namespace nix {
 
diff --git a/src/libstore/platform.cc b/src/libstore/platform.cc
index 36f8e352a..e7db1b769 100644
--- a/src/libstore/platform.cc
+++ b/src/libstore/platform.cc
@@ -1,8 +1,8 @@
-#include "local-store.hh"
-#include "build/local-derivation-goal.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
 
 #if __linux__
-#include "platform/linux.hh"
+#include "lix/libstore/platform/linux.hh"
 #elif __APPLE__
 #include "platform/darwin.hh"
 #elif __FreeBSD__
diff --git a/src/libstore/platform/darwin.cc b/src/libstore/platform/darwin.cc
index c039bd142..6e5a5f796 100644
--- a/src/libstore/platform/darwin.cc
+++ b/src/libstore/platform/darwin.cc
@@ -1,8 +1,8 @@
-#include "gc-store.hh"
-#include "signals.hh"
-#include "platform/darwin.hh"
-#include "regex.hh"
-#include "strings.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/platform/darwin.hh"
+#include "lix/libutil/regex.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/proc_info.h>
 #include <sys/sysctl.h>
diff --git a/src/libstore/platform/darwin.hh b/src/libstore/platform/darwin.hh
index 111d50d87..580d8963a 100644
--- a/src/libstore/platform/darwin.hh
+++ b/src/libstore/platform/darwin.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "build/local-derivation-goal.hh"
-#include "gc-store.hh"
-#include "local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/local-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/platform/fallback.hh b/src/libstore/platform/fallback.hh
index 3b77536bb..63dfebba9 100644
--- a/src/libstore/platform/fallback.hh
+++ b/src/libstore/platform/fallback.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "build/local-derivation-goal.hh"
-#include "local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libstore/local-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/platform/freebsd.cc b/src/libstore/platform/freebsd.cc
index f625dd540..a904cd359 100644
--- a/src/libstore/platform/freebsd.cc
+++ b/src/libstore/platform/freebsd.cc
@@ -1,6 +1,6 @@
-#include "platform/freebsd.hh"
-#include "regex.hh"
-#include "strings.hh"
+#include "lix/libstore/platform/freebsd.hh"
+#include "lix/libutil/regex.hh"
+#include "lix/libutil/strings.hh"
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
diff --git a/src/libstore/platform/freebsd.hh b/src/libstore/platform/freebsd.hh
index 99aff3c10..bafeea34c 100644
--- a/src/libstore/platform/freebsd.hh
+++ b/src/libstore/platform/freebsd.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "build/local-derivation-goal.hh"
-#include "gc-store.hh"
-#include "local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/local-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/platform/linux.cc b/src/libstore/platform/linux.cc
index 486d71885..c22203bcc 100644
--- a/src/libstore/platform/linux.cc
+++ b/src/libstore/platform/linux.cc
@@ -1,11 +1,11 @@
-#include "build/worker.hh"
-#include "cgroup.hh"
-#include "finally.hh"
-#include "gc-store.hh"
-#include "signals.hh"
-#include "platform/linux.hh"
-#include "regex.hh"
-#include "strings.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libutil/cgroup.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/platform/linux.hh"
+#include "lix/libutil/regex.hh"
+#include "lix/libutil/strings.hh"
 
 #include <grp.h>
 #include <regex>
diff --git a/src/libstore/platform/linux.hh b/src/libstore/platform/linux.hh
index c8842e09c..c89f92876 100644
--- a/src/libstore/platform/linux.hh
+++ b/src/libstore/platform/linux.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "build/local-derivation-goal.hh"
-#include "gc-store.hh"
-#include "local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/local-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/profiles.cc b/src/libstore/profiles.cc
index d88a3b9fe..50c0dc47e 100644
--- a/src/libstore/profiles.cc
+++ b/src/libstore/profiles.cc
@@ -1,7 +1,7 @@
-#include "profiles.hh"
-#include "local-fs-store.hh"
-#include "users.hh"
-#include "strings.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/libstore/profiles.hh b/src/libstore/profiles.hh
index 9672a17bd..559f6ab57 100644
--- a/src/libstore/profiles.hh
+++ b/src/libstore/profiles.hh
@@ -5,8 +5,8 @@
  * See the manual for additional information.
  */
 
-#include "types.hh"
-#include "pathlocks.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/pathlocks.hh"
 
 #include <time.h>
 
diff --git a/src/libstore/realisation.cc b/src/libstore/realisation.cc
index 50c911da0..fde768d4a 100644
--- a/src/libstore/realisation.cc
+++ b/src/libstore/realisation.cc
@@ -1,6 +1,6 @@
-#include "realisation.hh"
-#include "store-api.hh"
-#include "closure.hh"
+#include "lix/libstore/realisation.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/closure.hh"
 #include <nlohmann/json.hpp>
 
 namespace nix {
diff --git a/src/libstore/realisation.hh b/src/libstore/realisation.hh
index baeb7a2c9..463b19916 100644
--- a/src/libstore/realisation.hh
+++ b/src/libstore/realisation.hh
@@ -3,12 +3,12 @@
 
 #include <variant>
 
-#include "hash.hh"
-#include "path.hh"
-#include "derived-path.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/derived-path.hh"
 #include <nlohmann/json_fwd.hpp>
-#include "comparator.hh"
-#include "crypto.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libstore/crypto.hh"
 
 namespace nix {
 
diff --git a/src/libstore/remote-fs-accessor.cc b/src/libstore/remote-fs-accessor.cc
index 59d267873..ce62653c4 100644
--- a/src/libstore/remote-fs-accessor.cc
+++ b/src/libstore/remote-fs-accessor.cc
@@ -1,6 +1,6 @@
 #include <nlohmann/json.hpp>
-#include "remote-fs-accessor.hh"
-#include "nar-accessor.hh"
+#include "lix/libstore/remote-fs-accessor.hh"
+#include "lix/libstore/nar-accessor.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/libstore/remote-fs-accessor.hh b/src/libstore/remote-fs-accessor.hh
index e2673b6f6..b6e5c567f 100644
--- a/src/libstore/remote-fs-accessor.hh
+++ b/src/libstore/remote-fs-accessor.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "fs-accessor.hh"
-#include "ref.hh"
-#include "store-api.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/remote-store-connection.hh b/src/libstore/remote-store-connection.hh
index d827918c9..6870e878c 100644
--- a/src/libstore/remote-store-connection.hh
+++ b/src/libstore/remote-store-connection.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "remote-store.hh"
-#include "worker-protocol.hh"
-#include "pool.hh"
+#include "lix/libstore/remote-store.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libutil/pool.hh"
 
 namespace nix {
 
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index ff3722085..a5f08df40 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -1,22 +1,22 @@
-#include "error.hh"
-#include "serialise.hh"
-#include "signals.hh"
-#include "path-with-outputs.hh"
-#include "gc-store.hh"
-#include "remote-fs-accessor.hh"
-#include "build-result.hh"
-#include "remote-store.hh"
-#include "remote-store-connection.hh"
-#include "worker-protocol.hh"
-#include "worker-protocol-impl.hh"
-#include "archive.hh"
-#include "globals.hh"
-#include "derivations.hh"
-#include "pool.hh"
-#include "finally.hh"
-#include "logging.hh"
-#include "filetransfer.hh"
-#include "strings.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/remote-fs-accessor.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/remote-store.hh"
+#include "lix/libstore/remote-store-connection.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/worker-protocol-impl.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/pool.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/strings.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 5553d84f0..857c65631 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -4,9 +4,9 @@
 #include <limits>
 #include <string>
 
-#include "store-api.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/log-store.hh"
 
 
 namespace nix {
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index b50084860..ad813f3d4 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -1,13 +1,13 @@
 #if ENABLE_S3
 
-#include "s3.hh"
-#include "s3-binary-cache-store.hh"
-#include "nar-info.hh"
-#include "nar-info-disk-cache.hh"
-#include "globals.hh"
-#include "compression.hh"
-#include "filetransfer.hh"
-#include "strings.hh"
+#include "lix/libstore/s3.hh"
+#include "lix/libstore/s3-binary-cache-store.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/strings.hh"
 
 #include <aws/core/Aws.h>
 #include <aws/core/VersionConfig.h>
diff --git a/src/libstore/s3-binary-cache-store.hh b/src/libstore/s3-binary-cache-store.hh
index baf21e2f4..dc2877caf 100644
--- a/src/libstore/s3-binary-cache-store.hh
+++ b/src/libstore/s3-binary-cache-store.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "binary-cache-store.hh"
+#include "lix/libstore/binary-cache-store.hh"
 
 #include <atomic>
 
diff --git a/src/libstore/s3.hh b/src/libstore/s3.hh
index f0aeb3bed..e0da4b7bb 100644
--- a/src/libstore/s3.hh
+++ b/src/libstore/s3.hh
@@ -3,7 +3,7 @@
 
 #if ENABLE_S3
 
-#include "ref.hh"
+#include "lix/libutil/ref.hh"
 
 #include <optional>
 #include <string>
diff --git a/src/libstore/serve-protocol-impl.hh b/src/libstore/serve-protocol-impl.hh
index a1d1c797f..8db2ed8a2 100644
--- a/src/libstore/serve-protocol-impl.hh
+++ b/src/libstore/serve-protocol-impl.hh
@@ -8,8 +8,8 @@
  * contributing guide.
  */
 
-#include "serve-protocol.hh"
-#include "length-prefixed-protocol-helper.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/length-prefixed-protocol-helper.hh"
 
 namespace nix {
 
diff --git a/src/libstore/serve-protocol.cc b/src/libstore/serve-protocol.cc
index d752bdecd..04b35c99f 100644
--- a/src/libstore/serve-protocol.cc
+++ b/src/libstore/serve-protocol.cc
@@ -1,10 +1,10 @@
-#include "serialise.hh"
-#include "path-with-outputs.hh"
-#include "store-api.hh"
-#include "build-result.hh"
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
-#include "path-info.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libstore/path-info.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libstore/serve-protocol.hh b/src/libstore/serve-protocol.hh
index 4285293fa..48601b6ea 100644
--- a/src/libstore/serve-protocol.hh
+++ b/src/libstore/serve-protocol.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "common-protocol.hh"
+#include "lix/libstore/common-protocol.hh"
 
 namespace nix {
 
diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc
index 2e010c30e..e053fc660 100644
--- a/src/libstore/sqlite.cc
+++ b/src/libstore/sqlite.cc
@@ -1,9 +1,9 @@
-#include "charptr-cast.hh"
-#include "sqlite.hh"
-#include "globals.hh"
-#include "logging.hh"
-#include "signals.hh"
-#include "url.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libstore/sqlite.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/url.hh"
 
 #include <random>
 #include <sqlite3.h>
diff --git a/src/libstore/sqlite.hh b/src/libstore/sqlite.hh
index 5740c4e45..9cea9d906 100644
--- a/src/libstore/sqlite.hh
+++ b/src/libstore/sqlite.hh
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include "types.hh"
-#include "error.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/error.hh"
 
 struct sqlite3;
 struct sqlite3_stmt;
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 5c1fc0c1f..1fea4e5a1 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -1,11 +1,11 @@
-#include "ssh-store.hh"
-#include "store-api.hh"
-#include "remote-store.hh"
-#include "remote-store-connection.hh"
-#include "worker-protocol.hh"
-#include "pool.hh"
-#include "ssh.hh"
-#include "strings.hh"
+#include "lix/libstore/ssh-store.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/remote-store.hh"
+#include "lix/libstore/remote-store-connection.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libutil/pool.hh"
+#include "lix/libstore/ssh.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libstore/ssh-store.hh b/src/libstore/ssh-store.hh
index 51951f80b..725f0429a 100644
--- a/src/libstore/ssh-store.hh
+++ b/src/libstore/ssh-store.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc
index c161c60ab..cbb7aa32a 100644
--- a/src/libstore/ssh.cc
+++ b/src/libstore/ssh.cc
@@ -1,10 +1,10 @@
-#include "current-process.hh"
-#include "environment-variables.hh"
-#include "ssh.hh"
-#include "finally.hh"
-#include "logging.hh"
-#include "strings.hh"
-#include "temporary-dir.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libstore/ssh.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libstore/temporary-dir.hh"
 
 namespace nix {
 
diff --git a/src/libstore/ssh.hh b/src/libstore/ssh.hh
index f9c532caa..321655804 100644
--- a/src/libstore/ssh.hh
+++ b/src/libstore/ssh.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "file-system.hh"
-#include "processes.hh"
-#include "sync.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/sync.hh"
 
 namespace nix {
 
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 18f80eef8..89689c973 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1,18 +1,18 @@
-#include "fs-accessor.hh"
-#include "globals.hh"
-#include "derivations.hh"
-#include "store-api.hh"
-#include "nar-info-disk-cache.hh"
-#include "thread-pool.hh"
-#include "url.hh"
-#include "archive.hh"
-#include "uds-remote-store.hh"
-#include "signals.hh"
-#include "strings.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/uds-remote-store.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
 // FIXME this should not be here, see TODO below on
 // `addMultipleToStore`.
-#include "worker-protocol.hh"
-#include "users.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libutil/users.hh"
 
 #include <nlohmann/json.hpp>
 #include <regex>
@@ -1395,8 +1395,8 @@ Derivation Store::readInvalidDerivation(const StorePath & drvPath)
 }
 
 
-#include "local-store.hh"
-#include "uds-remote-store.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/uds-remote-store.hh"
 
 
 namespace nix {
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 2da5cac39..299048dac 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -1,21 +1,21 @@
 #pragma once
 ///@file
 
-#include "logging.hh"
-#include "nar-info.hh"
-#include "realisation.hh"
-#include "path.hh"
-#include "derived-path.hh"
-#include "hash.hh"
-#include "content-address.hh"
-#include "serialise.hh"
-#include "lru-cache.hh"
-#include "sync.hh"
-#include "globals.hh"
-#include "config.hh"
-#include "path-info.hh"
-#include "repair-flag.hh"
-#include "source-path.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libstore/realisation.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/content-address.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/lru-cache.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libstore/path-info.hh"
+#include "lix/libutil/repair-flag.hh"
+#include "lix/libutil/source-path.hh"
 
 #include <nlohmann/json_fwd.hpp>
 #include <atomic>
diff --git a/src/libstore/store-cast.hh b/src/libstore/store-cast.hh
index 2473e72c5..6e74afdde 100644
--- a/src/libstore/store-cast.hh
+++ b/src/libstore/store-cast.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/temporary-dir.cc b/src/libstore/temporary-dir.cc
index ef639bda9..685d5aee7 100644
--- a/src/libstore/temporary-dir.cc
+++ b/src/libstore/temporary-dir.cc
@@ -1,7 +1,7 @@
-#include "temporary-dir.hh"
+#include "lix/libstore/temporary-dir.hh"
 
-#include "file-system.hh"
-#include "globals.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/globals.hh"
 
 namespace nix {
 
diff --git a/src/libstore/temporary-dir.hh b/src/libstore/temporary-dir.hh
index 59f79d0b9..f109868c9 100644
--- a/src/libstore/temporary-dir.hh
+++ b/src/libstore/temporary-dir.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "file-system.hh"
+#include "lix/libutil/file-system.hh"
 
 namespace nix {
 
diff --git a/src/libstore/uds-remote-store.cc b/src/libstore/uds-remote-store.cc
index 44dd45e88..b2562db2f 100644
--- a/src/libstore/uds-remote-store.cc
+++ b/src/libstore/uds-remote-store.cc
@@ -1,6 +1,6 @@
-#include "uds-remote-store.hh"
-#include "unix-domain-socket.hh"
-#include "worker-protocol.hh"
+#include "lix/libstore/uds-remote-store.hh"
+#include "lix/libutil/unix-domain-socket.hh"
+#include "lix/libstore/worker-protocol.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/libstore/uds-remote-store.hh b/src/libstore/uds-remote-store.hh
index 8b56e0af0..69591f5f8 100644
--- a/src/libstore/uds-remote-store.hh
+++ b/src/libstore/uds-remote-store.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "remote-store.hh"
-#include "remote-store-connection.hh"
-#include "indirect-root-store.hh"
+#include "lix/libstore/remote-store.hh"
+#include "lix/libstore/remote-store-connection.hh"
+#include "lix/libstore/indirect-root-store.hh"
 
 namespace nix {
 
diff --git a/src/libstore/worker-protocol-impl.hh b/src/libstore/worker-protocol-impl.hh
index d99c59f84..c94988ea8 100644
--- a/src/libstore/worker-protocol-impl.hh
+++ b/src/libstore/worker-protocol-impl.hh
@@ -8,8 +8,8 @@
  * contributing guide.
  */
 
-#include "worker-protocol.hh"
-#include "length-prefixed-protocol-helper.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/length-prefixed-protocol-helper.hh"
 
 namespace nix {
 
diff --git a/src/libstore/worker-protocol.cc b/src/libstore/worker-protocol.cc
index b9189df2b..a81c79bd2 100644
--- a/src/libstore/worker-protocol.cc
+++ b/src/libstore/worker-protocol.cc
@@ -1,11 +1,11 @@
-#include "serialise.hh"
-#include "path-with-outputs.hh"
-#include "store-api.hh"
-#include "build-result.hh"
-#include "worker-protocol.hh"
-#include "worker-protocol-impl.hh"
-#include "archive.hh"
-#include "path-info.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/worker-protocol-impl.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/path-info.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index 315e982dd..fc54fcf8c 100644
--- a/src/libstore/worker-protocol.hh
+++ b/src/libstore/worker-protocol.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "common-protocol.hh"
+#include "lix/libstore/common-protocol.hh"
 
 namespace nix {