Expose the nix component in header include paths

For example, instead of doing

    #include "nix/store-config.hh"
    #include "nix/derived-path.hh"

Now do

    #include "nix/store/config.hh"
    #include "nix/store/derived-path.hh"

This was originally planned in the issue, and also recent requested by
Eelco.

Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.

Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!

Progress on #7876

src/libstore/binary-cache-store.cc

@@ -1,18 +1,18 @@
-#include "nix/archive.hh"
-#include "nix/binary-cache-store.hh"
-#include "nix/compression.hh"
-#include "nix/derivations.hh"
-#include "nix/source-accessor.hh"
-#include "nix/globals.hh"
-#include "nix/nar-info.hh"
-#include "nix/sync.hh"
-#include "nix/remote-fs-accessor.hh"
-#include "nix/nar-info-disk-cache.hh"
-#include "nix/nar-accessor.hh"
-#include "nix/thread-pool.hh"
-#include "nix/callback.hh"
-#include "nix/signals.hh"
-#include "nix/archive.hh"
+#include "nix/util/archive.hh"
+#include "nix/store/binary-cache-store.hh"
+#include "nix/util/compression.hh"
+#include "nix/store/derivations.hh"
+#include "nix/util/source-accessor.hh"
+#include "nix/store/globals.hh"
+#include "nix/store/nar-info.hh"
+#include "nix/util/sync.hh"
+#include "nix/store/remote-fs-accessor.hh"
+#include "nix/store/nar-info-disk-cache.hh"
+#include "nix/store/nar-accessor.hh"
+#include "nix/util/thread-pool.hh"
+#include "nix/util/callback.hh"
+#include "nix/util/signals.hh"
+#include "nix/util/archive.hh"
 
 #include <chrono>
 #include <future>

src/libstore/build-result.cc

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

src/libstore/build/derivation-goal.cc

@@ -1,22 +1,22 @@
-#include "nix/build/derivation-goal.hh"
+#include "nix/store/build/derivation-goal.hh"
 #ifndef _WIN32 // TODO enable build hook on Windows
-#  include "nix/build/hook-instance.hh"
+#  include "nix/store/build/hook-instance.hh"
 #endif
-#include "nix/processes.hh"
-#include "nix/config-global.hh"
-#include "nix/build/worker.hh"
-#include "nix/builtins.hh"
-#include "nix/builtins/buildenv.hh"
-#include "nix/references.hh"
-#include "nix/finally.hh"
-#include "nix/util.hh"
-#include "nix/archive.hh"
-#include "nix/compression.hh"
-#include "nix/common-protocol.hh"
-#include "nix/common-protocol-impl.hh"
-#include "nix/topo-sort.hh"
-#include "nix/callback.hh"
-#include "nix/local-store.hh" // TODO remove, along with remaining downcasts
+#include "nix/util/processes.hh"
+#include "nix/util/config-global.hh"
+#include "nix/store/build/worker.hh"
+#include "nix/store/builtins.hh"
+#include "nix/store/builtins/buildenv.hh"
+#include "nix/util/references.hh"
+#include "nix/util/finally.hh"
+#include "nix/util/util.hh"
+#include "nix/util/archive.hh"
+#include "nix/util/compression.hh"
+#include "nix/store/common-protocol.hh"
+#include "nix/store/common-protocol-impl.hh"
+#include "nix/util/topo-sort.hh"
+#include "nix/util/callback.hh"
+#include "nix/store/local-store.hh" // TODO remove, along with remaining downcasts
 
 #include <regex>
 #include <queue>
@@ -32,7 +32,7 @@
 
 #include <nlohmann/json.hpp>
 
