diff --git a/src/hydra-evaluator/hydra-evaluator.cc b/src/hydra-evaluator/hydra-evaluator.cc
index 85ded046..e13ee75a 100644
--- a/src/hydra-evaluator/hydra-evaluator.cc
+++ b/src/hydra-evaluator/hydra-evaluator.cc
@@ -1,9 +1,9 @@
 #include "db.hh"
 #include "hydra-config.hh"
-#include "logging.hh"
-#include "pool.hh"
-#include "shared.hh"
-#include "signals.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/pool.hh"
+#include "lix/libutil/signals.hh"
 
 #include <algorithm>
 #include <thread>
diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index 488baacc..f1a5ce5e 100644
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -6,18 +6,17 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "build-result.hh"
-#include "current-process.hh"
-#include "path.hh"
-#include "serve-protocol.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/ssh.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/url.hh"
 #include "state.hh"
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
-#include "ssh.hh"
-#include "finally.hh"
-#include "url.hh"
 
-#include "temporary-dir.hh"
+#include "lix/libstore/temporary-dir.hh"
 
 using namespace nix;
 
diff --git a/src/hydra-queue-runner/build-result.cc b/src/hydra-queue-runner/build-result.cc
index 6d9c7979..fa605319 100644
--- a/src/hydra-queue-runner/build-result.cc
+++ b/src/hydra-queue-runner/build-result.cc
@@ -1,7 +1,7 @@
 #include "hydra-build-result.hh"
-#include "store-api.hh"
-#include "fs-accessor.hh"
-#include "strings.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/strings.hh"
 
 #include <regex>
 
diff --git a/src/hydra-queue-runner/builder.cc b/src/hydra-queue-runner/builder.cc
index 15bf8f10..f3bbba4d 100644
--- a/src/hydra-queue-runner/builder.cc
+++ b/src/hydra-queue-runner/builder.cc
@@ -1,10 +1,10 @@
 #include <cmath>
 
-#include "error.hh"
-#include "state.hh"
 #include "hydra-build-result.hh"
-#include "finally.hh"
-#include "binary-cache-store.hh"
+#include "lix/libstore/binary-cache-store.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/finally.hh"
+#include "state.hh"
 
 using namespace nix;
 
diff --git a/src/hydra-queue-runner/hydra-build-result.hh b/src/hydra-queue-runner/hydra-build-result.hh
index 8e852b2e..9e92bdf8 100644
--- a/src/hydra-queue-runner/hydra-build-result.hh
+++ b/src/hydra-queue-runner/hydra-build-result.hh
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include "hash.hh"
-#include "derivations.hh"
-#include "store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/hash.hh"
 #include "nar-extractor.hh"
 
 struct BuildProduct
diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc
index ba464c81..f49579f1 100644
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@@ -11,16 +11,16 @@
 
 #include <nlohmann/json.hpp>
 
-#include "signals.hh"
-#include "state.hh"
 #include "hydra-build-result.hh"
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/signals.hh"
+#include "state.hh"
 
-#include "args.hh"
-#include "globals.hh"
 #include "hydra-config.hh"
-#include "s3-binary-cache-store.hh"
-#include "shared.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/s3-binary-cache-store.hh"
+#include "lix/libutil/args.hh"
 
 using namespace nix;
 using nlohmann::json;
diff --git a/src/hydra-queue-runner/nar-extractor.cc b/src/hydra-queue-runner/nar-extractor.cc
index 7619b2ee..d96ca87c 100644
--- a/src/hydra-queue-runner/nar-extractor.cc
+++ b/src/hydra-queue-runner/nar-extractor.cc
@@ -1,6 +1,6 @@
 #include "nar-extractor.hh"
 
-#include "archive.hh"
+#include "lix/libutil/archive.hh"
 
 #include <unordered_set>
 #include <utility>
diff --git a/src/hydra-queue-runner/nar-extractor.hh b/src/hydra-queue-runner/nar-extractor.hh
index 59d3fae2..dc9d00f4 100644
--- a/src/hydra-queue-runner/nar-extractor.hh
+++ b/src/hydra-queue-runner/nar-extractor.hh
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "fs-accessor.hh"
-#include "types.hh"
-#include "serialise.hh"
-#include "hash.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/types.hh"
 
 struct NarMemberData
 {
diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc
index cbc01f76..b66becb0 100644
--- a/src/hydra-queue-runner/queue-monitor.cc
+++ b/src/hydra-queue-runner/queue-monitor.cc
@@ -1,7 +1,7 @@
-#include "state.hh"
 #include "hydra-build-result.hh"
-#include "globals.hh"
-#include "thread-pool.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "state.hh"
 
 #include <cstring>
 #include <utility>
diff --git a/src/hydra-queue-runner/state.hh b/src/hydra-queue-runner/state.hh
index 02abfcb6..88fe262f 100644
--- a/src/hydra-queue-runner/state.hh
+++ b/src/hydra-queue-runner/state.hh
@@ -16,15 +16,15 @@
 
 #include "db.hh"
 
-#include "parsed-derivations.hh"
-#include "pathlocks.hh"
-#include "pool.hh"
-#include "build-result.hh"
-#include "store-api.hh"
-#include "sync.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/machines.hh"
+#include "lix/libstore/parsed-derivations.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/pool.hh"
+#include "lix/libutil/sync.hh"
 #include "nar-extractor.hh"
-#include "serve-protocol.hh"
-#include "machines.hh"
 
 
 using BuildID = unsigned int;
diff --git a/src/libhydra/db.hh b/src/libhydra/db.hh
index 44e08d4c..201591d2 100644
--- a/src/libhydra/db.hh
+++ b/src/libhydra/db.hh
@@ -2,8 +2,8 @@
 
 #include <pqxx/pqxx>
 
-#include "strings.hh"
-#include "environment-variables.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/strings.hh"
 
 
 struct Connection : pqxx::connection
diff --git a/src/libhydra/hydra-config.hh b/src/libhydra/hydra-config.hh
index cd4c2330..53f49c31 100644
--- a/src/libhydra/hydra-config.hh
+++ b/src/libhydra/hydra-config.hh
@@ -2,9 +2,9 @@
 
 #include <map>
 
-#include "environment-variables.hh"
-#include "file-system.hh"
-#include "strings.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/strings.hh"
 
 struct HydraConfig
 {