Include rearrangement: libstore

Change-Id: I27c83510d9053bb8bdd7eda9ad3a4b77d633056a

src/libstore/binary-cache-store.cc

@@ -1,17 +1,17 @@
-#include "archive.hh"
-#include "binary-cache-store.hh"
-#include "compression.hh"
-#include "derivations.hh"
-#include "fs-accessor.hh"
-#include "nar-info.hh"
-#include "sync.hh"
-#include "remote-fs-accessor.hh"
-#include "nar-info-disk-cache.hh" // IWYU pragma: keep
-#include "nar-accessor.hh"
-#include "temporary-dir.hh"
-#include "thread-pool.hh"
-#include "signals.hh"
-#include "strings.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/binary-cache-store.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libstore/remote-fs-accessor.hh"
+#include "lix/libstore/nar-info-disk-cache.hh" // IWYU pragma: keep
+#include "lix/libstore/nar-accessor.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
 
 #include <chrono>
 #include <regex>

src/libstore/binary-cache-store.hh

@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "crypto.hh"
-#include "store-api.hh"
-#include "log-store.hh"
+#include "lix/libstore/crypto.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/log-store.hh"
 
-#include "pool.hh"
+#include "lix/libutil/pool.hh"
 
 #include <atomic>
 

src/libstore/build-result.cc