-#include "nix/strings.hh"
+#include "nix/util/strings.hh"
 
 namespace nix {
 

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

@@ -1,8 +1,8 @@
-#include "nix/build/drv-output-substitution-goal.hh"
-#include "nix/finally.hh"
-#include "nix/build/worker.hh"
-#include "nix/build/substitution-goal.hh"
-#include "nix/callback.hh"
+#include "nix/store/build/drv-output-substitution-goal.hh"
+#include "nix/util/finally.hh"
+#include "nix/store/build/worker.hh"
+#include "nix/store/build/substitution-goal.hh"
+#include "nix/util/callback.hh"
 
 namespace nix {
 

src/libstore/build/entry-points.cc

@@ -1,10 +1,10 @@
-#include "nix/build/worker.hh"
-#include "nix/build/substitution-goal.hh"
+#include "nix/store/build/worker.hh"
+#include "nix/store/build/substitution-goal.hh"
 #ifndef _WIN32 // TODO Enable building on Windows
-#  include "nix/build/derivation-goal.hh"
+#  include "nix/store/build/derivation-goal.hh"
 #endif
-#include "nix/local-store.hh"
-#include "nix/strings.hh"
+#include "nix/store/local-store.hh"
+#include "nix/util/strings.hh"
 
 namespace nix {
 

src/libstore/build/goal.cc

@@ -1,5 +1,5 @@
-#include "nix/build/goal.hh"
-#include "nix/build/worker.hh"
+#include "nix/store/build/goal.hh"
+#include "nix/store/build/worker.hh"
 
 namespace nix {
 

src/libstore/build/substitution-goal.cc

@@ -1,8 +1,8 @@
-#include "nix/build/worker.hh"
-#include "nix/build/substitution-goal.hh"
-#include "nix/nar-info.hh"
-#include "nix/finally.hh"
-#include "nix/signals.hh"
+#include "nix/store/build/worker.hh"
+#include "nix/store/build/substitution-goal.hh"
+#include "nix/store/nar-info.hh"
+#include "nix/util/finally.hh"
+#include "nix/util/signals.hh"
 #include <coroutine>
 
 namespace nix {

src/libstore/build/worker.cc

@@ -1,14 +1,14 @@
-#include "nix/local-store.hh"
-#include "nix/machines.hh"
-#include "nix/build/worker.hh"
-#include "nix/build/substitution-goal.hh"
-#include "nix/build/drv-output-substitution-goal.hh"
-#include "nix/build/derivation-goal.hh"
+#include "nix/store/local-store.hh"
+#include "nix/store/machines.hh"
+#include "nix/store/build/worker.hh"
+#include "nix/store/build/substitution-goal.hh"
+#include "nix/store/build/drv-output-substitution-goal.hh"
+#include "nix/store/build/derivation-goal.hh"
 #ifndef _WIN32 // TODO Enable building on Windows
-#  include "nix/build/local-derivation-goal.hh"
-#  include "nix/build/hook-instance.hh"
+#  include "nix/store/build/local-derivation-goal.hh"
+#  include "nix/store/build/hook-instance.hh"
 #endif
-#include "nix/signals.hh"
+#include "nix/util/signals.hh"
 
 namespace nix {
 

src/libstore/builtins/buildenv.cc

@@ -1,6 +1,6 @@
-#include "nix/builtins/buildenv.hh"
-#include "nix/derivations.hh"
-#include "nix/signals.hh"
+#include "nix/store/builtins/buildenv.hh"
+#include "nix/store/derivations.hh"
+#include "nix/util/signals.hh"
 
 #include <sys/stat.h>
 #include <sys/types.h>

src/libstore/builtins/fetchurl.cc

@@ -1,8 +1,8 @@
-#include "nix/builtins.hh"
-#include "nix/filetransfer.hh"
-#include "nix/store-api.hh"
-#include "nix/archive.hh"
-#include "nix/compression.hh"
+#include "nix/store/builtins.hh"
+#include "nix/store/filetransfer.hh"
+#include "nix/store/store-api.hh"
+#include "nix/util/archive.hh"
+#include "nix/util/compression.hh"
 
 namespace nix {
 

src/libstore/builtins/unpack-channel.cc

@@ -1,5 +1,5 @@
-#include "nix/builtins.hh"
-#include "nix/tarfile.hh"
+#include "nix/store/builtins.hh"
+#include "nix/util/tarfile.hh"
 
 namespace nix {
 

src/libstore/common-protocol.cc

@@ -1,11 +1,11 @@
-#include "nix/serialise.hh"
-#include "nix/path-with-outputs.hh"
-#include "nix/store-api.hh"
-#include "nix/build-result.hh"
-#include "nix/common-protocol.hh"
-#include "nix/common-protocol-impl.hh"
-#include "nix/archive.hh"
-#include "nix/derivations.hh"
+#include "nix/util/serialise.hh"
+#include "nix/store/path-with-outputs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/build-result.hh"
+#include "nix/store/common-protocol.hh"
+#include "nix/store/common-protocol-impl.hh"
+#include "nix/util/archive.hh"
+#include "nix/store/derivations.hh"
 
 #include <nlohmann/json.hpp>
 

src/libstore/common-ssh-store-config.cc

@@ -1,7 +1,7 @@
 #include <regex>
 
-#include "nix/common-ssh-store-config.hh"
-#include "nix/ssh.hh"
+#include "nix/store/common-ssh-store-config.hh"
+#include "nix/store/ssh.hh"
 
 namespace nix {
 

src/libstore/content-address.cc

@@ -1,6 +1,6 @@
-#include "nix/args.hh"
-#include "nix/content-address.hh"
-#include "nix/split.hh"
+#include "nix/util/args.hh"
+#include "nix/store/content-address.hh"
+#include "nix/util/split.hh"
 
 namespace nix {
 

src/libstore/daemon.cc

@@ -1,23 +1,23 @@
-#include "nix/daemon.hh"
-#include "nix/signals.hh"
-#include "nix/worker-protocol.hh"
-#include "nix/worker-protocol-connection.hh"
-#include "nix/worker-protocol-impl.hh"
-#include "nix/build-result.hh"
-#include "nix/store-api.hh"
-#include "nix/store-cast.hh"
-#include "nix/gc-store.hh"
-#include "nix/log-store.hh"
-#include "nix/indirect-root-store.hh"
-#include "nix/path-with-outputs.hh"
-#include "nix/finally.hh"
-#include "nix/archive.hh"
-#include "nix/derivations.hh"
-#include "nix/args.hh"
-#include "nix/git.hh"
+#include "nix/store/daemon.hh"
+#include "nix/util/signals.hh"
+#include "nix/store/worker-protocol.hh"
+#include "nix/store/worker-protocol-connection.hh"
+#include "nix/store/worker-protocol-impl.hh"
+#include "nix/store/build-result.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/store-cast.hh"
+#include "nix/store/gc-store.hh"
+#include "nix/store/log-store.hh"
+#include "nix/store/indirect-root-store.hh"
+#include "nix/store/path-with-outputs.hh"
+#include "nix/util/finally.hh"
+#include "nix/util/archive.hh"
+#include "nix/store/derivations.hh"
+#include "nix/util/args.hh"
+#include "nix/util/git.hh"
 
 #ifndef _WIN32 // TODO need graceful async exit support on Windows?
-# include "nix/monitor-fd.hh"
+# include "nix/util/monitor-fd.hh"
 #endif
 
 #include <sstream>

src/libstore/derivation-options.cc

@@ -1,8 +1,8 @@
-#include "nix/derivation-options.hh"
-#include "nix/json-utils.hh"
-#include "nix/parsed-derivations.hh"
-#include "nix/types.hh"
-#include "nix/util.hh"
+#include "nix/store/derivation-options.hh"
+#include "nix/util/json-utils.hh"
+#include "nix/store/parsed-derivations.hh"
+#include "nix/util/types.hh"
+#include "nix/util/util.hh"
 #include <optional>
 #include <string>
 #include <variant>

src/libstore/derivations.cc

@@ -1,14 +1,14 @@
-#include "nix/derivations.hh"
-#include "nix/downstream-placeholder.hh"
-#include "nix/store-api.hh"
-#include "nix/globals.hh"
-#include "nix/types.hh"
-#include "nix/util.hh"
-#include "nix/split.hh"
-#include "nix/common-protocol.hh"
-#include "nix/common-protocol-impl.hh"
-#include "nix/strings-inline.hh"
-#include "nix/json-utils.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/downstream-placeholder.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/globals.hh"
+#include "nix/util/types.hh"
+#include "nix/util/util.hh"
+#include "nix/util/split.hh"
+#include "nix/store/common-protocol.hh"
+#include "nix/store/common-protocol-impl.hh"
+#include "nix/util/strings-inline.hh"
+#include "nix/util/json-utils.hh"
 
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>

src/libstore/derived-path-map.cc

@@ -1,5 +1,5 @@
-#include "nix/derived-path-map.hh"
-#include "nix/util.hh"
+#include "nix/store/derived-path-map.hh"
+#include "nix/util/util.hh"
 
 namespace nix {
 

src/libstore/derived-path.cc

@@ -1,7 +1,7 @@
-#include "nix/derived-path.hh"
-#include "nix/derivations.hh"
-#include "nix/store-api.hh"
-#include "nix/comparator.hh"
+#include "nix/store/derived-path.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/store-api.hh"
+#include "nix/util/comparator.hh"
 
 #include <nlohmann/json.hpp>
 

src/libstore/downstream-placeholder.cc

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

src/libstore/dummy-store.cc

@@ -1,5 +1,5 @@
-#include "nix/store-api.hh"
-#include "nix/callback.hh"
+#include "nix/store/store-api.hh"
+#include "nix/util/callback.hh"
 
 namespace nix {
 

src/libstore/export-import.cc

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

src/libstore/filetransfer.cc

@@ -1,19 +1,19 @@
-#include "nix/filetransfer.hh"
-#include "nix/globals.hh"
-#include "nix/config-global.hh"
-#include "nix/store-api.hh"
-#include "nix/s3.hh"
-#include "nix/compression.hh"
-#include "nix/finally.hh"
-#include "nix/callback.hh"
-#include "nix/signals.hh"
+#include "nix/store/filetransfer.hh"
+#include "nix/store/globals.hh"
+#include "nix/util/config-global.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/s3.hh"
+#include "nix/util/compression.hh"
+#include "nix/util/finally.hh"
+#include "nix/util/callback.hh"
+#include "nix/util/signals.hh"
 
 #if ENABLE_S3
 #include <aws/core/client/ClientConfiguration.h>
 #endif
 
 #if __linux__
-# include "nix/namespaces.hh"
+# include "nix/util/namespaces.hh"
 #endif
 
 #include <unistd.h>

src/libstore/gc.cc

@@ -1,16 +1,16 @@
-#include "nix/derivations.hh"
-#include "nix/globals.hh"
-#include "nix/local-store.hh"
-#include "nix/finally.hh"
-#include "nix/unix-domain-socket.hh"
-#include "nix/signals.hh"
-#include "nix/posix-fs-canonicalise.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/globals.hh"
+#include "nix/store/local-store.hh"
+#include "nix/util/finally.hh"
+#include "nix/util/unix-domain-socket.hh"
+#include "nix/util/signals.hh"
+#include "nix/store/posix-fs-canonicalise.hh"
 
 #include "store-config-private.hh"
 
 #if !defined(__linux__)
 // For shelling out to lsof
-#  include "nix/processes.hh"
+#  include "nix/util/processes.hh"
 #endif
 
 #include <functional>

src/libstore/globals.cc

@@ -1,12 +1,11 @@
-#include "nix/globals.hh"
-#include "nix/config-global.hh"
-#include "nix/current-process.hh"
-#include "nix/archive.hh"
-#include "nix/args.hh"
-#include "nix/abstract-setting-to-json.hh"
-#include "nix/compute-levels.hh"
-#include "nix/signals.hh"
-#include "nix/strings.hh"
+#include "nix/store/globals.hh"
+#include "nix/util/config-global.hh"
+#include "nix/util/current-process.hh"
+#include "nix/util/archive.hh"
+#include "nix/util/args.hh"
+#include "nix/util/abstract-setting-to-json.hh"
+#include "nix/util/compute-levels.hh"
+#include "nix/util/signals.hh"
 
 #include <algorithm>
 #include <map>
@@ -27,10 +26,10 @@
 #endif
 
 #if __APPLE__
-# include "nix/processes.hh"
+# include "nix/util/processes.hh"
 #endif
 
-#include "nix/config-impl.hh"
+#include "nix/util/config-impl.hh"
 
 #ifdef __APPLE__
 #include <sys/sysctl.h>
@@ -38,7 +37,6 @@
 
 #include "store-config-private.hh"
 
-
 namespace nix {
 
 

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

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

src/libstore/include/nix/store/binary-cache-store.hh

@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "nix/signature/local-keys.hh"
-#include "nix/store-api.hh"
-#include "nix/log-store.hh"
+#include "nix/util/signature/local-keys.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/log-store.hh"
 
-#include "nix/pool.hh"
+#include "nix/util/pool.hh"
 
 #include <atomic>
 

src/libstore/include/nix/store/build-result.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/realisation.hh"
-#include "nix/derived-path.hh"
+#include "nix/store/realisation.hh"
+#include "nix/store/derived-path.hh"
 
 #include <string>
 #include <chrono>

src/libstore/include/nix/store/build/derivation-goal.hh

@@ -1,15 +1,15 @@
 #pragma once
 ///@file
 
-#include "nix/parsed-derivations.hh"
-#include "nix/derivation-options.hh"
+#include "nix/store/parsed-derivations.hh"
+#include "nix/store/derivation-options.hh"
 #ifndef _WIN32
-#  include "nix/user-lock.hh"
+#  include "nix/store/user-lock.hh"
 #endif
-#include "nix/outputs-spec.hh"
-#include "nix/store-api.hh"
-#include "nix/pathlocks.hh"
-#include "nix/build/goal.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/pathlocks.hh"
+#include "nix/store/build/goal.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/build/drv-output-substitution-goal.hh

@@ -4,10 +4,10 @@
 #include <thread>
 #include <future>
 
-#include "nix/store-api.hh"
-#include "nix/build/goal.hh"
-#include "nix/realisation.hh"
-#include "nix/muxable-pipe.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/build/goal.hh"
+#include "nix/store/realisation.hh"
+#include "nix/util/muxable-pipe.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/build/goal.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/store-api.hh"
-#include "nix/build-result.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/build-result.hh"
 
 #include <coroutine>
 

src/libstore/include/nix/store/build/substitution-goal.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "nix/build/worker.hh"
-#include "nix/store-api.hh"
-#include "nix/build/goal.hh"
-#include "nix/muxable-pipe.hh"
+#include "nix/store/build/worker.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/build/goal.hh"
+#include "nix/util/muxable-pipe.hh"
 #include <coroutine>
 #include <future>
 #include <source_location>

src/libstore/include/nix/store/build/worker.hh

@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "nix/types.hh"
-#include "nix/store-api.hh"
-#include "nix/build/goal.hh"
-#include "nix/realisation.hh"
-#include "nix/muxable-pipe.hh"
+#include "nix/util/types.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/build/goal.hh"
+#include "nix/store/realisation.hh"
+#include "nix/util/muxable-pipe.hh"
 
 #include <future>
 #include <thread>

src/libstore/include/nix/store/builtins.hh

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

src/libstore/include/nix/store/builtins/buildenv.hh

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

src/libstore/include/nix/store/common-protocol-impl.hh

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

src/libstore/include/nix/store/common-protocol.hh

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

src/libstore/include/nix/store/common-ssh-store-config.hh

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

src/libstore/include/nix/store/content-address.hh

@@ -2,10 +2,10 @@
 ///@file
 
 #include <variant>
-#include "nix/hash.hh"
-#include "nix/path.hh"
-#include "nix/file-content-address.hh"
-#include "nix/variant-wrapper.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/path.hh"
+#include "nix/util/file-content-address.hh"
+#include "nix/util/variant-wrapper.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/daemon.hh

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

src/libstore/include/nix/store/derivation-options.hh

@@ -6,8 +6,8 @@
 #include <optional>
 #include <variant>
 
-#include "nix/types.hh"
-#include "nix/json-impls.hh"
+#include "nix/util/types.hh"
+#include "nix/util/json-impls.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/derivations.hh

@@ -1,14 +1,14 @@
 #pragma once
 ///@file
 
-#include "nix/path.hh"
-#include "nix/types.hh"
-#include "nix/hash.hh"
-#include "nix/content-address.hh"
-#include "nix/repair-flag.hh"
-#include "nix/derived-path-map.hh"
-#include "nix/sync.hh"
-#include "nix/variant-wrapper.hh"
+#include "nix/store/path.hh"
+#include "nix/util/types.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/content-address.hh"
+#include "nix/util/repair-flag.hh"
+#include "nix/store/derived-path-map.hh"
+#include "nix/util/sync.hh"
+#include "nix/util/variant-wrapper.hh"
 
 #include <map>
 #include <variant>

src/libstore/include/nix/store/derived-path-map.hh

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

src/libstore/include/nix/store/derived-path.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "nix/path.hh"
-#include "nix/outputs-spec.hh"
-#include "nix/config.hh"
-#include "nix/ref.hh"
+#include "nix/store/path.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/configuration.hh"
+#include "nix/util/ref.hh"
 
 #include <variant>
 

src/libstore/include/nix/store/downstream-placeholder.hh

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

src/libstore/include/nix/store/filetransfer.hh

@@ -4,11 +4,11 @@
 #include <string>
 #include <future>
 
-#include "nix/logging.hh"
-#include "nix/types.hh"
-#include "nix/ref.hh"
-#include "nix/config.hh"
-#include "nix/serialise.hh"
+#include "nix/util/logging.hh"
+#include "nix/util/types.hh"
+#include "nix/util/ref.hh"
+#include "nix/util/configuration.hh"
+#include "nix/util/serialise.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/gc-store.hh

@@ -3,7 +3,7 @@
 
 #include <unordered_set>
 
-#include "nix/store-api.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/globals.hh

@@ -6,13 +6,13 @@
 
 #include <sys/types.h>
 
-#include "nix/types.hh"
-#include "nix/config.hh"
-#include "nix/environment-variables.hh"
-#include "nix/experimental-features.hh"
-#include "nix/users.hh"
+#include "nix/util/types.hh"
+#include "nix/util/configuration.hh"
+#include "nix/util/environment-variables.hh"
+#include "nix/util/experimental-features.hh"
+#include "nix/util/users.hh"
 
-#include "nix/store-config.hh"
+#include "nix/store/config.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/http-binary-cache-store.hh

@@ -1,4 +1,4 @@
-#include "nix/binary-cache-store.hh"
+#include "nix/store/binary-cache-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/indirect-root-store.hh

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

src/libstore/include/nix/store/keys.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/signature/local-keys.hh"
+#include "nix/util/signature/local-keys.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/legacy-ssh-store.hh

@@ -1,12 +1,12 @@
 #pragma once
 ///@file
 
-#include "nix/common-ssh-store-config.hh"
-#include "nix/store-api.hh"
-#include "nix/ssh.hh"
-#include "nix/callback.hh"
-#include "nix/pool.hh"
-#include "nix/serve-protocol.hh"
+#include "nix/store/common-ssh-store-config.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/ssh.hh"
+#include "nix/util/callback.hh"
+#include "nix/util/pool.hh"
+#include "nix/store/serve-protocol.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/length-prefixed-protocol-helper.hh

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

src/libstore/include/nix/store/local-binary-cache-store.hh

@@ -1,4 +1,4 @@
-#include "nix/binary-cache-store.hh"
+#include "nix/store/binary-cache-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/local-fs-store.hh

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

src/libstore/include/nix/store/local-overlay-store.hh

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

src/libstore/include/nix/store/local-store.hh

@@ -1,12 +1,12 @@
 #pragma once
 ///@file
 
-#include "nix/sqlite.hh"
+#include "nix/store/sqlite.hh"
 
-#include "nix/pathlocks.hh"
-#include "nix/store-api.hh"
-#include "nix/indirect-root-store.hh"
-#include "nix/sync.hh"
+#include "nix/store/pathlocks.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/indirect-root-store.hh"
+#include "nix/util/sync.hh"
 
 #include <chrono>
 #include <future>

src/libstore/include/nix/store/log-store.hh

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

src/libstore/include/nix/store/machines.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/ref.hh"
-#include "nix/store-reference.hh"
+#include "nix/util/ref.hh"
+#include "nix/store/store-reference.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/make-content-addressed.hh

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

src/libstore/include/nix/store/meson.build

@@ -1,12 +1,12 @@
 # Public headers directory
 
 include_dirs = [
-  include_directories('..'),
+  include_directories('../..'),
 ]
 
 config_pub_h = configure_file(
   configuration : configdata_pub,
-  output : 'store-config.hh',
+  output : 'config.hh',
 )
 
 headers = [config_pub_h] + files(

src/libstore/include/nix/store/names.hh

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

src/libstore/include/nix/store/nar-accessor.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/source-accessor.hh"
+#include "nix/util/source-accessor.hh"
 
 #include <functional>
 

src/libstore/include/nix/store/nar-info-disk-cache.hh

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

src/libstore/include/nix/store/nar-info.hh

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

src/libstore/include/nix/store/outputs-spec.hh

@@ -6,8 +6,8 @@
 #include <set>
 #include <variant>
 
-#include "nix/json-impls.hh"
-#include "nix/variant-wrapper.hh"
+#include "nix/util/json-impls.hh"
+#include "nix/util/variant-wrapper.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/parsed-derivations.hh

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

src/libstore/include/nix/store/path-info.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "nix/signature/signer.hh"
-#include "nix/path.hh"
-#include "nix/hash.hh"
-#include "nix/content-address.hh"
+#include "nix/util/signature/signer.hh"
+#include "nix/store/path.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/content-address.hh"
 
 #include <string>
 #include <optional>

src/libstore/include/nix/store/path-references.hh

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

src/libstore/include/nix/store/path-with-outputs.hh

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

src/libstore/include/nix/store/path.hh

@@ -3,7 +3,7 @@
 
 #include <string_view>
 
-#include "nix/types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/pathlocks.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/file-descriptor.hh"
+#include "nix/util/file-descriptor.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/posix-fs-canonicalise.hh

@@ -4,8 +4,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#include "nix/types.hh"
-#include "nix/error.hh"
+#include "nix/util/types.hh"
+#include "nix/util/error.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/profiles.hh

@@ -7,8 +7,8 @@
  * See the manual for additional information.
  */
 
-#include "nix/types.hh"
-#include "nix/pathlocks.hh"
+#include "nix/util/types.hh"
+#include "nix/store/pathlocks.hh"
 
 #include <optional>
 #include <time.h>

src/libstore/include/nix/store/realisation.hh

@@ -3,12 +3,12 @@
 
 #include <variant>
 
-#include "nix/hash.hh"
-#include "nix/path.hh"
-#include "nix/derived-path.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/path.hh"
+#include "nix/store/derived-path.hh"
 #include <nlohmann/json_fwd.hpp>
-#include "nix/comparator.hh"
-#include "nix/signature/signer.hh"
+#include "nix/util/comparator.hh"
+#include "nix/util/signature/signer.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/remote-fs-accessor.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "nix/source-accessor.hh"
-#include "nix/ref.hh"
-#include "nix/store-api.hh"
+#include "nix/util/source-accessor.hh"
+#include "nix/util/ref.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/remote-store-connection.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "nix/remote-store.hh"
-#include "nix/worker-protocol.hh"
-#include "nix/worker-protocol-connection.hh"
-#include "nix/pool.hh"
+#include "nix/store/remote-store.hh"
+#include "nix/store/worker-protocol.hh"
+#include "nix/store/worker-protocol-connection.hh"
+#include "nix/util/pool.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/remote-store.hh

@@ -4,9 +4,9 @@
 #include <limits>
 #include <string>
 
-#include "nix/store-api.hh"
-#include "nix/gc-store.hh"
-#include "nix/log-store.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/gc-store.hh"
+#include "nix/store/log-store.hh"
 
 
 namespace nix {

src/libstore/include/nix/store/s3-binary-cache-store.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/binary-cache-store.hh"
+#include "nix/store/binary-cache-store.hh"
 
 #include <atomic>
 

src/libstore/include/nix/store/s3.hh

@@ -3,7 +3,7 @@
 
 #if ENABLE_S3
 
-#include "nix/ref.hh"
+#include "nix/util/ref.hh"
 
 #include <optional>
 #include <string>

src/libstore/include/nix/store/serve-protocol-connection.hh

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

src/libstore/include/nix/store/serve-protocol-impl.hh

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

src/libstore/include/nix/store/serve-protocol.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/common-protocol.hh"
+#include "nix/store/common-protocol.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/sqlite.hh

@@ -4,7 +4,7 @@
 #include <functional>
 #include <string>
 
-#include "nix/error.hh"
+#include "nix/util/error.hh"
 
 struct sqlite3;
 struct sqlite3_stmt;

src/libstore/include/nix/store/ssh-store.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "nix/common-ssh-store-config.hh"
-#include "nix/store-api.hh"
-#include "nix/local-fs-store.hh"
-#include "nix/remote-store.hh"
+#include "nix/store/common-ssh-store-config.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/local-fs-store.hh"
+#include "nix/store/remote-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/ssh.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "nix/sync.hh"
-#include "nix/processes.hh"
-#include "nix/file-system.hh"
+#include "nix/util/sync.hh"
+#include "nix/util/processes.hh"
+#include "nix/util/file-system.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/store-api.hh

@@ -1,20 +1,20 @@
 #pragma once
 ///@file
 
-#include "nix/path.hh"
-#include "nix/derived-path.hh"
-#include "nix/hash.hh"
-#include "nix/content-address.hh"
-#include "nix/serialise.hh"
-#include "nix/lru-cache.hh"
-#include "nix/sync.hh"
-#include "nix/globals.hh"
-#include "nix/config.hh"
-#include "nix/path-info.hh"
-#include "nix/repair-flag.hh"
-#include "nix/store-dir-config.hh"
-#include "nix/store-reference.hh"
-#include "nix/source-path.hh"
+#include "nix/store/path.hh"
+#include "nix/store/derived-path.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/content-address.hh"
+#include "nix/util/serialise.hh"
+#include "nix/util/lru-cache.hh"
+#include "nix/util/sync.hh"
+#include "nix/store/globals.hh"
+#include "nix/util/configuration.hh"
+#include "nix/store/path-info.hh"
+#include "nix/util/repair-flag.hh"
+#include "nix/store/store-dir-config.hh"
+#include "nix/store/store-reference.hh"
+#include "nix/util/source-path.hh"
 
 #include <nlohmann/json_fwd.hpp>
 #include <atomic>

src/libstore/include/nix/store/store-cast.hh

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

src/libstore/include/nix/store/store-dir-config.hh

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "nix/path.hh"
-#include "nix/hash.hh"
-#include "nix/content-address.hh"
-#include "nix/globals.hh"
-#include "nix/config.hh"
+#include "nix/store/path.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/content-address.hh"
+#include "nix/store/globals.hh"
+#include "nix/util/configuration.hh"
 
 #include <map>
 #include <string>

src/libstore/include/nix/store/store-reference.hh

@@ -3,7 +3,7 @@
 
 #include <variant>
 
-#include "nix/types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/uds-remote-store.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "nix/remote-store.hh"
-#include "nix/remote-store-connection.hh"
-#include "nix/indirect-root-store.hh"
+#include "nix/store/remote-store.hh"
+#include "nix/store/remote-store-connection.hh"
+#include "nix/store/indirect-root-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/worker-protocol-connection.hh

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

src/libstore/include/nix/store/worker-protocol-impl.hh

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

src/libstore/include/nix/store/worker-protocol.hh

@@ -3,7 +3,7 @@
 
 #include <chrono>
 
-#include "nix/common-protocol.hh"
+#include "nix/store/common-protocol.hh"
 
 namespace nix {
 

src/libstore/indirect-root-store.cc

@@ -1,4 +1,4 @@
-#include "nix/indirect-root-store.hh"
+#include "nix/store/indirect-root-store.hh"
 
 namespace nix {
 

src/libstore/keys.cc

@@ -1,6 +1,6 @@
-#include "nix/file-system.hh"
-#include "nix/globals.hh"
-#include "nix/keys.hh"
+#include "nix/util/file-system.hh"
+#include "nix/store/globals.hh"
+#include "nix/store/keys.hh"
 
 namespace nix {
 

src/libstore/legacy-ssh-store.cc

@@ -1,17 +1,17 @@
-#include "nix/legacy-ssh-store.hh"
-#include "nix/common-ssh-store-config.hh"
-#include "nix/archive.hh"
-#include "nix/pool.hh"
-#include "nix/remote-store.hh"
-#include "nix/serve-protocol.hh"
-#include "nix/serve-protocol-connection.hh"
-#include "nix/serve-protocol-impl.hh"
-#include "nix/build-result.hh"
-#include "nix/store-api.hh"
-#include "nix/path-with-outputs.hh"
-#include "nix/ssh.hh"
-#include "nix/derivations.hh"
-#include "nix/callback.hh"
+#include "nix/store/legacy-ssh-store.hh"
+#include "nix/store/common-ssh-store-config.hh"
+#include "nix/util/archive.hh"
+#include "nix/util/pool.hh"
+#include "nix/store/remote-store.hh"
+#include "nix/store/serve-protocol.hh"
+#include "nix/store/serve-protocol-connection.hh"
+#include "nix/store/serve-protocol-impl.hh"
+#include "nix/store/build-result.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/path-with-outputs.hh"
+#include "nix/store/ssh.hh"
+#include "nix/store/derivations.hh"
+#include "nix/util/callback.hh"
 
 namespace nix {