diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs
index ac79f2777..423099de0 100644
--- a/perl/lib/Nix/Store.xs
+++ b/perl/lib/Nix/Store.xs
@@ -8,10 +8,10 @@
 #undef do_open
 #undef do_close
 
-#include "derivations.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "crypto.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/crypto.hh"
 
 #include <sodium.h>
 #include <nlohmann/json.hpp>
diff --git a/src/legacy/build-remote.cc b/src/legacy/build-remote.cc
index 62ceef283..4b692f4f2 100644
--- a/src/legacy/build-remote.cc
+++ b/src/legacy/build-remote.cc
@@ -6,19 +6,19 @@
 #include <sys/time.h>
 #endif
 
-#include "machines.hh"
-#include "shared.hh"
-#include "pathlocks.hh"
-#include "globals.hh"
-#include "serialise.hh"
-#include "build-result.hh"
-#include "store-api.hh"
-#include "derivations.hh"
-#include "strings.hh"
-#include "local-store.hh"
-#include "legacy.hh"
-#include "experimental-features.hh"
-#include "hash.hh"
+#include "lix/libstore/machines.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libutil/experimental-features.hh"
+#include "lix/libutil/hash.hh"
 #include "build-remote.hh"
 
 namespace nix {
diff --git a/src/legacy/dotgraph.cc b/src/legacy/dotgraph.cc
index 2c530999b..8a22c2892 100644
--- a/src/legacy/dotgraph.cc
+++ b/src/legacy/dotgraph.cc
@@ -1,5 +1,5 @@
 #include "dotgraph.hh"
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <iostream>
 
diff --git a/src/legacy/dotgraph.hh b/src/legacy/dotgraph.hh
index 4fd944080..ec0fcc9d0 100644
--- a/src/legacy/dotgraph.hh
+++ b/src/legacy/dotgraph.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/legacy/graphml.cc b/src/legacy/graphml.cc
index 3e789a2d8..c67d6a204 100644
--- a/src/legacy/graphml.cc
+++ b/src/legacy/graphml.cc
@@ -1,6 +1,6 @@
 #include "graphml.hh"
-#include "store-api.hh"
-#include "derivations.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/derivations.hh"
 
 #include <iostream>
 
diff --git a/src/legacy/graphml.hh b/src/legacy/graphml.hh
index bd3a4a37c..e8c84bea3 100644
--- a/src/legacy/graphml.hh
+++ b/src/legacy/graphml.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/legacy/nix-build.cc b/src/legacy/nix-build.cc
index 9e8cc68a9..451bf66c0 100644
--- a/src/legacy/nix-build.cc
+++ b/src/legacy/nix-build.cc
@@ -9,23 +9,23 @@
 
 #include <nlohmann/json.hpp>
 
-#include "parsed-derivations.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "globals.hh"
-#include "current-process.hh"
-#include "derivations.hh"
-#include "shared.hh"
-#include "path-with-outputs.hh"
-#include "eval.hh"
-#include "eval-inline.hh"
-#include "get-drvs.hh"
-#include "common-eval-args.hh"
-#include "attr-path.hh"
-#include "legacy.hh"
-#include "shlex.hh"
+#include "lix/libstore/parsed-derivations.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libutil/shlex.hh"
 #include "nix-build.hh"
-#include "temporary-dir.hh"
+#include "lix/libstore/temporary-dir.hh"
 
 extern char * * environ __attribute__((weak)); // Man what even is this
 
diff --git a/src/legacy/nix-channel.cc b/src/legacy/nix-channel.cc
index f4dfa88b6..042b96182 100644
--- a/src/legacy/nix-channel.cc
+++ b/src/legacy/nix-channel.cc
@@ -1,13 +1,13 @@
-#include "profiles.hh"
-#include "shared.hh"
-#include "globals.hh"
-#include "filetransfer.hh"
-#include "store-api.hh"
-#include "legacy.hh"
-#include "fetchers.hh"
-#include "eval-settings.hh" // for defexpr
-#include "temporary-dir.hh"
-#include "users.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libexpr/eval-settings.hh" // for defexpr
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libutil/users.hh"
 #include "nix-channel.hh"
 
 #include <fcntl.h>
diff --git a/src/legacy/nix-collect-garbage.cc b/src/legacy/nix-collect-garbage.cc
index 7640100a0..656ac0e51 100644
--- a/src/legacy/nix-collect-garbage.cc
+++ b/src/legacy/nix-collect-garbage.cc
@@ -1,12 +1,12 @@
-#include "file-system.hh"
-#include "store-api.hh"
-#include "store-cast.hh"
-#include "gc-store.hh"
-#include "profiles.hh"
-#include "shared.hh"
-#include "globals.hh"
-#include "legacy.hh"
-#include "signals.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/store-cast.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libutil/signals.hh"
 #include "nix-collect-garbage.hh"
 
 #include <iostream>
diff --git a/src/legacy/nix-copy-closure.cc b/src/legacy/nix-copy-closure.cc
index 1e61e3c48..b56d4b833 100644
--- a/src/legacy/nix-copy-closure.cc
+++ b/src/legacy/nix-copy-closure.cc
@@ -1,6 +1,6 @@
-#include "shared.hh"
-#include "store-api.hh"
-#include "legacy.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libcmd/legacy.hh"
 #include "nix-copy-closure.hh"
 
 namespace nix {
diff --git a/src/legacy/nix-env.cc b/src/legacy/nix-env.cc
index 4674fd783..5acea541d 100644
--- a/src/legacy/nix-env.cc
+++ b/src/legacy/nix-env.cc
@@ -1,22 +1,22 @@
-#include "attr-path.hh"
-#include "common-eval-args.hh"
-#include "derivations.hh"
-#include "terminal.hh"
-#include "eval.hh"
-#include "get-drvs.hh"
-#include "globals.hh"
-#include "names.hh"
-#include "profiles.hh"
-#include "path-with-outputs.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/terminal.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/names.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
 #include "user-env.hh"
-#include "users.hh"
-#include "value-to-json.hh"
-#include "xml-writer.hh"
-#include "legacy.hh"
-#include "eval-settings.hh" // for defexpr
+#include "lix/libutil/users.hh"
+#include "lix/libexpr/value-to-json.hh"
+#include "lix/libutil/xml-writer.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libexpr/eval-settings.hh" // for defexpr
 #include "nix-env.hh"
 
 #include <ctime>
diff --git a/src/legacy/nix-instantiate.cc b/src/legacy/nix-instantiate.cc
index 5d1da0d70..bf39b0ef0 100644
--- a/src/legacy/nix-instantiate.cc
+++ b/src/legacy/nix-instantiate.cc
@@ -1,16 +1,16 @@
-#include "globals.hh"
-#include "print-ambiguous.hh"
-#include "shared.hh"
-#include "eval.hh"
-#include "eval-inline.hh"
-#include "get-drvs.hh"
-#include "attr-path.hh"
-#include "value-to-xml.hh"
-#include "value-to-json.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "common-eval-args.hh"
-#include "legacy.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libexpr/print-ambiguous.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libexpr/value-to-xml.hh"
+#include "lix/libexpr/value-to-json.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libcmd/legacy.hh"
 #include "nix-instantiate.hh"
 
 #include <map>
diff --git a/src/legacy/nix-store.cc b/src/legacy/nix-store.cc
index d4742f61f..72600a141 100644
--- a/src/legacy/nix-store.cc
+++ b/src/legacy/nix-store.cc
@@ -1,20 +1,20 @@
-#include "archive.hh"
-#include "derivations.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/derivations.hh"
 #include "dotgraph.hh"
-#include "exit.hh"
-#include "globals.hh"
-#include "build-result.hh"
-#include "store-cast.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
-#include "local-store.hh"
-#include "monitor-fd.hh"
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
-#include "shared.hh"
+#include "lix/libutil/exit.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/store-cast.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/log-store.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libutil/monitor-fd.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libmain/shared.hh"
 #include "graphml.hh"
-#include "legacy.hh"
-#include "path-with-outputs.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libstore/path-with-outputs.hh"
 #include "nix-store.hh"
 
 #include <iostream>
diff --git a/src/legacy/user-env.cc b/src/legacy/user-env.cc
index f5dbd06ca..082a73811 100644
--- a/src/legacy/user-env.cc
+++ b/src/legacy/user-env.cc
@@ -1,14 +1,14 @@
 #include "user-env.hh"
-#include "derivations.hh"
-#include "store-api.hh"
-#include "path-with-outputs.hh"
-#include "local-fs-store.hh"
-#include "globals.hh"
-#include "shared.hh"
-#include "eval.hh"
-#include "eval-inline.hh"
-#include "profiles.hh"
-#include "print-ambiguous.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libexpr/print-ambiguous.hh"
 
 #include <limits>
 #include <sstream>
diff --git a/src/legacy/user-env.hh b/src/legacy/user-env.hh
index af45d2d85..1177c8af9 100644
--- a/src/legacy/user-env.hh
+++ b/src/legacy/user-env.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "get-drvs.hh"
+#include "lix/libexpr/get-drvs.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/built-path.cc b/src/libcmd/built-path.cc
index 6ff99070d..364d03eb9 100644
--- a/src/libcmd/built-path.cc
+++ b/src/libcmd/built-path.cc
@@ -1,6 +1,6 @@
-#include "built-path.hh"
-#include "derivations.hh"
-#include "store-api.hh"
+#include "lix/libcmd/built-path.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libcmd/built-path.hh b/src/libcmd/built-path.hh
index 555adb04f..6423eb6f3 100644
--- a/src/libcmd/built-path.hh
+++ b/src/libcmd/built-path.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
-#include "derived-path.hh"
-#include "realisation.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libstore/realisation.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/cmd-profiles.cc b/src/libcmd/cmd-profiles.cc
index dcec6526d..994e29829 100644
--- a/src/libcmd/cmd-profiles.cc
+++ b/src/libcmd/cmd-profiles.cc
@@ -1,13 +1,13 @@
 #include <set>
 
-#include "cmd-profiles.hh"
-#include "built-path.hh"
-#include "builtins/buildenv.hh"
-#include "logging.hh"
-#include "names.hh"
-#include "store-api.hh"
-#include "temporary-dir.hh"
-#include "url-name.hh"
+#include "lix/libcmd/cmd-profiles.hh"
+#include "lix/libcmd/built-path.hh"
+#include "lix/libstore/builtins/buildenv.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libstore/names.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libutil/url-name.hh"
 
 namespace nix
 {
diff --git a/src/libcmd/cmd-profiles.hh b/src/libcmd/cmd-profiles.hh
index 766a1d82b..71bcc85c7 100644
--- a/src/libcmd/cmd-profiles.hh
+++ b/src/libcmd/cmd-profiles.hh
@@ -1,13 +1,13 @@
 #pragma once
 ///@file
 
-#include "built-path.hh"
-#include "eval.hh"
-#include "flake/flakeref.hh"
-#include "get-drvs.hh"
-#include "types.hh"
-#include "url.hh"
-#include "url-name.hh"
+#include "lix/libcmd/built-path.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/flake/flakeref.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/url-name.hh"
 
 #include <string>
 #include <set>
diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
index de9f546fc..b6a6e064b 100644
--- a/src/libcmd/command.cc
+++ b/src/libcmd/command.cc
@@ -1,10 +1,10 @@
-#include "command.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "derivations.hh"
-#include "nixexpr.hh"
-#include "profiles.hh"
-#include "repl.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libcmd/repl.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libcmd/command.hh b/src/libcmd/command.hh
index 6c6c81718..27f242f54 100644
--- a/src/libcmd/command.hh
+++ b/src/libcmd/command.hh
@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "installable-value.hh"
-#include "args.hh"
-#include "common-eval-args.hh"
-#include "path.hh"
-#include "flake/lockfile.hh"
+#include "lix/libcmd/installable-value.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libexpr/flake/lockfile.hh"
 
 #include <optional>
 
diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc
index 089ad31d9..7d82dc234 100644
--- a/src/libcmd/common-eval-args.cc
+++ b/src/libcmd/common-eval-args.cc
@@ -1,13 +1,13 @@
-#include "eval-settings.hh"
-#include "common-eval-args.hh"
-#include "shared.hh"
-#include "filetransfer.hh"
-#include "eval.hh"
-#include "fetchers.hh"
-#include "registry.hh"
-#include "flake/flakeref.hh"
-#include "store-api.hh"
-#include "command.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/registry.hh"
+#include "lix/libexpr/flake/flakeref.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libcmd/command.hh"
 
 #include <regex>
 
diff --git a/src/libcmd/common-eval-args.hh b/src/libcmd/common-eval-args.hh
index 08a4b65e4..51ca70b19 100644
--- a/src/libcmd/common-eval-args.hh
+++ b/src/libcmd/common-eval-args.hh
@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "args.hh"
-#include "common-args.hh"
-#include "search-path.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libexpr/search-path.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/editor-for.cc b/src/libcmd/editor-for.cc
index 868153e90..fc0f13b45 100644
--- a/src/libcmd/editor-for.cc
+++ b/src/libcmd/editor-for.cc
@@ -1,7 +1,7 @@
-#include "editor-for.hh"
-#include "environment-variables.hh"
-#include "source-path.hh"
-#include "strings.hh"
+#include "lix/libcmd/editor-for.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/source-path.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/editor-for.hh b/src/libcmd/editor-for.hh
index 8acd7011e..426c90fcc 100644
--- a/src/libcmd/editor-for.hh
+++ b/src/libcmd/editor-for.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "source-path.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/source-path.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/installable-attr-path.cc b/src/libcmd/installable-attr-path.cc
index 9891b263c..9a0646f04 100644
--- a/src/libcmd/installable-attr-path.cc
+++ b/src/libcmd/installable-attr-path.cc
@@ -1,11 +1,11 @@
-#include "installable-attr-path.hh"
-#include "outputs-spec.hh"
-#include "command.hh"
-#include "attr-path.hh"
-#include "common-eval-args.hh"
-#include "eval.hh"
-#include "get-drvs.hh"
-#include "flake/flake.hh"
+#include "lix/libcmd/installable-attr-path.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libexpr/flake/flake.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libcmd/installable-attr-path.hh b/src/libcmd/installable-attr-path.hh
index edc9c2906..e71bb649c 100644
--- a/src/libcmd/installable-attr-path.hh
+++ b/src/libcmd/installable-attr-path.hh
@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "installable-value.hh"
-#include "outputs-spec.hh"
-#include "command.hh"
-#include "common-eval-args.hh"
-#include "eval.hh"
+#include "lix/libcmd/installable-value.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libexpr/eval.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libcmd/installable-derived-path.cc b/src/libcmd/installable-derived-path.cc
index 4d1f83a1c..5bbf38c10 100644
--- a/src/libcmd/installable-derived-path.cc
+++ b/src/libcmd/installable-derived-path.cc
@@ -1,5 +1,5 @@
-#include "installable-derived-path.hh"
-#include "derivations.hh"
+#include "lix/libcmd/installable-derived-path.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/installable-derived-path.hh b/src/libcmd/installable-derived-path.hh
index e0b4f18b3..0c590866c 100644
--- a/src/libcmd/installable-derived-path.hh
+++ b/src/libcmd/installable-derived-path.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "installables.hh"
+#include "lix/libcmd/installables.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/installable-flake.cc b/src/libcmd/installable-flake.cc
index 120bc666f..919245df4 100644
--- a/src/libcmd/installable-flake.cc
+++ b/src/libcmd/installable-flake.cc
@@ -1,21 +1,21 @@
-#include "globals.hh"
-#include "installable-flake.hh"
-#include "installable-derived-path.hh"
-#include "outputs-spec.hh"
-#include "command.hh"
-#include "attr-path.hh"
-#include "common-eval-args.hh"
-#include "derivations.hh"
-#include "eval-inline.hh"
-#include "eval.hh"
-#include "get-drvs.hh"
-#include "store-api.hh"
-#include "shared.hh"
-#include "flake/flake.hh"
-#include "eval-cache.hh"
-#include "url.hh"
-#include "registry.hh"
-#include "build-result.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libcmd/installable-flake.hh"
+#include "lix/libcmd/installable-derived-path.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/flake/flake.hh"
+#include "lix/libexpr/eval-cache.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libfetchers/registry.hh"
+#include "lix/libstore/build-result.hh"
 
 #include <regex>
 #include <queue>
diff --git a/src/libcmd/installable-flake.hh b/src/libcmd/installable-flake.hh
index 314918c14..89ed9a91c 100644
--- a/src/libcmd/installable-flake.hh
+++ b/src/libcmd/installable-flake.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "installable-value.hh"
+#include "lix/libcmd/installable-value.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/installable-value.cc b/src/libcmd/installable-value.cc
index c8a3e1b21..6191ad63e 100644
--- a/src/libcmd/installable-value.cc
+++ b/src/libcmd/installable-value.cc
@@ -1,6 +1,6 @@
-#include "installable-value.hh"
-#include "eval-cache.hh"
-#include "fetch-to-store.hh"
+#include "lix/libcmd/installable-value.hh"
+#include "lix/libexpr/eval-cache.hh"
+#include "lix/libfetchers/fetch-to-store.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/installable-value.hh b/src/libcmd/installable-value.hh
index b9b54fa2e..2ba6d6380 100644
--- a/src/libcmd/installable-value.hh
+++ b/src/libcmd/installable-value.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "installables.hh"
-#include "flake/flake.hh"
+#include "lix/libcmd/installables.hh"
+#include "lix/libexpr/flake/flake.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
index b81d4e0fd..f4e799390 100644
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -1,22 +1,22 @@
-#include "globals.hh"
-#include "installables.hh"
-#include "installable-derived-path.hh"
-#include "installable-attr-path.hh"
-#include "installable-flake.hh"
-#include "logging.hh"
-#include "outputs-spec.hh"
-#include "command.hh"
-#include "attr-path.hh"
-#include "common-eval-args.hh"
-#include "derivations.hh"
-#include "eval.hh"
-#include "eval-settings.hh"
-#include "store-api.hh"
-#include "shared.hh"
-#include "flake/flake.hh"
-#include "eval-cache.hh"
-#include "registry.hh"
-#include "build-result.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libcmd/installables.hh"
+#include "lix/libcmd/installable-derived-path.hh"
+#include "lix/libcmd/installable-attr-path.hh"
+#include "lix/libcmd/installable-flake.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/flake/flake.hh"
+#include "lix/libexpr/eval-cache.hh"
+#include "lix/libfetchers/registry.hh"
+#include "lix/libstore/build-result.hh"
 
 
 #include <nlohmann/json.hpp>
diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh
index 95e8841ca..4237e3923 100644
--- a/src/libcmd/installables.hh
+++ b/src/libcmd/installables.hh
@@ -1,12 +1,12 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "outputs-spec.hh"
-#include "derived-path.hh"
-#include "built-path.hh"
-#include "store-api.hh"
-#include "build-result.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libcmd/built-path.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build-result.hh"
 
 #include <optional>
 
diff --git a/src/libcmd/legacy.cc b/src/libcmd/legacy.cc
index 8bbe9b031..05ac2dcd4 100644
--- a/src/libcmd/legacy.cc
+++ b/src/libcmd/legacy.cc
@@ -1,4 +1,4 @@
-#include "legacy.hh"
+#include "lix/libcmd/legacy.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/markdown.cc b/src/libcmd/markdown.cc
index dbaab8c19..0010abedb 100644
--- a/src/libcmd/markdown.cc
+++ b/src/libcmd/markdown.cc
@@ -1,7 +1,7 @@
-#include "markdown.hh"
-#include "error.hh"
-#include "finally.hh"
-#include "terminal.hh"
+#include "lix/libcmd/markdown.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/terminal.hh"
 
 #include <sys/queue.h>
 #include <lowdown.h>
diff --git a/src/libcmd/markdown.hh b/src/libcmd/markdown.hh
index a04d32a4f..ac881d335 100644
--- a/src/libcmd/markdown.hh
+++ b/src/libcmd/markdown.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/repl-interacter.cc b/src/libcmd/repl-interacter.cc
index 459b048f4..a29d89436 100644
--- a/src/libcmd/repl-interacter.cc
+++ b/src/libcmd/repl-interacter.cc
@@ -1,6 +1,6 @@
-#include "error.hh"
-#include "file-system.hh"
-#include "logging.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
 #include <csignal>
 #include <cstdio>
 #include <iostream>
@@ -17,8 +17,8 @@ extern "C" {
 #include <editline.h>
 }
 
-#include "finally.hh"
-#include "repl-interacter.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libcmd/repl-interacter.hh"
 
 namespace nix {
 
diff --git a/src/libcmd/repl-interacter.hh b/src/libcmd/repl-interacter.hh
index 8f815fceb..970368ec0 100644
--- a/src/libcmd/repl-interacter.hh
+++ b/src/libcmd/repl-interacter.hh
@@ -1,8 +1,8 @@
 #pragma once
 /// @file
 
-#include "finally.hh"
-#include "types.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/types.hh"
 #include <functional>
 #include <string>
 
diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc
index 9d7fd47dc..a9c059c37 100644
--- a/src/libcmd/repl.cc
+++ b/src/libcmd/repl.cc
@@ -6,34 +6,34 @@
 #include <climits>
 #include <string_view>
 
-#include "box_ptr.hh"
-#include "repl-interacter.hh"
-#include "repl.hh"
+#include "lix/libutil/box_ptr.hh"
+#include "lix/libcmd/repl-interacter.hh"
+#include "lix/libcmd/repl.hh"
 
-#include "ansicolor.hh"
-#include "shared.hh"
-#include "eval.hh"
-#include "eval-cache.hh"
-#include "eval-inline.hh"
-#include "eval-settings.hh"
-#include "attr-path.hh"
-#include "signals.hh"
-#include "store-api.hh"
-#include "log-store.hh"
-#include "common-eval-args.hh"
-#include "get-drvs.hh"
-#include "derivations.hh"
-#include "globals.hh"
-#include "flake/flake.hh"
-#include "flake/lockfile.hh"
-#include "editor-for.hh"
-#include "finally.hh"
-#include "markdown.hh"
-#include "local-fs-store.hh"
-#include "signals.hh"
-#include "print.hh"
-#include "gc-small-vector.hh"
-#include "users.hh"
+#include "lix/libutil/ansicolor.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-cache.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/log-store.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libexpr/flake/flake.hh"
+#include "lix/libexpr/flake/lockfile.hh"
+#include "lix/libcmd/editor-for.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libcmd/markdown.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libexpr/print.hh"
+#include "lix/libexpr/gc-small-vector.hh"
+#include "lix/libutil/users.hh"
 
 #if HAVE_BOEHMGC
 #define GC_INCLUDE_NEW
diff --git a/src/libcmd/repl.hh b/src/libcmd/repl.hh
index aac79ec74..fba582930 100644
--- a/src/libcmd/repl.hh
+++ b/src/libcmd/repl.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "eval.hh"
+#include "lix/libexpr/eval.hh"
 
 namespace nix {
 
diff --git a/src/libfetchers/attrs.cc b/src/libfetchers/attrs.cc
index a565d19d4..4b14f06cf 100644
--- a/src/libfetchers/attrs.cc
+++ b/src/libfetchers/attrs.cc
@@ -1,5 +1,5 @@
-#include "attrs.hh"
-#include "fetchers.hh"
+#include "lix/libfetchers/attrs.hh"
+#include "lix/libfetchers/fetchers.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libfetchers/attrs.hh b/src/libfetchers/attrs.hh
index 9f885a793..7e651fdf3 100644
--- a/src/libfetchers/attrs.hh
+++ b/src/libfetchers/attrs.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "hash.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/hash.hh"
 
 #include <variant>
 
diff --git a/src/libfetchers/builtin-fetchers.hh b/src/libfetchers/builtin-fetchers.hh
index 3a6ab1124..d3be7f7f2 100644
--- a/src/libfetchers/builtin-fetchers.hh
+++ b/src/libfetchers/builtin-fetchers.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file internal header for fetcher declarations
 
-#include "fetchers.hh"
+#include "lix/libfetchers/fetchers.hh"
 
 namespace nix::fetchers {
 
diff --git a/src/libfetchers/cache.cc b/src/libfetchers/cache.cc
index eec77c2dc..d8a724884 100644
--- a/src/libfetchers/cache.cc
+++ b/src/libfetchers/cache.cc
@@ -1,8 +1,8 @@
-#include "cache.hh"
-#include "sqlite.hh"
-#include "sync.hh"
-#include "store-api.hh"
-#include "users.hh"
+#include "lix/libfetchers/cache.hh"
+#include "lix/libstore/sqlite.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/users.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libfetchers/cache.hh b/src/libfetchers/cache.hh
index af34e66ce..91af2d80a 100644
--- a/src/libfetchers/cache.hh
+++ b/src/libfetchers/cache.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "fetchers.hh"
-#include "path.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libstore/path.hh"
 
 namespace nix::fetchers {
 
diff --git a/src/libfetchers/fetch-settings.cc b/src/libfetchers/fetch-settings.cc
index b278835ad..4a21aa660 100644
--- a/src/libfetchers/fetch-settings.cc
+++ b/src/libfetchers/fetch-settings.cc
@@ -1,7 +1,7 @@
-#include "abstract-setting-to-json.hh"
-#include "args.hh"
-#include "config-impl.hh"
-#include "fetch-settings.hh"
+#include "lix/libutil/abstract-setting-to-json.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/config-impl.hh"
+#include "lix/libfetchers/fetch-settings.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libfetchers/fetch-settings.hh b/src/libfetchers/fetch-settings.hh
index 0f24d83dc..c0ad3c09e 100644
--- a/src/libfetchers/fetch-settings.hh
+++ b/src/libfetchers/fetch-settings.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "config.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/config.hh"
 
 #include <map>
 #include <limits>
diff --git a/src/libfetchers/fetch-to-store.cc b/src/libfetchers/fetch-to-store.cc
index b9f828d9a..3fb53a437 100644
--- a/src/libfetchers/fetch-to-store.cc
+++ b/src/libfetchers/fetch-to-store.cc
@@ -1,6 +1,6 @@
-#include "fetch-to-store.hh"
-#include "fetchers.hh"
-#include "cache.hh"
+#include "lix/libfetchers/fetch-to-store.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/cache.hh"
 
 namespace nix {
 
diff --git a/src/libfetchers/fetch-to-store.hh b/src/libfetchers/fetch-to-store.hh
index b74879637..b0472dbaa 100644
--- a/src/libfetchers/fetch-to-store.hh
+++ b/src/libfetchers/fetch-to-store.hh
@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "source-path.hh"
-#include "store-api.hh"
-#include "repair-flag.hh"
-#include "content-address.hh"
+#include "lix/libutil/source-path.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/repair-flag.hh"
+#include "lix/libstore/content-address.hh"
 
 namespace nix {
 
diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc
index 926a9eeba..828fd191f 100644
--- a/src/libfetchers/fetchers.cc
+++ b/src/libfetchers/fetchers.cc
@@ -1,8 +1,8 @@
-#include "fetchers.hh"
-#include "builtin-fetchers.hh"
-#include "store-api.hh"
-#include "source-path.hh"
-#include "fetch-to-store.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/builtin-fetchers.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/source-path.hh"
+#include "lix/libfetchers/fetch-to-store.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libfetchers/fetchers.hh b/src/libfetchers/fetchers.hh
index ef3a4ec71..6854c1b92 100644
--- a/src/libfetchers/fetchers.hh
+++ b/src/libfetchers/fetchers.hh
@@ -1,14 +1,14 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "hash.hh"
-#include "canon-path.hh"
-#include "path.hh"
-#include "attrs.hh"
-#include "url.hh"
-#include "ref.hh"
-#include "strings.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libutil/canon-path.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libfetchers/attrs.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libutil/strings.hh"
 
 #include <memory>
 
diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
index c7cb7533d..cb4f243db 100644
--- a/src/libfetchers/git.cc
+++ b/src/libfetchers/git.cc
@@ -1,20 +1,20 @@
-#include "error.hh"
-#include "fetchers.hh"
-#include "cache.hh"
-#include "globals.hh"
-#include "builtin-fetchers.hh"
-#include "processes.hh"
-#include "tarfile.hh"
-#include "store-api.hh"
-#include "temporary-dir.hh"
-#include "url-parts.hh"
-#include "pathlocks.hh"
-#include "users.hh"
-#include "git.hh"
-#include "logging.hh"
-#include "finally.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/cache.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libfetchers/builtin-fetchers.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/tarfile.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libutil/url-parts.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libutil/git.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/finally.hh"
 
-#include "fetch-settings.hh"
+#include "lix/libfetchers/fetch-settings.hh"
 
 #include <regex>
 #include <string.h>
diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
index f5342f3f0..cc01f0528 100644
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -1,14 +1,14 @@
-#include "attrs.hh"
-#include "filetransfer.hh"
-#include "cache.hh"
-#include "globals.hh"
-#include "builtin-fetchers.hh"
-#include "store-api.hh"
-#include "types.hh"
-#include "url-parts.hh"
-#include "git.hh"
-#include "fetchers.hh"
-#include "fetch-settings.hh"
+#include "lix/libfetchers/attrs.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libfetchers/cache.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libfetchers/builtin-fetchers.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/url-parts.hh"
+#include "lix/libutil/git.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/fetch-settings.hh"
 
 #include <optional>
 #include <nlohmann/json.hpp>
diff --git a/src/libfetchers/indirect.cc b/src/libfetchers/indirect.cc
index c73ffc9c7..3f4e30a4c 100644
--- a/src/libfetchers/indirect.cc
+++ b/src/libfetchers/indirect.cc
@@ -1,7 +1,7 @@
-#include "fetchers.hh"
-#include "builtin-fetchers.hh"
-#include "url-parts.hh"
-#include "path.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/builtin-fetchers.hh"
+#include "lix/libutil/url-parts.hh"
+#include "lix/libstore/path.hh"
 
 namespace nix::fetchers {
 
diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc
index 3f0e72acb..3454d58ba 100644
--- a/src/libfetchers/mercurial.cc
+++ b/src/libfetchers/mercurial.cc
@@ -1,13 +1,13 @@
-#include "fetchers.hh"
-#include "cache.hh"
-#include "builtin-fetchers.hh"
-#include "processes.hh"
-#include "store-api.hh"
-#include "temporary-dir.hh"
-#include "url-parts.hh"
-#include "users.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/cache.hh"
+#include "lix/libfetchers/builtin-fetchers.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libutil/url-parts.hh"
+#include "lix/libutil/users.hh"
 
-#include "fetch-settings.hh"
+#include "lix/libfetchers/fetch-settings.hh"
 
 #include <sys/time.h>
 
diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc
index 150b89492..97f625d9d 100644
--- a/src/libfetchers/path.cc
+++ b/src/libfetchers/path.cc
@@ -1,7 +1,7 @@
-#include "fetchers.hh"
-#include "builtin-fetchers.hh"
-#include "store-api.hh"
-#include "archive.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/builtin-fetchers.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
 
 namespace nix::fetchers {
 
diff --git a/src/libfetchers/registry.cc b/src/libfetchers/registry.cc
index 96e9ed1c6..3697682a0 100644
--- a/src/libfetchers/registry.cc
+++ b/src/libfetchers/registry.cc
@@ -1,11 +1,11 @@
-#include "registry.hh"
-#include "fetchers.hh"
-#include "users.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
+#include "lix/libfetchers/registry.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
 
-#include "fetch-settings.hh"
+#include "lix/libfetchers/fetch-settings.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libfetchers/registry.hh b/src/libfetchers/registry.hh
index f57ab1e6b..732568661 100644
--- a/src/libfetchers/registry.hh
+++ b/src/libfetchers/registry.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "fetchers.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libfetchers/fetchers.hh"
 
 namespace nix { class Store; }
 
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
index 5091e18fe..06b3e17f2 100644
--- a/src/libfetchers/tarball.cc
+++ b/src/libfetchers/tarball.cc
@@ -1,14 +1,14 @@
-#include "fetchers.hh"
-#include "cache.hh"
-#include "filetransfer.hh"
-#include "globals.hh"
-#include "builtin-fetchers.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "tarfile.hh"
-#include "temporary-dir.hh"
-#include "types.hh"
-#include "split.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/cache.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libfetchers/builtin-fetchers.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libutil/tarfile.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/split.hh"
 
 namespace nix::fetchers {
 
diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc
index 0b756301c..f9b60d4b3 100644
--- a/src/libmain/common-args.cc
+++ b/src/libmain/common-args.cc
@@ -1,9 +1,9 @@
-#include "common-args.hh"
-#include "args/root.hh"
-#include "error.hh"
-#include "globals.hh"
-#include "loggers.hh"
-#include "logging.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libutil/args/root.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libmain/loggers.hh"
+#include "lix/libutil/logging.hh"
 
 namespace nix {
 
diff --git a/src/libmain/common-args.hh b/src/libmain/common-args.hh
index c35406c3b..1f6432b7b 100644
--- a/src/libmain/common-args.hh
+++ b/src/libmain/common-args.hh
@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "args.hh"
-#include "repair-flag.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/repair-flag.hh"
 
 namespace nix {
 
diff --git a/src/libmain/crash-handler.cc b/src/libmain/crash-handler.cc
index 3f1b9f7d8..70c50b509 100644
--- a/src/libmain/crash-handler.cc
+++ b/src/libmain/crash-handler.cc
@@ -1,5 +1,5 @@
-#include "crash-handler.hh"
-#include "fmt.hh"
+#include "lix/libmain/crash-handler.hh"
+#include "lix/libutil/fmt.hh"
 
 #include <boost/core/demangle.hpp>
 #include <exception>
diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc
index 46438280a..253883a4b 100644
--- a/src/libmain/loggers.cc
+++ b/src/libmain/loggers.cc
@@ -1,6 +1,6 @@
-#include "environment-variables.hh"
-#include "loggers.hh"
-#include "progress-bar.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libmain/loggers.hh"
+#include "lix/libmain/progress-bar.hh"
 
 namespace nix {
 
diff --git a/src/libmain/loggers.hh b/src/libmain/loggers.hh
index 6064b6160..2ca678e5e 100644
--- a/src/libmain/loggers.hh
+++ b/src/libmain/loggers.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 
diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc
index 4db7e1cbb..5c80f4011 100644
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -1,9 +1,9 @@
-#include "progress-bar.hh"
-#include "file-system.hh"
-#include "sync.hh"
-#include "names.hh"
-#include "terminal.hh"
-#include "strings.hh"
+#include "lix/libmain/progress-bar.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libstore/names.hh"
+#include "lix/libutil/terminal.hh"
+#include "lix/libutil/strings.hh"
 
 #include <map>
 #include <thread>
diff --git a/src/libmain/progress-bar.hh b/src/libmain/progress-bar.hh
index 8343beff1..99e280ced 100644
--- a/src/libmain/progress-bar.hh
+++ b/src/libmain/progress-bar.hh
@@ -3,8 +3,8 @@
 
 #include <chrono>
 
-#include "logging.hh"
-#include "sync.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/sync.hh"
 
 namespace nix {
 
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 2615c34b1..0aa9cca61 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -1,14 +1,14 @@
-#include "crash-handler.hh"
-#include "globals.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "gc-store.hh"
-#include "signals.hh"
-#include "loggers.hh"
-#include "current-process.hh"
-#include "terminal.hh"
-#include "strings.hh"
-#include "exit.hh"
+#include "lix/libmain/crash-handler.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libmain/loggers.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libutil/terminal.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/exit.hh"
 
 #include <algorithm>
 #include <exception>
diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh
index 49b72a54e..df38c4c7f 100644
--- a/src/libmain/shared.hh
+++ b/src/libmain/shared.hh
@@ -1,13 +1,13 @@
 #pragma once
 ///@file
 
-#include "args.hh"
-#include "args/root.hh"
-#include "common-args.hh"
-#include "path.hh"
-#include "derived-path.hh"
-#include "processes.hh"
-#include "strings.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/args/root.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/strings.hh"
 
 #include <signal.h>
 
diff --git a/src/libmain/stack.cc b/src/libmain/stack.cc
index 493829b55..e777764a6 100644
--- a/src/libmain/stack.cc
+++ b/src/libmain/stack.cc
@@ -1,5 +1,5 @@
-#include "error.hh"
-#include "shared.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libmain/shared.hh"
 
 #include <cstring>
 
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
index b9f7ece89..e93b1f9c9 100644
--- a/src/nix/add-to-store.cc
+++ b/src/nix/add-to-store.cc
@@ -1,7 +1,7 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "store-api.hh"
-#include "archive.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
 
 using namespace nix;
 
diff --git a/src/nix/app.cc b/src/nix/app.cc
index 34fac9935..14c314f2a 100644
--- a/src/nix/app.cc
+++ b/src/nix/app.cc
@@ -1,13 +1,13 @@
-#include "installables.hh"
-#include "installable-derived-path.hh"
-#include "installable-value.hh"
-#include "store-api.hh"
-#include "eval-inline.hh"
-#include "eval-cache.hh"
-#include "names.hh"
-#include "command.hh"
-#include "derivations.hh"
-#include "downstream-placeholder.hh"
+#include "lix/libcmd/installables.hh"
+#include "lix/libcmd/installable-derived-path.hh"
+#include "lix/libcmd/installable-value.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval-cache.hh"
+#include "lix/libstore/names.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/downstream-placeholder.hh"
 
 namespace nix {
 
diff --git a/src/nix/build.cc b/src/nix/build.cc
index 6de52c0b6..c77e385de 100644
--- a/src/nix/build.cc
+++ b/src/nix/build.cc
@@ -1,8 +1,8 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc
index 8bf158d61..927375afc 100644
--- a/src/nix/bundle.cc
+++ b/src/nix/bundle.cc
@@ -1,11 +1,11 @@
-#include "installable-flake.hh"
-#include "command.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "fs-accessor.hh"
-#include "eval-inline.hh"
+#include "lix/libcmd/installable-flake.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libexpr/eval-inline.hh"
 
 using namespace nix;
 
diff --git a/src/nix/cat.cc b/src/nix/cat.cc
index 81c21e2ad..8dddb847c 100644
--- a/src/nix/cat.cc
+++ b/src/nix/cat.cc
@@ -1,7 +1,7 @@
-#include "command.hh"
-#include "store-api.hh"
-#include "fs-accessor.hh"
-#include "nar-accessor.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libstore/nar-accessor.hh"
 
 using namespace nix;
 
diff --git a/src/nix/config.cc b/src/nix/config.cc
index 1a45dc390..67fcd9f4f 100644
--- a/src/nix/config.cc
+++ b/src/nix/config.cc
@@ -1,7 +1,7 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "store-api.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/nix/copy.cc b/src/nix/copy.cc
index 151d28277..dc1f337df 100644
--- a/src/nix/copy.cc
+++ b/src/nix/copy.cc
@@ -1,6 +1,6 @@
-#include "command.hh"
-#include "shared.hh"
-#include "store-api.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
 
 using namespace nix;
 
diff --git a/src/nix/daemon.cc b/src/nix/daemon.cc
index 5a0f781ec..23811ef76 100644
--- a/src/nix/daemon.cc
+++ b/src/nix/daemon.cc
@@ -1,19 +1,19 @@
 ///@file
 
-#include "command.hh"
-#include "shared.hh"
-#include "local-store.hh"
-#include "remote-store.hh"
-#include "remote-store-connection.hh"
-#include "serialise.hh"
-#include "archive.hh"
-#include "globals.hh"
-#include "derivations.hh"
-#include "finally.hh"
-#include "legacy.hh"
-#include "signals.hh"
-#include "daemon.hh"
-#include "unix-domain-socket.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/remote-store.hh"
+#include "lix/libstore/remote-store-connection.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/daemon.hh"
+#include "lix/libutil/unix-domain-socket.hh"
 #include "daemon-command.hh"
 
 #include <algorithm>
diff --git a/src/nix/derivation-add.cc b/src/nix/derivation-add.cc
index 4d91d4538..2019f18c5 100644
--- a/src/nix/derivation-add.cc
+++ b/src/nix/derivation-add.cc
@@ -1,10 +1,10 @@
 // FIXME: rename to 'nix plan add' or 'nix derivation add'?
 
-#include "command.hh"
-#include "common-args.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "derivations.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/derivations.hh"
 #include <nlohmann/json.hpp>
 
 using namespace nix;
diff --git a/src/nix/derivation-show.cc b/src/nix/derivation-show.cc
index bf637246d..d6769af52 100644
--- a/src/nix/derivation-show.cc
+++ b/src/nix/derivation-show.cc
@@ -1,11 +1,11 @@
 // FIXME: integrate this with nix path-info?
 // FIXME: rename to 'nix store derivation show' or 'nix debug derivation show'?
 
-#include "command.hh"
-#include "common-args.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "derivations.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/derivations.hh"
 #include <nlohmann/json.hpp>
 
 using namespace nix;
diff --git a/src/nix/derivation.cc b/src/nix/derivation.cc
index cd3975a4f..2d1717f0c 100644
--- a/src/nix/derivation.cc
+++ b/src/nix/derivation.cc
@@ -1,4 +1,4 @@
-#include "command.hh"
+#include "lix/libcmd/command.hh"
 
 using namespace nix;
 
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index e461687ea..051d604b8 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -1,13 +1,13 @@
-#include "eval.hh"
-#include "installable-flake.hh"
-#include "command.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "outputs-spec.hh"
-#include "derivations.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libcmd/installable-flake.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libstore/derivations.hh"
 #include "run.hh"
-#include "temporary-dir.hh"
+#include "lix/libstore/temporary-dir.hh"
 
 #include <iterator>
 #include <memory>
diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc
index dac4625e6..7162feb83 100644
--- a/src/nix/diff-closures.cc
+++ b/src/nix/diff-closures.cc
@@ -1,9 +1,9 @@
-#include "command.hh"
-#include "cmd-profiles.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "common-args.hh"
-#include "names.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libcmd/cmd-profiles.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libstore/names.hh"
 
 #include <regex>
 
diff --git a/src/nix/doctor.cc b/src/nix/doctor.cc
index 17db3f764..635fd3891 100644
--- a/src/nix/doctor.cc
+++ b/src/nix/doctor.cc
@@ -1,13 +1,13 @@
 #include <sstream>
 
-#include "command.hh"
-#include "logging.hh"
-#include "serve-protocol.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "worker-protocol.hh"
-#include "exit.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libutil/exit.hh"
 
 using namespace nix;
 
diff --git a/src/nix/dump-path.cc b/src/nix/dump-path.cc
index 661438a3d..be2bbcc7b 100644
--- a/src/nix/dump-path.cc
+++ b/src/nix/dump-path.cc
@@ -1,6 +1,6 @@
-#include "command.hh"
-#include "store-api.hh"
-#include "archive.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
 
 using namespace nix;
 
diff --git a/src/nix/edit.cc b/src/nix/edit.cc
index 8352c26e8..dc7d06ac5 100644
--- a/src/nix/edit.cc
+++ b/src/nix/edit.cc
@@ -1,9 +1,9 @@
-#include "command.hh"
-#include "shared.hh"
-#include "eval.hh"
-#include "attr-path.hh"
-#include "editor-for.hh"
-#include "current-process.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libcmd/editor-for.hh"
+#include "lix/libutil/current-process.hh"
 
 #include <unistd.h>
 
diff --git a/src/nix/eval.cc b/src/nix/eval.cc
index a027b9a58..b705072a5 100644
--- a/src/nix/eval.cc
+++ b/src/nix/eval.cc
@@ -1,11 +1,11 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "print-options.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "eval.hh"
-#include "eval-inline.hh"
-#include "value-to-json.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libexpr/print-options.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/value-to-json.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 1dc13fb3f..61acbeacc 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -1,22 +1,22 @@
-#include "command.hh"
-#include "installable-flake.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "eval.hh"
-#include "eval-inline.hh" // IWYU pragma: keep
-#include "eval-settings.hh"
-#include "flake/flake.hh"
-#include "get-drvs.hh"
-#include "store-api.hh"
-#include "derivations.hh"
-#include "outputs-spec.hh"
-#include "attr-path.hh"
-#include "fetchers.hh"
-#include "registry.hh"
-#include "eval-cache.hh"
-#include "markdown.hh"
-#include "terminal.hh"
-#include "signals.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libcmd/installable-flake.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-inline.hh" // IWYU pragma: keep
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libexpr/flake/flake.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/registry.hh"
+#include "lix/libexpr/eval-cache.hh"
+#include "lix/libcmd/markdown.hh"
+#include "lix/libutil/terminal.hh"
+#include "lix/libutil/signals.hh"
 
 #include <limits>
 #include <nlohmann/json.hpp>
diff --git a/src/nix/fmt.cc b/src/nix/fmt.cc
index f47f2204a..a34f27adc 100644
--- a/src/nix/fmt.cc
+++ b/src/nix/fmt.cc
@@ -1,5 +1,5 @@
-#include "command.hh"
-#include "installable-value.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libcmd/installable-value.hh"
 #include "run.hh"
 
 using namespace nix;
diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index 40b00c978..94bbe86ac 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -1,10 +1,10 @@
-#include "command.hh"
-#include "hash.hh"
-#include "content-address.hh"
-#include "legacy.hh"
-#include "shared.hh"
-#include "references.hh"
-#include "archive.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/content-address.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/archive.hh"
 #include "hash-command.hh"
 
 namespace nix {
diff --git a/src/nix/log.cc b/src/nix/log.cc
index b291489b5..8ea26a405 100644
--- a/src/nix/log.cc
+++ b/src/nix/log.cc
@@ -1,8 +1,8 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "log-store.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/log-store.hh"
 
 using namespace nix;
 
diff --git a/src/nix/ls.cc b/src/nix/ls.cc
index c990a303c..34c3decf8 100644
--- a/src/nix/ls.cc
+++ b/src/nix/ls.cc
@@ -1,8 +1,8 @@
-#include "command.hh"
-#include "store-api.hh"
-#include "fs-accessor.hh"
-#include "nar-accessor.hh"
-#include "common-args.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libstore/nar-accessor.hh"
+#include "lix/libmain/common-args.hh"
 #include <nlohmann/json.hpp>
 
 using namespace nix;
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 0d8f7d119..b464808fc 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -1,20 +1,20 @@
-#include "args/root.hh"
-#include "command.hh"
-#include "common-args.hh"
-#include "current-process.hh"
-#include "eval.hh"
-#include "eval-settings.hh"
-#include "globals.hh"
-#include "legacy.hh"
-#include "namespaces.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "filetransfer.hh"
-#include "finally.hh"
-#include "loggers.hh"
-#include "markdown.hh"
-#include "experimental-features-json.hh"
-#include "deprecated-features-json.hh"
+#include "lix/libutil/args/root.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libcmd/legacy.hh"
+#include "lix/libutil/namespaces.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libmain/loggers.hh"
+#include "lix/libcmd/markdown.hh"
+#include "lix/libutil/experimental-features-json.hh"
+#include "lix/libutil/deprecated-features-json.hh"
 #include "build-remote.hh"
 #include "daemon-command.hh"
 #include "hash-command.hh"
diff --git a/src/nix/make-content-addressed.cc b/src/nix/make-content-addressed.cc
index d9c988a9f..a3d8e3573 100644
--- a/src/nix/make-content-addressed.cc
+++ b/src/nix/make-content-addressed.cc
@@ -1,7 +1,7 @@
-#include "command.hh"
-#include "store-api.hh"
-#include "make-content-addressed.hh"
-#include "common-args.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/make-content-addressed.hh"
+#include "lix/libmain/common-args.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/nix/nar.cc b/src/nix/nar.cc
index 9815410cf..5954c680f 100644
--- a/src/nix/nar.cc
+++ b/src/nix/nar.cc
@@ -1,4 +1,4 @@
-#include "command.hh"
+#include "lix/libcmd/command.hh"
 
 using namespace nix;
 
diff --git a/src/nix/optimise-store.cc b/src/nix/optimise-store.cc
index 6d7d928bd..53fd510be 100644
--- a/src/nix/optimise-store.cc
+++ b/src/nix/optimise-store.cc
@@ -1,7 +1,7 @@
-#include "command.hh"
-#include "shared.hh"
-#include "signals.hh"
-#include "store-api.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <atomic>
 
diff --git a/src/nix/path-from-hash-part.cc b/src/nix/path-from-hash-part.cc
index 7f7cda8d3..da5e582e5 100644
--- a/src/nix/path-from-hash-part.cc
+++ b/src/nix/path-from-hash-part.cc
@@ -1,5 +1,5 @@
-#include "command.hh"
-#include "store-api.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/store-api.hh"
 
 using namespace nix;
 
diff --git a/src/nix/path-info.cc b/src/nix/path-info.cc
index 05578ea53..8848c169d 100644
--- a/src/nix/path-info.cc
+++ b/src/nix/path-info.cc
@@ -1,7 +1,7 @@
-#include "command.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "common-args.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libmain/common-args.hh"
 
 #include <algorithm>
 #include <array>
diff --git a/src/nix/ping-store.cc b/src/nix/ping-store.cc
index ec450e8e0..7232874a6 100644
--- a/src/nix/ping-store.cc
+++ b/src/nix/ping-store.cc
@@ -1,7 +1,7 @@
-#include "command.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "finally.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/finally.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc
index ca1241d2e..f3fd0d75e 100644
--- a/src/nix/prefetch.cc
+++ b/src/nix/prefetch.cc
@@ -1,15 +1,15 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "loggers.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "filetransfer.hh"
-#include "tarfile.hh"
-#include "attr-path.hh"
-#include "eval-inline.hh" // IWYU pragma: keep
-#include "legacy.hh"
-#include "temporary-dir.hh"
-#include "terminal.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/loggers.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/tarfile.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libexpr/eval-inline.hh" // IWYU pragma: keep
+#include "lix/libcmd/legacy.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libutil/terminal.hh"
 #include "prefetch-command.hh"
 
 #include <nlohmann/json.hpp>
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index 6739cb5c6..9878ca514 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -1,16 +1,16 @@
-#include "command.hh"
-#include "cmd-profiles.hh"
-#include "installable-flake.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "derivations.hh"
-#include "archive.hh"
-#include "builtins/buildenv.hh"
-#include "flake/flakeref.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libcmd/cmd-profiles.hh"
+#include "lix/libcmd/installable-flake.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/builtins/buildenv.hh"
+#include "lix/libexpr/flake/flakeref.hh"
 #include "user-env.hh"
-#include "profiles.hh"
-#include "names.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libstore/names.hh"
 
 #include <nlohmann/json.hpp>
 #include <regex>
diff --git a/src/nix/realisation.cc b/src/nix/realisation.cc
index e19e93219..9ed910f45 100644
--- a/src/nix/realisation.cc
+++ b/src/nix/realisation.cc
@@ -1,5 +1,5 @@
-#include "command.hh"
-#include "common-args.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/nix/registry.cc b/src/nix/registry.cc
index 9619b85d4..d0e9a8f2f 100644
--- a/src/nix/registry.cc
+++ b/src/nix/registry.cc
@@ -1,12 +1,12 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "eval.hh"
-#include "flake/flake.hh"
-#include "store-api.hh"
-#include "fetchers.hh"
-#include "url-parts.hh"
-#include "registry.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/flake/flake.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libutil/url-parts.hh"
+#include "lix/libfetchers/registry.hh"
 
 using namespace nix;
 using namespace nix::flake;
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 13186277e..b74d01c49 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -1,9 +1,9 @@
-#include "eval.hh"
-#include "eval-settings.hh"
-#include "globals.hh"
-#include "command.hh"
-#include "installable-value.hh"
-#include "repl.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libcmd/installable-value.hh"
+#include "lix/libcmd/repl.hh"
 
 namespace nix {
 
diff --git a/src/nix/run.cc b/src/nix/run.cc
index b7449e6c4..4e16a8045 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -1,19 +1,19 @@
 #include "run.hh"
-#include "command.hh"
-#include "common-args.hh"
-#include "installables.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "derivations.hh"
-#include "local-store.hh"
-#include "finally.hh"
-#include "fs-accessor.hh"
-#include "eval.hh"
-#include "build/personality.hh"
-#include "current-process.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libcmd/installables.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libstore/build/personality.hh"
+#include "lix/libutil/current-process.hh"
 
 #if __linux__
-#include "temporary-dir.hh"
+#include "lix/libstore/temporary-dir.hh"
 #include <sys/mount.h>
 #endif
 
diff --git a/src/nix/run.hh b/src/nix/run.hh
index a55917b06..a169734ae 100644
--- a/src/nix/run.hh
+++ b/src/nix/run.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/src/nix/search.cc b/src/nix/search.cc
index 9f6b7a24e..5d7e0871b 100644
--- a/src/nix/search.cc
+++ b/src/nix/search.cc
@@ -1,15 +1,15 @@
-#include "command.hh"
-#include "globals.hh"
-#include "eval.hh"
-#include "eval-inline.hh"
-#include "eval-settings.hh"
-#include "names.hh"
-#include "get-drvs.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "eval-cache.hh"
-#include "attr-path.hh"
-#include "hilite.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libstore/names.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libexpr/eval-cache.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libutil/hilite.hh"
 
 #include <regex>
 #include <fstream>
diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc
index 948844e22..ffeb9f8c2 100644
--- a/src/nix/sigs.cc
+++ b/src/nix/sigs.cc
@@ -1,8 +1,8 @@
-#include "command.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "thread-pool.hh"
-#include "signals.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "lix/libutil/signals.hh"
 
 #include <atomic>
 
diff --git a/src/nix/store-copy-log.cc b/src/nix/store-copy-log.cc
index a6e8aeff7..ee3b13048 100644
--- a/src/nix/store-copy-log.cc
+++ b/src/nix/store-copy-log.cc
@@ -1,10 +1,10 @@
-#include "command.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "store-cast.hh"
-#include "log-store.hh"
-#include "sync.hh"
-#include "thread-pool.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/store-cast.hh"
+#include "lix/libstore/log-store.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libutil/thread-pool.hh"
 
 #include <atomic>
 
diff --git a/src/nix/store-delete.cc b/src/nix/store-delete.cc
index 6719227df..a9fb354e1 100644
--- a/src/nix/store-delete.cc
+++ b/src/nix/store-delete.cc
@@ -1,9 +1,9 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "store-cast.hh"
-#include "gc-store.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/store-cast.hh"
+#include "lix/libstore/gc-store.hh"
 
 using namespace nix;
 
diff --git a/src/nix/store-gc.cc b/src/nix/store-gc.cc
index 8b9b5d164..7b971de2b 100644
--- a/src/nix/store-gc.cc
+++ b/src/nix/store-gc.cc
@@ -1,9 +1,9 @@
-#include "command.hh"
-#include "common-args.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "store-cast.hh"
-#include "gc-store.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/store-cast.hh"
+#include "lix/libstore/gc-store.hh"
 
 using namespace nix;
 
diff --git a/src/nix/store-repair.cc b/src/nix/store-repair.cc
index 895e39685..29bc84e22 100644
--- a/src/nix/store-repair.cc
+++ b/src/nix/store-repair.cc
@@ -1,5 +1,5 @@
-#include "command.hh"
-#include "store-api.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/store-api.hh"
 
 using namespace nix;
 
diff --git a/src/nix/store.cc b/src/nix/store.cc
index 2879e03b3..98ff26870 100644
--- a/src/nix/store.cc
+++ b/src/nix/store.cc
@@ -1,4 +1,4 @@
-#include "command.hh"
+#include "lix/libcmd/command.hh"
 
 using namespace nix;
 
diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc
index cb5eb2221..fb08ff2a0 100644
--- a/src/nix/upgrade-nix.cc
+++ b/src/nix/upgrade-nix.cc
@@ -1,18 +1,18 @@
 #include <algorithm>
 
-#include "cmd-profiles.hh"
-#include "command.hh"
-#include "common-args.hh"
-#include "local-fs-store.hh"
-#include "logging.hh"
-#include "processes.hh"
-#include "profiles.hh"
-#include "store-api.hh"
-#include "filetransfer.hh"
-#include "eval.hh"
-#include "eval-settings.hh"
-#include "attr-path.hh"
-#include "names.hh"
+#include "lix/libcmd/cmd-profiles.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/common-args.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libexpr/attr-path.hh"
+#include "lix/libstore/names.hh"
 
 using namespace nix;
 
diff --git a/src/nix/verify.cc b/src/nix/verify.cc
index d4ab352f4..4890171bc 100644
--- a/src/nix/verify.cc
+++ b/src/nix/verify.cc
@@ -1,9 +1,9 @@
-#include "command.hh"
-#include "shared.hh"
-#include "store-api.hh"
-#include "thread-pool.hh"
-#include "signals.hh"
-#include "exit.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/exit.hh"
 
 #include <atomic>
 
diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc
index 6df84e9e4..2cd3f801f 100644
--- a/src/nix/why-depends.cc
+++ b/src/nix/why-depends.cc
@@ -1,7 +1,7 @@
-#include "command.hh"
-#include "store-api.hh"
-#include "fs-accessor.hh"
-#include "shared.hh"
+#include "lix/libcmd/command.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libmain/shared.hh"
 
 #include <queue>
 
diff --git a/tests/functional/plugins/plugintest.cc b/tests/functional/plugins/plugintest.cc
index 9c20f2241..69be494a1 100644
--- a/tests/functional/plugins/plugintest.cc
+++ b/tests/functional/plugins/plugintest.cc
@@ -1,5 +1,5 @@
-#include "config.hh"
-#include "primops.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libexpr/primops.hh"
 #include <stdlib.h>
 
 using namespace nix;
diff --git a/tests/functional/repl_characterization/repl_characterization.cc b/tests/functional/repl_characterization/repl_characterization.cc
index f2cf0ca3d..f7e5e62b2 100644
--- a/tests/functional/repl_characterization/repl_characterization.cc
+++ b/tests/functional/repl_characterization/repl_characterization.cc
@@ -9,7 +9,7 @@
 #include "test-session.hh"
 #include "tests/characterization.hh"
 #include "tests/cli-literate-parser.hh"
-#include "strings.hh"
+#include "lix/libutil/strings.hh"
 
 using namespace std::string_literals;
 
diff --git a/tests/functional/repl_characterization/test-session.cc b/tests/functional/repl_characterization/test-session.cc
index 96f101cdd..72a5fbe3a 100644
--- a/tests/functional/repl_characterization/test-session.cc
+++ b/tests/functional/repl_characterization/test-session.cc
@@ -3,9 +3,9 @@
 #include <unistd.h>
 
 #include "test-session.hh"
-#include "escape-char.hh"
-#include "processes.hh"
-#include "strings.hh"
+#include "lix/libutil/escape-char.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/tests/functional/repl_characterization/test-session.hh b/tests/functional/repl_characterization/test-session.hh
index a9ba9cf0c..38c31f702 100644
--- a/tests/functional/repl_characterization/test-session.hh
+++ b/tests/functional/repl_characterization/test-session.hh
@@ -6,8 +6,8 @@
 #include <span>
 #include <string>
 
-#include "file-descriptor.hh"
-#include "processes.hh"
+#include "lix/libutil/file-descriptor.hh"
+#include "lix/libutil/processes.hh"
 #include "tests/terminal-code-eater.hh"
 
 namespace nix {
diff --git a/tests/functional/test-libstoreconsumer/main.cc b/tests/functional/test-libstoreconsumer/main.cc
index c61489af6..9029453d0 100644
--- a/tests/functional/test-libstoreconsumer/main.cc
+++ b/tests/functional/test-libstoreconsumer/main.cc
@@ -1,6 +1,6 @@
-#include "globals.hh"
-#include "store-api.hh"
-#include "build-result.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build-result.hh"
 #include <iostream>
 
 using namespace nix;
diff --git a/tests/unit/libcmd/args.cc b/tests/unit/libcmd/args.cc
index d78fa9872..8112b5813 100644
--- a/tests/unit/libcmd/args.cc
+++ b/tests/unit/libcmd/args.cc
@@ -5,11 +5,11 @@
 #include <boost/core/demangle.hpp>
 #include <gtest/gtest.h>
 
-#include "common-eval-args.hh"
-#include "eval.hh"
-#include "filetransfer.hh"
-#include "shared.hh"
-#include "store-api.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
 
 constexpr std::string_view INVALID_CHANNEL = "channel:example";
 constexpr std::string_view CHANNEL_URL = "https://nixos.org/channels/example/nixexprs.tar.xz";
diff --git a/tests/unit/libexpr-support/tests/libexpr.hh b/tests/unit/libexpr-support/tests/libexpr.hh
index 15acf910e..7196bd5d0 100644
--- a/tests/unit/libexpr-support/tests/libexpr.hh
+++ b/tests/unit/libexpr-support/tests/libexpr.hh
@@ -4,11 +4,11 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "value.hh"
-#include "nixexpr.hh"
-#include "eval.hh"
-#include "eval-inline.hh"
-#include "store-api.hh"
+#include "lix/libexpr/value.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libstore/store-api.hh"
 
 #include "tests/libstore.hh"
 
diff --git a/tests/unit/libexpr-support/tests/value/context.hh b/tests/unit/libexpr-support/tests/value/context.hh
index 8c68c78bb..77b27ca53 100644
--- a/tests/unit/libexpr-support/tests/value/context.hh
+++ b/tests/unit/libexpr-support/tests/value/context.hh
@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include "value/context.hh"
+#include "lix/libexpr/value/context.hh"
 
 namespace rc {
 using namespace nix;
diff --git a/tests/unit/libexpr/expr-print.cc b/tests/unit/libexpr/expr-print.cc
index aa25d00df..8962445d8 100644
--- a/tests/unit/libexpr/expr-print.cc
+++ b/tests/unit/libexpr/expr-print.cc
@@ -5,8 +5,8 @@
 
 #include "tests/libexpr.hh"
 
-#include "nixexpr.hh"
-#include "ref.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libutil/ref.hh"
 
 namespace nix
 {
diff --git a/tests/unit/libexpr/flakeref.cc b/tests/unit/libexpr/flakeref.cc
index 2b7809b93..e2ffd3239 100644
--- a/tests/unit/libexpr/flakeref.cc
+++ b/tests/unit/libexpr/flakeref.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "flake/flakeref.hh"
+#include "lix/libexpr/flake/flakeref.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libexpr/json.cc b/tests/unit/libexpr/json.cc
index 7586bdd9b..144586c49 100644
--- a/tests/unit/libexpr/json.cc
+++ b/tests/unit/libexpr/json.cc
@@ -1,5 +1,5 @@
 #include "tests/libexpr.hh"
-#include "value-to-json.hh"
+#include "lix/libexpr/value-to-json.hh"
 
 namespace nix {
 // Testing the conversion to JSON
diff --git a/tests/unit/libexpr/primops.cc b/tests/unit/libexpr/primops.cc
index bd174a6c0..8b4da1286 100644
--- a/tests/unit/libexpr/primops.cc
+++ b/tests/unit/libexpr/primops.cc
@@ -1,7 +1,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "eval-settings.hh"
+#include "lix/libexpr/eval-settings.hh"
 
 #include "tests/libexpr.hh"
 
diff --git a/tests/unit/libexpr/search-path.cc b/tests/unit/libexpr/search-path.cc
index dbe7ab95f..f822b8a24 100644
--- a/tests/unit/libexpr/search-path.cc
+++ b/tests/unit/libexpr/search-path.cc
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "search-path.hh"
+#include "lix/libexpr/search-path.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libexpr/value/print.cc b/tests/unit/libexpr/value/print.cc
index ddf8b8b99..714286374 100644
--- a/tests/unit/libexpr/value/print.cc
+++ b/tests/unit/libexpr/value/print.cc
@@ -1,7 +1,7 @@
 #include "tests/libexpr.hh"
 
-#include "value.hh"
-#include "print.hh"
+#include "lix/libexpr/value.hh"
+#include "lix/libexpr/print.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libmain/crash.cc b/tests/unit/libmain/crash.cc
index 883dc39bd..046a46dae 100644
--- a/tests/unit/libmain/crash.cc
+++ b/tests/unit/libmain/crash.cc
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "crash-handler.hh"
+#include "lix/libmain/crash-handler.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libmain/progress-bar.cc b/tests/unit/libmain/progress-bar.cc
index 0518a89ff..ae5f912ec 100644
--- a/tests/unit/libmain/progress-bar.cc
+++ b/tests/unit/libmain/progress-bar.cc
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "eval.hh"
-#include "progress-bar.hh"
-#include "loggers.hh"
-#include "logging.hh"
-#include "shared.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libmain/progress-bar.hh"
+#include "lix/libmain/loggers.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libmain/shared.hh"
 
 constexpr std::string_view TEST_URL = "https://github.com/NixOS/nixpkgs/archive/master.tar.gz";
 // Arbitrary number. We picked the size of a Nixpkgs tarball that we downloaded.
diff --git a/tests/unit/libstore-support/tests/derived-path.hh b/tests/unit/libstore-support/tests/derived-path.hh
index 98d61f228..9cfa261f3 100644
--- a/tests/unit/libstore-support/tests/derived-path.hh
+++ b/tests/unit/libstore-support/tests/derived-path.hh
@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <derived-path.hh>
+#include "lix/libstore/derived-path.hh"
 
 #include "tests/path.hh"
 #include "tests/outputs-spec.hh"
diff --git a/tests/unit/libstore-support/tests/libstore.hh b/tests/unit/libstore-support/tests/libstore.hh
index ef93457b5..1d83ac6b5 100644
--- a/tests/unit/libstore-support/tests/libstore.hh
+++ b/tests/unit/libstore-support/tests/libstore.hh
@@ -4,7 +4,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libstore-support/tests/outputs-spec.hh b/tests/unit/libstore-support/tests/outputs-spec.hh
index f5bf9042d..fb8ece7c9 100644
--- a/tests/unit/libstore-support/tests/outputs-spec.hh
+++ b/tests/unit/libstore-support/tests/outputs-spec.hh
@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <outputs-spec.hh>
+#include "lix/libstore/outputs-spec.hh"
 
 #include "tests/path.hh"
 
diff --git a/tests/unit/libstore-support/tests/path.cc b/tests/unit/libstore-support/tests/path.cc
index 8ddda8027..2c448d968 100644
--- a/tests/unit/libstore-support/tests/path.cc
+++ b/tests/unit/libstore-support/tests/path.cc
@@ -3,8 +3,8 @@
 
 #include <rapidcheck.h>
 
-#include "path-regex.hh"
-#include "store-api.hh"
+#include "lix/libstore/path-regex.hh"
+#include "lix/libstore/store-api.hh"
 
 #include "tests/hash.hh"
 #include "tests/path.hh"
diff --git a/tests/unit/libstore-support/tests/path.hh b/tests/unit/libstore-support/tests/path.hh
index 4751b3373..916d50f0c 100644
--- a/tests/unit/libstore-support/tests/path.hh
+++ b/tests/unit/libstore-support/tests/path.hh
@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <path.hh>
+#include "lix/libstore/path.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libstore/common-protocol.cc b/tests/unit/libstore/common-protocol.cc
index 9523c9acb..ac01aa4be 100644
--- a/tests/unit/libstore/common-protocol.cc
+++ b/tests/unit/libstore/common-protocol.cc
@@ -3,9 +3,9 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "build-result.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh"
+#include "lix/libstore/build-result.hh"
 #include "protocol.hh"
 #include "tests/characterization.hh"
 
diff --git a/tests/unit/libstore/derivation.cc b/tests/unit/libstore/derivation.cc
index 21e141693..c8555b17b 100644
--- a/tests/unit/libstore/derivation.cc
+++ b/tests/unit/libstore/derivation.cc
@@ -1,8 +1,8 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "derivations.hh"
-#include "strings.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/strings.hh"
 
 #include "tests/libstore.hh"
 #include "tests/characterization.hh"
diff --git a/tests/unit/libstore/downstream-placeholder.cc b/tests/unit/libstore/downstream-placeholder.cc
index fd29530ac..f8b26730b 100644
--- a/tests/unit/libstore/downstream-placeholder.cc
+++ b/tests/unit/libstore/downstream-placeholder.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "downstream-placeholder.hh"
+#include "lix/libstore/downstream-placeholder.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libstore/filetransfer.cc b/tests/unit/libstore/filetransfer.cc
index 78299a2d5..c6cd0f9c6 100644
--- a/tests/unit/libstore/filetransfer.cc
+++ b/tests/unit/libstore/filetransfer.cc
@@ -1,5 +1,5 @@
-#include "filetransfer.hh"
-#include "compression.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/compression.hh"
 
 #include <cstdint>
 #include <exception>
diff --git a/tests/unit/libstore/machines.cc b/tests/unit/libstore/machines.cc
index 8a1aeb56c..2dcaac7f3 100644
--- a/tests/unit/libstore/machines.cc
+++ b/tests/unit/libstore/machines.cc
@@ -1,7 +1,7 @@
-#include "file-system.hh"
-#include "machines.hh"
-#include "globals.hh"
-#include "strings.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/machines.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/strings.hh"
 #include "tests/test-data.hh"
 
 #include <gmock/gmock-matchers.h>
diff --git a/tests/unit/libstore/nar-info-disk-cache.cc b/tests/unit/libstore/nar-info-disk-cache.cc
index 5273487c5..b6bb6fd31 100644
--- a/tests/unit/libstore/nar-info-disk-cache.cc
+++ b/tests/unit/libstore/nar-info-disk-cache.cc
@@ -1,9 +1,9 @@
-#include "nar-info-disk-cache.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
 
 #include <gtest/gtest.h>
 #include <rapidcheck/gtest.h>
-#include "sqlite.hh"
-#include "temporary-dir.hh"
+#include "lix/libstore/sqlite.hh"
+#include "lix/libstore/temporary-dir.hh"
 #include <sqlite3.h>
 
 
diff --git a/tests/unit/libstore/path.cc b/tests/unit/libstore/path.cc
index 213b6e95f..e8cc1b80a 100644
--- a/tests/unit/libstore/path.cc
+++ b/tests/unit/libstore/path.cc
@@ -4,8 +4,8 @@
 #include <gtest/gtest.h>
 #include <rapidcheck/gtest.h>
 
-#include "path-regex.hh"
-#include "store-api.hh"
+#include "lix/libstore/path-regex.hh"
+#include "lix/libstore/store-api.hh"
 
 #include "tests/hash.hh"
 #include "tests/libstore.hh"
diff --git a/tests/unit/libstore/protocol.hh b/tests/unit/libstore/protocol.hh
index 8212959f0..7c22f1c1d 100644
--- a/tests/unit/libstore/protocol.hh
+++ b/tests/unit/libstore/protocol.hh
@@ -1,7 +1,7 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "strings.hh"
+#include "lix/libutil/strings.hh"
 #include "tests/libstore.hh"
 #include "tests/characterization.hh"
 
diff --git a/tests/unit/libstore/references.cc b/tests/unit/libstore/references.cc
index d91d1cedd..6b0f4c3a3 100644
--- a/tests/unit/libstore/references.cc
+++ b/tests/unit/libstore/references.cc
@@ -1,4 +1,4 @@
-#include "references.hh"
+#include "lix/libutil/references.hh"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/libstore/serve-protocol.cc b/tests/unit/libstore/serve-protocol.cc
index c6793be74..e315d42fe 100644
--- a/tests/unit/libstore/serve-protocol.cc
+++ b/tests/unit/libstore/serve-protocol.cc
@@ -3,9 +3,9 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
-#include "build-result.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libstore/build-result.hh"
 #include "protocol.hh"
 #include "tests/characterization.hh"
 
diff --git a/tests/unit/libstore/worker-protocol.cc b/tests/unit/libstore/worker-protocol.cc
index 92a33f595..8802b72a7 100644
--- a/tests/unit/libstore/worker-protocol.cc
+++ b/tests/unit/libstore/worker-protocol.cc
@@ -3,10 +3,10 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "worker-protocol.hh"
-#include "worker-protocol-impl.hh"
-#include "derived-path.hh"
-#include "build-result.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/worker-protocol-impl.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libstore/build-result.hh"
 #include "protocol.hh"
 #include "tests/characterization.hh"
 
diff --git a/tests/unit/libutil-support/tests/characterization.hh b/tests/unit/libutil-support/tests/characterization.hh
index 2bf606bd8..b53f28230 100644
--- a/tests/unit/libutil-support/tests/characterization.hh
+++ b/tests/unit/libutil-support/tests/characterization.hh
@@ -1,14 +1,14 @@
 #pragma once
 ///@file
 
-#include "environment-variables.hh"
-#include "file-system.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/file-system.hh"
 
 #include <gtest/gtest.h>
 
 #include <filesystem>
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 #include "test-data.hh"
 
 namespace nix {
diff --git a/tests/unit/libutil-support/tests/cli-literate-parser.cc b/tests/unit/libutil-support/tests/cli-literate-parser.cc
index 3aa55859c..ebd5eb809 100644
--- a/tests/unit/libutil-support/tests/cli-literate-parser.cc
+++ b/tests/unit/libutil-support/tests/cli-literate-parser.cc
@@ -1,6 +1,6 @@
 #include "cli-literate-parser.hh"
-#include "escape-string.hh"
-#include "types.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libutil/types.hh"
 #include <ranges>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/trim.hpp>
@@ -9,11 +9,11 @@
 #include <variant>
 
 #include "cli-literate-parser.hh"
-#include "escape-string.hh"
-#include "fmt.hh"
-#include "shlex.hh"
-#include "types.hh"
-#include "strings.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libutil/fmt.hh"
+#include "lix/libutil/shlex.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/strings.hh"
 
 static constexpr const bool DEBUG_PARSER = false;
 
diff --git a/tests/unit/libutil-support/tests/hash.hh b/tests/unit/libutil-support/tests/hash.hh
index 1f9fa59ae..57f46490d 100644
--- a/tests/unit/libutil-support/tests/hash.hh
+++ b/tests/unit/libutil-support/tests/hash.hh
@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <hash.hh>
+#include "lix/libutil/hash.hh"
 
 namespace rc {
 using namespace nix;
diff --git a/tests/unit/libutil-support/tests/terminal-code-eater.cc b/tests/unit/libutil-support/tests/terminal-code-eater.cc
index 6e108009a..ac4fbe980 100644
--- a/tests/unit/libutil-support/tests/terminal-code-eater.cc
+++ b/tests/unit/libutil-support/tests/terminal-code-eater.cc
@@ -1,5 +1,5 @@
 #include "terminal-code-eater.hh"
-#include "escape-char.hh"
+#include "lix/libutil/escape-char.hh"
 #include <assert.h>
 #include <cstdint>
 #include <iostream>
diff --git a/tests/unit/libutil-support/tests/test-data.cc b/tests/unit/libutil-support/tests/test-data.cc
index 016bd5e78..40d6f4a4e 100644
--- a/tests/unit/libutil-support/tests/test-data.cc
+++ b/tests/unit/libutil-support/tests/test-data.cc
@@ -1,5 +1,5 @@
 #include "test-data.hh"
-#include "strings.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libutil-support/tests/test-data.hh b/tests/unit/libutil-support/tests/test-data.hh
index 794ec6265..72f6e9f97 100644
--- a/tests/unit/libutil-support/tests/test-data.hh
+++ b/tests/unit/libutil-support/tests/test-data.hh
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "types.hh"
-#include "environment-variables.hh"
-#include "file-system.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/file-system.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libutil/async-collect.cc b/tests/unit/libutil/async-collect.cc
index 770374d21..16f0ca1d8 100644
--- a/tests/unit/libutil/async-collect.cc
+++ b/tests/unit/libutil/async-collect.cc
@@ -1,4 +1,4 @@
-#include "async-collect.hh"
+#include "lix/libutil/async-collect.hh"
 
 #include <gtest/gtest.h>
 #include <kj/array.h>
diff --git a/tests/unit/libutil/async-semaphore.cc b/tests/unit/libutil/async-semaphore.cc
index 12b52885d..78a3b2424 100644
--- a/tests/unit/libutil/async-semaphore.cc
+++ b/tests/unit/libutil/async-semaphore.cc
@@ -1,4 +1,4 @@
-#include "async-semaphore.hh"
+#include "lix/libutil/async-semaphore.hh"
 
 #include <gtest/gtest.h>
 #include <kj/async.h>
diff --git a/tests/unit/libutil/canon-path.cc b/tests/unit/libutil/canon-path.cc
index fc94ccc3d..9061e1222 100644
--- a/tests/unit/libutil/canon-path.cc
+++ b/tests/unit/libutil/canon-path.cc
@@ -1,4 +1,4 @@
-#include "canon-path.hh"
+#include "lix/libutil/canon-path.hh"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/libutil/checked-arithmetic.cc b/tests/unit/libutil/checked-arithmetic.cc
index 2a9ba6906..be6dcfb8f 100644
--- a/tests/unit/libutil/checked-arithmetic.cc
+++ b/tests/unit/libutil/checked-arithmetic.cc
@@ -5,7 +5,7 @@
 #include <rapidcheck/gtest.h>
 #include <rapidcheck/gen/Arbitrary.hpp>
 
-#include <checked-arithmetic.hh>
+#include "lix/libutil/checked-arithmetic.hh"
 
 #include "tests/gtest-with-params.hh"
 
diff --git a/tests/unit/libutil/chunked-vector.cc b/tests/unit/libutil/chunked-vector.cc
index 4feed568b..a88d2708c 100644
--- a/tests/unit/libutil/chunked-vector.cc
+++ b/tests/unit/libutil/chunked-vector.cc
@@ -1,4 +1,4 @@
-#include "chunked-vector.hh"
+#include "lix/libutil/chunked-vector.hh"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/libutil/closure.cc b/tests/unit/libutil/closure.cc
index 8cac9a9fd..08ae650cb 100644
--- a/tests/unit/libutil/closure.cc
+++ b/tests/unit/libutil/closure.cc
@@ -1,4 +1,4 @@
-#include "closure.hh"
+#include "lix/libutil/closure.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/compression.cc b/tests/unit/libutil/compression.cc
index 6dd8c96df..e18080645 100644
--- a/tests/unit/libutil/compression.cc
+++ b/tests/unit/libutil/compression.cc
@@ -1,4 +1,4 @@
-#include "compression.hh"
+#include "lix/libutil/compression.hh"
 #include <cstddef>
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/libutil/config.cc b/tests/unit/libutil/config.cc
index b10b288c1..0e526fb31 100644
--- a/tests/unit/libutil/config.cc
+++ b/tests/unit/libutil/config.cc
@@ -1,8 +1,8 @@
-#include "config.hh"
-#include "args.hh"
-#include "file-system.hh"
-#include "environment-variables.hh"
-#include "logging.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/logging.hh"
 #include "tests/test-data.hh"
 
 #include <sstream>
diff --git a/tests/unit/libutil/escape-string.cc b/tests/unit/libutil/escape-string.cc
index 5ce2b73d8..0e416d452 100644
--- a/tests/unit/libutil/escape-string.cc
+++ b/tests/unit/libutil/escape-string.cc
@@ -1,5 +1,5 @@
-#include "escape-string.hh"
-#include "ansicolor.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libutil/ansicolor.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/generator.cc b/tests/unit/libutil/generator.cc
index 22cc085f9..4b8676a63 100644
--- a/tests/unit/libutil/generator.cc
+++ b/tests/unit/libutil/generator.cc
@@ -1,4 +1,4 @@
-#include "generator.hh"
+#include "lix/libutil/generator.hh"
 
 #include <concepts>
 #include <cstdint>
diff --git a/tests/unit/libutil/git.cc b/tests/unit/libutil/git.cc
index e9048278a..1dbdf4896 100644
--- a/tests/unit/libutil/git.cc
+++ b/tests/unit/libutil/git.cc
@@ -1,4 +1,4 @@
-#include "git.hh"
+#include "lix/libutil/git.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/hash.cc b/tests/unit/libutil/hash.cc
index 6c24eda10..4f8994935 100644
--- a/tests/unit/libutil/hash.cc
+++ b/tests/unit/libutil/hash.cc
@@ -2,7 +2,7 @@
 
 #include <gtest/gtest.h>
 
-#include "hash.hh"
+#include "lix/libutil/hash.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libutil/hilite.cc b/tests/unit/libutil/hilite.cc
index 1ff5980d5..0a5c4b186 100644
--- a/tests/unit/libutil/hilite.cc
+++ b/tests/unit/libutil/hilite.cc
@@ -1,4 +1,4 @@
-#include "hilite.hh"
+#include "lix/libutil/hilite.hh"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/libutil/json-utils.cc b/tests/unit/libutil/json-utils.cc
index f0ce15c93..e0b19d9d1 100644
--- a/tests/unit/libutil/json-utils.cc
+++ b/tests/unit/libutil/json-utils.cc
@@ -3,7 +3,7 @@
 
 #include <gtest/gtest.h>
 
-#include "json-utils.hh"
+#include "lix/libutil/json-utils.hh"
 
 namespace nix {
 
diff --git a/tests/unit/libutil/lru-cache.cc b/tests/unit/libutil/lru-cache.cc
index 091d3d5ed..e93afa7b5 100644
--- a/tests/unit/libutil/lru-cache.cc
+++ b/tests/unit/libutil/lru-cache.cc
@@ -1,4 +1,4 @@
-#include "lru-cache.hh"
+#include "lix/libutil/lru-cache.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/paths-setting.cc b/tests/unit/libutil/paths-setting.cc
index 2d37ad525..5873b2f17 100644
--- a/tests/unit/libutil/paths-setting.cc
+++ b/tests/unit/libutil/paths-setting.cc
@@ -1,4 +1,4 @@
-#include "config.hh"
+#include "lix/libutil/config.hh"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
diff --git a/tests/unit/libutil/pool.cc b/tests/unit/libutil/pool.cc
index 90ee509ba..5c9d1ff05 100644
--- a/tests/unit/libutil/pool.cc
+++ b/tests/unit/libutil/pool.cc
@@ -1,4 +1,4 @@
-#include "pool.hh"
+#include "lix/libutil/pool.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/references.cc b/tests/unit/libutil/references.cc
index ef7111e9c..78284cde3 100644
--- a/tests/unit/libutil/references.cc
+++ b/tests/unit/libutil/references.cc
@@ -1,5 +1,5 @@
-#include "references.hh"
-#include "strings.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/strings.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/serialise.cc b/tests/unit/libutil/serialise.cc
index 4fe010af8..d2a807c4f 100644
--- a/tests/unit/libutil/serialise.cc
+++ b/tests/unit/libutil/serialise.cc
@@ -1,10 +1,10 @@
-#include "serialise.hh"
-#include "error.hh"
-#include "fmt.hh"
-#include "pos-table.hh"
-#include "generator.hh"
-#include "ref.hh"
-#include "types.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/fmt.hh"
+#include "lix/libexpr/pos-table.hh"
+#include "lix/libutil/generator.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libutil/types.hh"
 
 #include <concepts>
 #include <cstdint>
diff --git a/tests/unit/libutil/suggestions.cc b/tests/unit/libutil/suggestions.cc
index 279994abc..88538cef8 100644
--- a/tests/unit/libutil/suggestions.cc
+++ b/tests/unit/libutil/suggestions.cc
@@ -1,4 +1,4 @@
-#include "suggestions.hh"
+#include "lix/libutil/suggestions.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/tests.cc b/tests/unit/libutil/tests.cc
index 29a5f7164..1349be71f 100644
--- a/tests/unit/libutil/tests.cc
+++ b/tests/unit/libutil/tests.cc
@@ -1,8 +1,8 @@
-#include "file-system.hh"
-#include "processes.hh"
-#include "strings.hh"
-#include "types.hh"
-#include "terminal.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/terminal.hh"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/libutil/url-name.cc b/tests/unit/libutil/url-name.cc
index 164bb26d7..45c7c825d 100644
--- a/tests/unit/libutil/url-name.cc
+++ b/tests/unit/libutil/url-name.cc
@@ -1,4 +1,4 @@
-#include "url-name.hh"
+#include "lix/libutil/url-name.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/url.cc b/tests/unit/libutil/url.cc
index ecf544618..6b5081241 100644
--- a/tests/unit/libutil/url.cc
+++ b/tests/unit/libutil/url.cc
@@ -1,5 +1,5 @@
-#include "url.hh"
-#include "types.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/types.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libutil/xml-writer.cc b/tests/unit/libutil/xml-writer.cc
index adcde25c9..047df9376 100644
--- a/tests/unit/libutil/xml-writer.cc
+++ b/tests/unit/libutil/xml-writer.cc
@@ -1,4 +1,4 @@
-#include "xml-writer.hh"
+#include "lix/libutil/xml-writer.hh"
 #include <gtest/gtest.h>
 #include <sstream>