@@ -1,4 +1,4 @@
-#include "build-result.hh"
+#include "lix/libstore/build-result.hh"
 
 namespace nix {
 

src/libstore/build-result.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "realisation.hh"
-#include "derived-path.hh"
-#include "comparator.hh"
+#include "lix/libstore/realisation.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libutil/comparator.hh"
 
 #include <string>
 #include <chrono>

src/libstore/build/child.cc

@@ -1,5 +1,5 @@
-#include "current-process.hh"
-#include "logging.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libutil/logging.hh"
 
 namespace nix {
 

src/libstore/build/derivation-goal.cc

@@ -1,16 +1,16 @@
-#include "derivation-goal.hh"
-#include "file-system.hh"
-#include "hook-instance.hh"
-#include "worker.hh"
-#include "finally.hh"
-#include "compression.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh" // IWYU pragma: keep
-#include "local-store.hh" // TODO remove, along with remaining downcasts
-#include "logging-json.hh"
-#include "substitution-goal.hh"
-#include "drv-output-substitution-goal.hh"
-#include "strings.hh"
+#include "lix/libstore/build/derivation-goal.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/build/hook-instance.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh" // IWYU pragma: keep
+#include "lix/libstore/local-store.hh" // TODO remove, along with remaining downcasts
+#include "lix/libutil/logging-json.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libstore/build/drv-output-substitution-goal.hh"
+#include "lix/libutil/strings.hh"
 
 #include <boost/outcome/try.hpp>
 #include <fstream>

src/libstore/build/derivation-goal.hh

@@ -1,13 +1,13 @@
 #pragma once
 ///@file
 
-#include "notifying-counter.hh"
-#include "parsed-derivations.hh"
-#include "lock.hh"
-#include "outputs-spec.hh"
-#include "store-api.hh"
-#include "pathlocks.hh"
-#include "goal.hh"
+#include "lix/libutil/notifying-counter.hh"
+#include "lix/libstore/parsed-derivations.hh"
+#include "lix/libstore/lock.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libstore/build/goal.hh"
 #include <kj/time.h>
 
 namespace nix {

src/libstore/build/drv-output-substitution-goal.cc

@@ -1,9 +1,9 @@
-#include "drv-output-substitution-goal.hh"
-#include "build-result.hh"
-#include "finally.hh"
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "signals.hh"
+#include "lix/libstore/build/drv-output-substitution-goal.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libutil/signals.hh"
 #include <kj/array.h>
 #include <kj/async.h>
 #include <kj/vector.h>

src/libstore/build/drv-output-substitution-goal.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "notifying-counter.hh"
-#include "store-api.hh"
-#include "goal.hh"
-#include "realisation.hh"
+#include "lix/libutil/notifying-counter.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build/goal.hh"
+#include "lix/libstore/realisation.hh"
 #include <future>
 
 namespace nix {

src/libstore/build/entry-points.cc

@@ -1,8 +1,8 @@
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "derivation-goal.hh"
-#include "local-store.hh"
-#include "strings.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libstore/build/derivation-goal.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/build/goal.cc

@@ -1,6 +1,6 @@
-#include "goal.hh"
-#include "async-collect.hh"
-#include "worker.hh"
+#include "lix/libstore/build/goal.hh"
+#include "lix/libutil/async-collect.hh"
+#include "lix/libstore/build/worker.hh"
 #include <boost/outcome/try.hpp>
 #include <kj/time.h>
 

src/libstore/build/goal.hh

@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "async-semaphore.hh"
-#include "result.hh"
-#include "types.hh"
-#include "store-api.hh"
-#include "build-result.hh"
+#include "lix/libutil/async-semaphore.hh"
+#include "lix/libutil/result.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build-result.hh"
 #include <concepts> // IWYU pragma: keep
 #include <kj/async.h>
 

src/libstore/build/hook-instance.cc

@@ -1,9 +1,9 @@
-#include "child.hh"
-#include "error.hh"
-#include "file-system.hh"
-#include "globals.hh"
-#include "hook-instance.hh"
-#include "strings.hh"
+#include "lix/libstore/build/child.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/build/hook-instance.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/build/hook-instance.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "logging.hh"
-#include "processes.hh"
-#include "serialise.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/serialise.hh"
 
 namespace nix {
 

src/libstore/build/local-derivation-goal.cc

@@ -1,24 +1,24 @@
-#include "local-derivation-goal.hh"
-#include "error.hh"
-#include "indirect-root-store.hh"
-#include "machines.hh"
-#include "store-api.hh"
-#include "temporary-dir.hh"
-#include "worker.hh"
-#include "builtins.hh"
-#include "builtins/buildenv.hh"
-#include "path-references.hh"
-#include "archive.hh"
-#include "daemon.hh"
-#include "topo-sort.hh"
-#include "json-utils.hh"
-#include "cgroup.hh"
-#include "personality.hh"
-#include "namespaces.hh"
-#include "child.hh"
-#include "unix-domain-socket.hh"
-#include "mount.hh"
-#include "strings.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libstore/indirect-root-store.hh"
+#include "lix/libstore/machines.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libstore/builtins.hh"
+#include "lix/libstore/builtins/buildenv.hh"
+#include "lix/libstore/path-references.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/daemon.hh"
+#include "lix/libutil/topo-sort.hh"
+#include "lix/libutil/json-utils.hh"
+#include "lix/libutil/cgroup.hh"
+#include "lix/libstore/build/personality.hh"
+#include "lix/libutil/namespaces.hh"
+#include "lix/libstore/build/child.hh"
+#include "lix/libutil/unix-domain-socket.hh"
+#include "lix/libutil/mount.hh"
+#include "lix/libutil/strings.hh"
 
 #include <regex>
 #include <queue>

src/libstore/build/local-derivation-goal.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "derivation-goal.hh"
-#include "local-store.hh"
-#include "processes.hh"
+#include "lix/libstore/build/derivation-goal.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libutil/processes.hh"
 
 namespace nix {
 

src/libstore/build/personality.cc

@@ -1,5 +1,5 @@
-#include "personality.hh"
-#include "globals.hh"
+#include "lix/libstore/build/personality.hh"
+#include "lix/libstore/globals.hh"
 
 #if __linux__
 #include <sys/utsname.h>

src/libstore/build/substitution-goal.cc

@@ -1,8 +1,8 @@
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "nar-info.hh"
-#include "signals.hh"
-#include "finally.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/finally.hh"
 #include <boost/outcome/try.hpp>
 #include <kj/array.h>
 #include <kj/vector.h>

src/libstore/build/substitution-goal.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "lock.hh"
-#include "notifying-counter.hh"
-#include "store-api.hh"
-#include "goal.hh"
+#include "lix/libstore/lock.hh"
+#include "lix/libutil/notifying-counter.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build/goal.hh"
 
 namespace nix {
 

src/libstore/build/worker.cc

@@ -1,12 +1,12 @@
-#include "async-collect.hh"
-#include "charptr-cast.hh"
-#include "worker.hh"
-#include "finally.hh"
-#include "substitution-goal.hh"
-#include "drv-output-substitution-goal.hh"
-#include "local-derivation-goal.hh"
-#include "signals.hh"
-#include "hook-instance.hh" // IWYU pragma: keep
+#include "lix/libutil/async-collect.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libstore/build/substitution-goal.hh"
+#include "lix/libstore/build/drv-output-substitution-goal.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/build/hook-instance.hh" // IWYU pragma: keep
 #include <boost/outcome/try.hpp>
 #include <kj/vector.h>
 

src/libstore/build/worker.hh

@@ -1,14 +1,14 @@
 #pragma once
 ///@file
 
-#include "async-semaphore.hh"
-#include "concepts.hh"
-#include "notifying-counter.hh"
-#include "types.hh"
-#include "lock.hh"
-#include "store-api.hh"
-#include "goal.hh"
-#include "realisation.hh"
+#include "lix/libutil/async-semaphore.hh"
+#include "lix/libutil/concepts.hh"
+#include "lix/libutil/notifying-counter.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/lock.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build/goal.hh"
+#include "lix/libstore/realisation.hh"
 
 #include <future>
 #include <kj/async-io.h>

src/libstore/builtins.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "derivations.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 

src/libstore/builtins/buildenv.cc

@@ -1,5 +1,5 @@
-#include "buildenv.hh"
-#include "strings.hh"
+#include "lix/libstore/builtins/buildenv.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/stat.h>
 #include <sys/types.h>

src/libstore/builtins/buildenv.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "derivations.hh"
-#include "store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 

src/libstore/builtins/fetchurl.cc

@@ -1,9 +1,9 @@
-#include "builtins.hh"
-#include "filetransfer.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "compression.hh"
-#include "strings.hh"
+#include "lix/libstore/builtins.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/builtins/unpack-channel.cc

@@ -1,5 +1,5 @@
-#include "builtins.hh"
-#include "tarfile.hh"
+#include "lix/libstore/builtins.hh"
+#include "lix/libutil/tarfile.hh"
 
 namespace nix {
 

src/libstore/common-protocol-impl.hh

@@ -8,8 +8,8 @@
  * contributing guide.
  */
 
-#include "common-protocol.hh"
-#include "length-prefixed-protocol-helper.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/length-prefixed-protocol-helper.hh"
 
 namespace nix {
 

src/libstore/common-protocol.cc

@@ -1,9 +1,9 @@
-#include "serialise.hh"
-#include "path-with-outputs.hh"
-#include "store-api.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "derivations.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh"
+#include "lix/libstore/derivations.hh"
 
 #include <nlohmann/json.hpp>
 

src/libstore/common-protocol.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "serialise.hh"
+#include "lix/libutil/serialise.hh"
 
 namespace nix {
 

src/libstore/content-address.cc

@@ -1,7 +1,7 @@
-#include "args.hh"
-#include "content-address.hh"
-#include "split.hh"
-#include "strings.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libstore/content-address.hh"
+#include "lix/libutil/split.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/content-address.hh

@@ -2,10 +2,10 @@
 ///@file
 
 #include <variant>
-#include "hash.hh"
-#include "path.hh"
-#include "comparator.hh"
-#include "variant-wrapper.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/variant-wrapper.hh"
 
 namespace nix {
 

src/libstore/crypto.cc

@@ -1,8 +1,8 @@
-#include "charptr-cast.hh"
-#include "crypto.hh"
-#include "file-system.hh"
-#include "globals.hh"
-#include "strings.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libstore/crypto.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sodium.h>
 

src/libstore/daemon.cc

@@ -1,19 +1,19 @@
-#include "daemon.hh"
-#include "monitor-fd.hh"
-#include "worker-protocol.hh"
-#include "worker-protocol-impl.hh"
-#include "build-result.hh" // IWYU pragma: keep
-#include "store-api.hh"
-#include "store-cast.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
-#include "indirect-root-store.hh"
-#include "path-with-outputs.hh"
-#include "finally.hh"
-#include "archive.hh"
-#include "derivations.hh"
-#include "strings.hh"
-#include "args.hh"
+#include "lix/libstore/daemon.hh"
+#include "lix/libutil/monitor-fd.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/worker-protocol-impl.hh"
+#include "lix/libstore/build-result.hh" // IWYU pragma: keep
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/store-cast.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/log-store.hh"
+#include "lix/libstore/indirect-root-store.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/args.hh"
 
 #include <sstream>
 

src/libstore/daemon.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "serialise.hh"
-#include "store-api.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix::daemon {
 

src/libstore/derivations.cc

@@ -1,13 +1,13 @@
-#include "derivations.hh"
-#include "downstream-placeholder.hh"
-#include "store-api.hh"
-#include "globals.hh"
-#include "types.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "json-utils.hh"
-#include "strings.hh"
-#include "backed-string-view.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/downstream-placeholder.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh"
+#include "lix/libutil/json-utils.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/backed-string-view.hh"
 
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>

src/libstore/derivations.hh

@@ -1,15 +1,15 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "types.hh"
-#include "hash.hh"
-#include "content-address.hh"
-#include "repair-flag.hh"
-#include "derived-path-map.hh"
-#include "sync.hh"
-#include "comparator.hh"
-#include "variant-wrapper.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/content-address.hh"
+#include "lix/libutil/repair-flag.hh"
+#include "lix/libstore/derived-path-map.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/variant-wrapper.hh"
 
 #include <map>
 #include <variant>

src/libstore/derived-path-map.cc

@@ -1,4 +1,4 @@
-#include "derived-path-map.hh"
+#include "lix/libstore/derived-path-map.hh"
 
 namespace nix {
 

src/libstore/derived-path-map.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "derived-path.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/derived-path.hh"
 
 namespace nix {
 

src/libstore/derived-path.cc

@@ -1,5 +1,5 @@
-#include "derived-path.hh"
-#include "store-api.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <nlohmann/json.hpp>
 

src/libstore/derived-path.hh

@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "config.hh"
-#include "path.hh"
-#include "outputs-spec.hh"
-#include "comparator.hh"
-#include "ref.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/ref.hh"
 
 #include <variant>
 

src/libstore/downstream-placeholder.cc

@@ -1,5 +1,5 @@
-#include "downstream-placeholder.hh"
-#include "derivations.hh"
+#include "lix/libstore/downstream-placeholder.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 

src/libstore/downstream-placeholder.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "hash.hh"
-#include "path.hh"
-#include "derived-path.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/derived-path.hh"
 
 namespace nix {
 

src/libstore/dummy-store.cc

@@ -1,5 +1,5 @@
-#include "dummy-store.hh"
-#include "store-api.hh"
+#include "lix/libstore/dummy-store.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 

src/libstore/export-import.cc

@@ -1,8 +1,8 @@
-#include "serialise.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh"
 
 #include <algorithm>
 

src/libstore/filetransfer.cc

@@ -1,10 +1,10 @@
-#include "filetransfer.hh"
-#include "namespaces.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "s3.hh"
-#include "signals.hh"
-#include "strings.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/namespaces.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/s3.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
 #include <cstddef>
 
 #include <cstdio>

src/libstore/filetransfer.hh

@@ -1,12 +1,12 @@
 #pragma once
 ///@file
 
-#include "box_ptr.hh"
-#include "ref.hh"
-#include "logging.hh"
-#include "serialise.hh"
-#include "types.hh"
-#include "config.hh"
+#include "lix/libutil/box_ptr.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/config.hh"
 
 #include <string>
 #include <future>

src/libstore/fs-accessor.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 

src/libstore/gc-store.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 
 namespace nix {

src/libstore/gc.cc

@@ -1,11 +1,11 @@
-#include "globals.hh"
-#include "local-store.hh"
-#include "pathlocks.hh"
-#include "processes.hh"
-#include "signals.hh"
-#include "finally.hh"
-#include "unix-domain-socket.hh"
-#include "strings.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/unix-domain-socket.hh"
+#include "lix/libutil/strings.hh"
 
 #include <queue>
 #include <regex>

src/libstore/globals.cc

@@ -1,13 +1,13 @@
-#include "environment-variables.hh"
-#include "globals.hh"
-#include "file-system.hh"
-#include "logging.hh"
-#include "strings.hh"
-#include "users.hh"
-#include "args.hh"
-#include "abstract-setting-to-json.hh"
-#include "compute-levels.hh"
-#include "current-process.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/abstract-setting-to-json.hh"
+#include "lix/libutil/compute-levels.hh"
+#include "lix/libutil/current-process.hh"
 
 #include <algorithm>
 #include <mutex>
@@ -25,23 +25,23 @@
 #include <dlfcn.h>
 #endif
 
-#include "config-impl.hh"
+#include "lix/libutil/config-impl.hh"
 
 #ifdef __APPLE__
-#include "processes.hh"
+#include "lix/libutil/processes.hh"
 #include <curl/curl.h>
 #include <sys/sysctl.h>
 #endif
 
 // All built-in store implementations.
-#include "dummy-store.hh"
-#include "http-binary-cache-store.hh"
-#include "legacy-ssh-store.hh"
-#include "local-binary-cache-store.hh"
-#include "local-store.hh"
-#include "s3-binary-cache-store.hh"
-#include "ssh-store.hh"
-#include "uds-remote-store.hh"
+#include "lix/libstore/dummy-store.hh"
+#include "lix/libstore/http-binary-cache-store.hh"
+#include "lix/libstore/legacy-ssh-store.hh"
+#include "lix/libstore/local-binary-cache-store.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/s3-binary-cache-store.hh"
+#include "lix/libstore/ssh-store.hh"
+#include "lix/libstore/uds-remote-store.hh"
 
 namespace nix {
 

src/libstore/globals.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "environment-variables.hh"
-#include "types.hh"
-#include "config.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/config.hh"
 
 #include <map>
 #include <limits>

src/libstore/http-binary-cache-store.cc

@@ -1,8 +1,8 @@
-#include "http-binary-cache-store.hh"
-#include "binary-cache-store.hh"
-#include "filetransfer.hh"
-#include "globals.hh"
-#include "nar-info-disk-cache.hh"
+#include "lix/libstore/http-binary-cache-store.hh"
+#include "lix/libstore/binary-cache-store.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
 
 namespace nix {
 

src/libstore/indirect-root-store.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "local-fs-store.hh"
+#include "lix/libstore/local-fs-store.hh"
 
 namespace nix {
 

src/libstore/legacy-ssh-store.cc

@@ -1,16 +1,16 @@
-#include "legacy-ssh-store.hh"
-#include "archive.hh"
-#include "pool.hh"
-#include "remote-store.hh"
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
-#include "build-result.hh"
-#include "store-api.hh"
-#include "path-with-outputs.hh"
-#include "ssh.hh"
-#include "ssh-store.hh"
-#include "strings.hh"
-#include "derivations.hh"
+#include "lix/libstore/legacy-ssh-store.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libutil/pool.hh"
+#include "lix/libstore/remote-store.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libstore/build-result.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/ssh.hh"
+#include "lix/libstore/ssh-store.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 

src/libstore/length-prefixed-protocol-helper.hh

@@ -6,8 +6,8 @@
  * Used by both the Worker and Serve protocols.
  */
 
-#include "types.hh"
-#include "serialise.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/serialise.hh"
 
 namespace nix {
 

src/libstore/local-binary-cache-store.cc

@@ -1,7 +1,7 @@
-#include "local-binary-cache-store.hh"
-#include "binary-cache-store.hh"
-#include "globals.hh"
-#include "nar-info-disk-cache.hh"
+#include "lix/libstore/local-binary-cache-store.hh"
+#include "lix/libstore/binary-cache-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
 
 #include <atomic>
 

src/libstore/local-fs-store.cc

@@ -1,10 +1,10 @@
-#include "archive.hh"
-#include "fs-accessor.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "globals.hh"
-#include "compression.hh"
-#include "derivations.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libstore/derivations.hh"
 
 namespace nix {
 

src/libstore/local-fs-store.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/log-store.hh"
 
 namespace nix {
 

src/libstore/local-store.cc

@@ -1,17 +1,17 @@
-#include "local-store.hh"
-#include "globals.hh"
-#include "archive.hh"
-#include "pathlocks.hh"
-#include "temporary-dir.hh"
-#include "worker-protocol.hh"
-#include "derivations.hh"
-#include "nar-info.hh"
-#include "references.hh"
-#include "topo-sort.hh"
-#include "signals.hh"
-#include "finally.hh"
-#include "compression.hh"
-#include "strings.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libstore/temporary-dir.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/topo-sort.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libutil/strings.hh"
 
 #include <algorithm>
 #include <cstring>

src/libstore/local-store.hh

@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "sqlite.hh"
+#include "lix/libstore/sqlite.hh"
 
-#include "store-api.hh"
-#include "indirect-root-store.hh"
-#include "sync.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/indirect-root-store.hh"
+#include "lix/libutil/sync.hh"
 
 #include <chrono>
 #include <future>

src/libstore/lock.cc

@@ -1,8 +1,8 @@
-#include "lock.hh"
-#include "logging.hh"
-#include "file-system.hh"
-#include "globals.hh"
-#include "pathlocks.hh"
+#include "lix/libstore/lock.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/pathlocks.hh"
 
 #include <pwd.h>
 #include <grp.h>

src/libstore/log-store.cc

@@ -1,4 +1,4 @@
-#include "log-store.hh"
+#include "lix/libstore/log-store.hh"
 
 namespace nix {
 

src/libstore/log-store.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 
 namespace nix {

src/libstore/machines.cc

@@ -1,7 +1,7 @@
-#include "machines.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "strings.hh"
+#include "lix/libstore/machines.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/strings.hh"
 
 #include <algorithm>
 

src/libstore/machines.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "ref.hh"
+#include "lix/libutil/ref.hh"
 #include <set>
 #include <vector>
 

src/libstore/make-content-addressed.cc

@@ -1,6 +1,6 @@
-#include "make-content-addressed.hh"
-#include "references.hh"
-#include "strings.hh"
+#include "lix/libstore/make-content-addressed.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/make-content-addressed.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 

src/libstore/misc.cc

@@ -1,12 +1,12 @@
-#include "derivations.hh"
-#include "parsed-derivations.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "thread-pool.hh"
-#include "topo-sort.hh"
-#include "closure.hh"
-#include "filetransfer.hh"
-#include "strings.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/parsed-derivations.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "lix/libutil/topo-sort.hh"
+#include "lix/libutil/closure.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/names.cc

@@ -1,5 +1,5 @@
-#include "names.hh"
-#include "strings.hh"
+#include "lix/libstore/names.hh"
+#include "lix/libutil/strings.hh"
 
 #include <regex>
 

src/libstore/names.hh

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 

src/libstore/nar-accessor.cc

@@ -1,5 +1,5 @@
-#include "nar-accessor.hh"
-#include "archive.hh"
+#include "lix/libstore/nar-accessor.hh"
+#include "lix/libutil/archive.hh"
 
 #include <map>
 #include <memory>

src/libstore/nar-accessor.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "fs-accessor.hh"
-#include "ref.hh"
+#include "lix/libstore/fs-accessor.hh"
+#include "lix/libutil/ref.hh"
 
 #include <functional>
 

src/libstore/nar-info-disk-cache.cc

@@ -1,10 +1,10 @@
-#include "nar-info-disk-cache.hh"
-#include "logging.hh"
-#include "sync.hh"
-#include "sqlite.hh"
-#include "globals.hh"
-#include "users.hh"
-#include "strings.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libstore/sqlite.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sqlite3.h>
 #include <nlohmann/json.hpp>

src/libstore/nar-info-disk-cache.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "ref.hh"
-#include "nar-info.hh"
-#include "realisation.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libstore/realisation.hh"
 
 namespace nix {
 

src/libstore/nar-info.cc

@@ -1,6 +1,6 @@
-#include "strings.hh"
-#include "nar-info.hh"
-#include "store-api.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libstore/nar-info.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 

src/libstore/nar-info.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "hash.hh"
-#include "path-info.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/path-info.hh"
 
 namespace nix {
 

src/libstore/optimise-store.cc

@@ -1,7 +1,7 @@
-#include "local-store.hh"
-#include "globals.hh"
-#include "signals.hh"
-#include "strings.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
 
 #include <cstring>
 #include <sys/types.h>

src/libstore/outputs-spec.cc

@@ -1,10 +1,10 @@
 #include <regex>
 #include <nlohmann/json.hpp>
 
-#include "regex-combinators.hh"
-#include "outputs-spec.hh"
-#include "path-regex.hh"
-#include "strings.hh"
+#include "lix/libutil/regex-combinators.hh"
+#include "lix/libstore/outputs-spec.hh"
+#include "lix/libstore/path-regex.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/outputs-spec.hh

@@ -6,10 +6,10 @@
 #include <set>
 #include <variant>
 
-#include "comparator.hh"
-#include "json-impls.hh"
-#include "comparator.hh"
-#include "variant-wrapper.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/json-impls.hh"
+#include "lix/libutil/comparator.hh"
+#include "lix/libutil/variant-wrapper.hh"
 
 namespace nix {
 

src/libstore/parsed-derivations.cc

@@ -1,5 +1,5 @@
-#include "parsed-derivations.hh"
-#include "strings.hh"
+#include "lix/libstore/parsed-derivations.hh"
+#include "lix/libutil/strings.hh"
 
 #include <nlohmann/json.hpp>
 #include <regex>

src/libstore/parsed-derivations.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "derivations.hh"
-#include "store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <nlohmann/json_fwd.hpp>
 

src/libstore/path-info.cc

@@ -1,6 +1,6 @@
-#include "path-info.hh"
-#include "store-api.hh"
-#include "strings.hh"
+#include "lix/libstore/path-info.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/path-info.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "crypto.hh"
-#include "path.hh"
-#include "hash.hh"
-#include "content-address.hh"
+#include "lix/libstore/crypto.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libstore/content-address.hh"
 
 #include <string>
 #include <optional>

src/libstore/path-references.cc

@@ -1,6 +1,6 @@
-#include "path-references.hh"
-#include "hash.hh"
-#include "archive.hh"
+#include "lix/libstore/path-references.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libutil/archive.hh"
 
 #include <map>
 

src/libstore/path-references.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "references.hh"
-#include "path.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libstore/path.hh"
 
 namespace nix {
 

src/libstore/path-with-outputs.cc

@@ -1,6 +1,6 @@
-#include "path-with-outputs.hh"
-#include "store-api.hh"
-#include "strings.hh"
+#include "lix/libstore/path-with-outputs.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libstore/path-with-outputs.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "derived-path.hh"
+#include "lix/libstore/path.hh"
+#include "lix/libstore/derived-path.hh"
 
 namespace nix {
 

src/libstore/path.cc

@@ -1,4 +1,4 @@
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <sodium.h>
 

src/libstore/path.hh

@@ -4,7 +4,7 @@
 #include <string_view>
 #include <string>
 
-#include "types.hh" // IWYU pragma: keep
+#include "lix/libutil/types.hh" // IWYU pragma: keep
 
 namespace nix {
 

src/libstore/pathlocks.cc

@@ -1,6 +1,6 @@
-#include "pathlocks.hh"
-#include "logging.hh"
-#include "signals.hh"
+#include "lix/libstore/pathlocks.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/signals.hh"
 
 #include <cerrno>
 

src/libstore/pathlocks.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "error.hh"
-#include "file-descriptor.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-descriptor.hh"
 
 namespace nix {
 

src/libstore/platform.cc

@@ -1,8 +1,8 @@
-#include "local-store.hh"
-#include "build/local-derivation-goal.hh"
+#include "lix/libstore/local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
 
 #if __linux__
-#include "platform/linux.hh"
+#include "lix/libstore/platform/linux.hh"
 #elif __APPLE__
 #include "platform/darwin.hh"
 #elif __FreeBSD__

src/libstore/platform/darwin.cc

@@ -1,8 +1,8 @@
-#include "gc-store.hh"
-#include "signals.hh"
-#include "platform/darwin.hh"
-#include "regex.hh"
-#include "strings.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/platform/darwin.hh"
+#include "lix/libutil/regex.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/proc_info.h>
 #include <sys/sysctl.h>

src/libstore/platform/darwin.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "build/local-derivation-goal.hh"
-#include "gc-store.hh"
-#include "local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/local-store.hh"
 
 namespace nix {
 

src/libstore/platform/fallback.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "build/local-derivation-goal.hh"
-#include "local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libstore/local-store.hh"
 
 namespace nix {
 

src/libstore/platform/freebsd.cc

@@ -1,6 +1,6 @@
-#include "platform/freebsd.hh"
-#include "regex.hh"
-#include "strings.hh"
+#include "lix/libstore/platform/freebsd.hh"
+#include "lix/libutil/regex.hh"
+#include "lix/libutil/strings.hh"
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>

src/libstore/platform/freebsd.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "build/local-derivation-goal.hh"
-#include "gc-store.hh"
-#include "local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/local-store.hh"
 
 namespace nix {
 

src/libstore/platform/linux.cc

@@ -1,11 +1,11 @@
-#include "build/worker.hh"
-#include "cgroup.hh"
-#include "finally.hh"
-#include "gc-store.hh"
-#include "signals.hh"
-#include "platform/linux.hh"
-#include "regex.hh"
-#include "strings.hh"
+#include "lix/libstore/build/worker.hh"
+#include "lix/libutil/cgroup.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/platform/linux.hh"
+#include "lix/libutil/regex.hh"
+#include "lix/libutil/strings.hh"
 
 #include <grp.h>
 #include <regex>

src/libstore/platform/linux.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "build/local-derivation-goal.hh"
-#include "gc-store.hh"
-#include "local-store.hh"
+#include "lix/libstore/build/local-derivation-goal.hh"
+#include "lix/libstore/gc-store.hh"
+#include "lix/libstore/local-store.hh"
 
 namespace nix {
 

src/libstore/profiles.cc

@@ -1,7 +1,7 @@
-#include "profiles.hh"
-#include "local-fs-store.hh"
-#include "users.hh"
-#include "strings.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libstore/local-fs-store.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>