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/build-remote/build-remote.cc

@@ -9,19 +9,19 @@
 #include <sys/time.h>
 #endif
 
-#include "nix/machines.hh"
-#include "nix/shared.hh"
-#include "nix/plugin.hh"
-#include "nix/pathlocks.hh"
-#include "nix/globals.hh"
-#include "nix/serialise.hh"
-#include "nix/build-result.hh"
-#include "nix/store-api.hh"
-#include "nix/strings.hh"
-#include "nix/derivations.hh"
-#include "nix/local-store.hh"
-#include "nix/legacy.hh"
-#include "nix/experimental-features.hh"
+#include "nix/store/machines.hh"
+#include "nix/main/shared.hh"
+#include "nix/main/plugin.hh"
+#include "nix/store/pathlocks.hh"
+#include "nix/store/globals.hh"
+#include "nix/util/serialise.hh"
+#include "nix/store/build-result.hh"
+#include "nix/store/store-api.hh"
+#include "nix/util/strings.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/local-store.hh"
+#include "nix/cmd/legacy.hh"
+#include "nix/util/experimental-features.hh"
 
 using namespace nix;
 using std::cin;

src/libcmd/built-path.cc

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

src/libcmd/command-installable-value.cc

@@ -1,4 +1,4 @@
-#include "nix/command-installable-value.hh"
+#include "nix/cmd/command-installable-value.hh"
 
 namespace nix {
 

src/libcmd/command.cc

@@ -1,16 +1,16 @@
 #include <algorithm>
 #include <nlohmann/json.hpp>
 
-#include "nix/command.hh"
-#include "nix/markdown.hh"
-#include "nix/store-api.hh"
-#include "nix/local-fs-store.hh"
-#include "nix/derivations.hh"
-#include "nix/nixexpr.hh"
-#include "nix/profiles.hh"
-#include "nix/repl.hh"
-#include "nix/strings.hh"
-#include "nix/environment-variables.hh"
+#include "nix/cmd/command.hh"
+#include "nix/cmd/markdown.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/local-fs-store.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/nixexpr.hh"
+#include "nix/store/profiles.hh"
+#include "nix/cmd/repl.hh"
+#include "nix/util/strings.hh"
+#include "nix/util/environment-variables.hh"
 
 namespace nix {
 

src/libcmd/common-eval-args.cc

@@ -1,20 +1,20 @@
-#include "nix/fetch-settings.hh"
-#include "nix/eval-settings.hh"
-#include "nix/common-eval-args.hh"
-#include "nix/shared.hh"
-#include "nix/config-global.hh"
-#include "nix/filetransfer.hh"
-#include "nix/eval.hh"
-#include "nix/fetchers.hh"
-#include "nix/registry.hh"
+#include "nix/fetchers/fetch-settings.hh"
+#include "nix/expr/eval-settings.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/main/shared.hh"
+#include "nix/util/config-global.hh"
+#include "nix/store/filetransfer.hh"
+#include "nix/expr/eval.hh"
+#include "nix/fetchers/fetchers.hh"
+#include "nix/fetchers/registry.hh"
 #include "nix/flake/flakeref.hh"
 #include "nix/flake/settings.hh"
-#include "nix/store-api.hh"
-#include "nix/command.hh"
-#include "nix/tarball.hh"
-#include "nix/fetch-to-store.hh"
-#include "nix/compatibility-settings.hh"
-#include "nix/eval-settings.hh"
+#include "nix/store/store-api.hh"
+#include "nix/cmd/command.hh"
+#include "nix/fetchers/tarball.hh"
+#include "nix/fetchers/fetch-to-store.hh"
+#include "nix/cmd/compatibility-settings.hh"
+#include "nix/expr/eval-settings.hh"
 
 namespace nix {
 

src/libcmd/editor-for.cc

@@ -1,6 +1,6 @@
-#include "nix/editor-for.hh"
-#include "nix/environment-variables.hh"
-#include "nix/source-path.hh"
+#include "nix/cmd/editor-for.hh"
+#include "nix/util/environment-variables.hh"
+#include "nix/util/source-path.hh"
 
 namespace nix {
 

src/libcmd/include/nix/cmd/built-path.hh

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

src/libcmd/include/nix/cmd/command-installable-value.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/installable-value.hh"
-#include "nix/command.hh"
+#include "nix/cmd/installable-value.hh"
+#include "nix/cmd/command.hh"
 
 namespace nix {
 

src/libcmd/include/nix/cmd/command.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "nix/installable-value.hh"
-#include "nix/args.hh"
-#include "nix/common-eval-args.hh"
-#include "nix/path.hh"
+#include "nix/cmd/installable-value.hh"
+#include "nix/util/args.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/path.hh"
 #include "nix/flake/lockfile.hh"
 
 #include <optional>

src/libcmd/include/nix/cmd/common-eval-args.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "nix/args.hh"
-#include "nix/canon-path.hh"
-#include "nix/common-args.hh"
-#include "nix/search-path.hh"
+#include "nix/util/args.hh"
+#include "nix/util/canon-path.hh"
+#include "nix/main/common-args.hh"
+#include "nix/expr/search-path.hh"
 
 #include <filesystem>
 

src/libcmd/include/nix/cmd/compatibility-settings.hh

@@ -1,5 +1,5 @@
 #pragma once
-#include "nix/config.hh"
+#include "nix/util/configuration.hh"
 
 namespace nix {
 struct CompatibilitySettings : public Config

src/libcmd/include/nix/cmd/editor-for.hh

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

src/libcmd/include/nix/cmd/installable-attr-path.hh

@@ -1,22 +1,22 @@
 #pragma once
 ///@file
 
-#include "nix/globals.hh"
-#include "nix/installable-value.hh"
-#include "nix/outputs-spec.hh"
-#include "nix/command.hh"
-#include "nix/attr-path.hh"
-#include "nix/common-eval-args.hh"
-#include "nix/derivations.hh"
-#include "nix/eval-inline.hh"
-#include "nix/eval.hh"
-#include "nix/get-drvs.hh"
-#include "nix/store-api.hh"
-#include "nix/shared.hh"
-#include "nix/eval-cache.hh"
-#include "nix/url.hh"
-#include "nix/registry.hh"
-#include "nix/build-result.hh"
+#include "nix/store/globals.hh"
+#include "nix/cmd/installable-value.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/cmd/command.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/main/shared.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/store/build-result.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/include/nix/cmd/installable-derived-path.hh

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

src/libcmd/include/nix/cmd/installable-flake.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/common-eval-args.hh"
-#include "nix/installable-value.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/cmd/installable-value.hh"
 
 namespace nix {
 

src/libcmd/include/nix/cmd/installable-value.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/installables.hh"
+#include "nix/cmd/installables.hh"
 #include "nix/flake/flake.hh"
 
 namespace nix {

src/libcmd/include/nix/cmd/installables.hh

@@ -1,12 +1,12 @@
 #pragma once
 ///@file
 
-#include "nix/path.hh"
-#include "nix/outputs-spec.hh"
-#include "nix/derived-path.hh"
-#include "nix/built-path.hh"
-#include "nix/store-api.hh"
-#include "nix/build-result.hh"
+#include "nix/store/path.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/store/derived-path.hh"
+#include "nix/cmd/built-path.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/build-result.hh"
 
 #include <optional>
 

src/libcmd/include/nix/cmd/meson.build

@@ -1,6 +1,6 @@
 # Public headers directory
 
-include_dirs = [include_directories('..')]
+include_dirs = [include_directories('../..')]
 
 headers = files(
   'built-path.hh',

src/libcmd/include/nix/cmd/misc-store-flags.hh

@@ -1,5 +1,5 @@
-#include "nix/args.hh"
-#include "nix/content-address.hh"
+#include "nix/util/args.hh"
+#include "nix/store/content-address.hh"
 
 namespace nix::flag {
 

src/libcmd/include/nix/cmd/network-proxy.hh

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

src/libcmd/include/nix/cmd/repl-interacter.hh

@@ -1,8 +1,8 @@
 #pragma once
 /// @file
 
-#include "nix/finally.hh"
-#include "nix/types.hh"
+#include "nix/util/finally.hh"
+#include "nix/util/types.hh"
 #include <functional>
 #include <string>
 

src/libcmd/include/nix/cmd/repl.hh

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

src/libcmd/installable-attr-path.cc

@@ -1,21 +1,21 @@
-#include "nix/globals.hh"
-#include "nix/installable-attr-path.hh"
-#include "nix/outputs-spec.hh"
-#include "nix/util.hh"
-#include "nix/command.hh"
-#include "nix/attr-path.hh"
-#include "nix/common-eval-args.hh"
-#include "nix/derivations.hh"
-#include "nix/eval-inline.hh"
-#include "nix/eval.hh"
-#include "nix/get-drvs.hh"
-#include "nix/store-api.hh"
-#include "nix/shared.hh"
+#include "nix/store/globals.hh"
+#include "nix/cmd/installable-attr-path.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/util.hh"
+#include "nix/cmd/command.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/main/shared.hh"
 #include "nix/flake/flake.hh"
-#include "nix/eval-cache.hh"
-#include "nix/url.hh"
-#include "nix/registry.hh"
-#include "nix/build-result.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/store/build-result.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installable-derived-path.cc

@@ -1,5 +1,5 @@
-#include "nix/installable-derived-path.hh"
-#include "nix/derivations.hh"
+#include "nix/cmd/installable-derived-path.hh"
+#include "nix/store/derivations.hh"
 
 namespace nix {
 

src/libcmd/installable-flake.cc

@@ -1,22 +1,22 @@
-#include "nix/globals.hh"
-#include "nix/installable-flake.hh"
-#include "nix/installable-derived-path.hh"
-#include "nix/outputs-spec.hh"
-#include "nix/util.hh"
-#include "nix/command.hh"
-#include "nix/attr-path.hh"
-#include "nix/common-eval-args.hh"
-#include "nix/derivations.hh"
-#include "nix/eval-inline.hh"
-#include "nix/eval.hh"
-#include "nix/get-drvs.hh"
-#include "nix/store-api.hh"
-#include "nix/shared.hh"
+#include "nix/store/globals.hh"
+#include "nix/cmd/installable-flake.hh"
+#include "nix/cmd/installable-derived-path.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/util.hh"
+#include "nix/cmd/command.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/main/shared.hh"
 #include "nix/flake/flake.hh"
-#include "nix/eval-cache.hh"
-#include "nix/url.hh"
-#include "nix/registry.hh"
-#include "nix/build-result.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/store/build-result.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installable-value.cc

@@ -1,6 +1,6 @@
-#include "nix/installable-value.hh"
-#include "nix/eval-cache.hh"
-#include "nix/fetch-to-store.hh"
+#include "nix/cmd/installable-value.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/fetchers/fetch-to-store.hh"
 
 namespace nix {
 

src/libcmd/installables.cc

@@ -1,33 +1,33 @@
-#include "nix/globals.hh"
-#include "nix/installables.hh"
-#include "nix/installable-derived-path.hh"
-#include "nix/installable-attr-path.hh"
-#include "nix/installable-flake.hh"
-#include "nix/outputs-spec.hh"
-#include "nix/users.hh"
-#include "nix/util.hh"
-#include "nix/command.hh"
-#include "nix/attr-path.hh"
-#include "nix/common-eval-args.hh"
-#include "nix/derivations.hh"
-#include "nix/eval-inline.hh"
-#include "nix/eval.hh"
-#include "nix/eval-settings.hh"
-#include "nix/get-drvs.hh"
-#include "nix/store-api.hh"
-#include "nix/shared.hh"
+#include "nix/store/globals.hh"
+#include "nix/cmd/installables.hh"
+#include "nix/cmd/installable-derived-path.hh"
+#include "nix/cmd/installable-attr-path.hh"
+#include "nix/cmd/installable-flake.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/users.hh"
+#include "nix/util/util.hh"
+#include "nix/cmd/command.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-settings.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/main/shared.hh"
 #include "nix/flake/flake.hh"
-#include "nix/eval-cache.hh"
-#include "nix/url.hh"
-#include "nix/registry.hh"
-#include "nix/build-result.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/store/build-result.hh"
 
 #include <regex>
 #include <queue>
 
 #include <nlohmann/json.hpp>
 
-#include "nix/strings-inline.hh"
+#include "nix/util/strings-inline.hh"
 
 namespace nix {
 

src/libcmd/legacy.cc

@@ -1,4 +1,4 @@
-#include "nix/legacy.hh"
+#include "nix/cmd/legacy.hh"
 
 namespace nix {
 

src/libcmd/markdown.cc

@@ -1,8 +1,8 @@
-#include "nix/markdown.hh"
-#include "nix/environment-variables.hh"
-#include "nix/error.hh"
-#include "nix/finally.hh"
-#include "nix/terminal.hh"
+#include "nix/cmd/markdown.hh"
+#include "nix/util/environment-variables.hh"
+#include "nix/util/error.hh"
+#include "nix/util/finally.hh"
+#include "nix/util/terminal.hh"
 
 #include "cmd-config-private.hh"
 

src/libcmd/meson.build

@@ -79,7 +79,7 @@ sources = files(
   'repl.cc',
 )
 
-subdir('include/nix')
+subdir('include/nix/cmd')
 
 subdir('nix-meson-build-support/export-all-symbols')
 subdir('nix-meson-build-support/windows-version')
@@ -95,7 +95,7 @@ this_library = library(
   install : true,
 )
 
-install_headers(headers, subdir : 'nix', preserve_path : true)
+install_headers(headers, subdir : 'nix/cmd', preserve_path : true)
 
 libraries_private = []
 

src/libcmd/misc-store-flags.cc

@@ -1,4 +1,4 @@
-#include "nix/misc-store-flags.hh"
+#include "nix/cmd/misc-store-flags.hh"
 
 namespace nix::flag
 {

src/libcmd/network-proxy.cc

@@ -1,8 +1,8 @@
-#include "nix/network-proxy.hh"
+#include "nix/cmd/network-proxy.hh"
 
 #include <algorithm>
 
-#include "nix/environment-variables.hh"
+#include "nix/util/environment-variables.hh"
 
 namespace nix {
 

src/libcmd/package.nix

@@ -46,7 +46,7 @@ mkMesonLibrary (finalAttrs: {
     ./.version
     ./meson.build
     ./meson.options
-    ./include/nix/meson.build
+    ./include/nix/cmd/meson.build
     (fileset.fileFilter (file: file.hasExt "cc") ./.)
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];

src/libcmd/repl-interacter.cc

@@ -16,12 +16,12 @@ extern "C" {
 }
 #endif
 
-#include "nix/signals.hh"
-#include "nix/finally.hh"
-#include "nix/repl-interacter.hh"
-#include "nix/file-system.hh"
-#include "nix/repl.hh"
-#include "nix/environment-variables.hh"
+#include "nix/util/signals.hh"
+#include "nix/util/finally.hh"
+#include "nix/cmd/repl-interacter.hh"
+#include "nix/util/file-system.hh"
+#include "nix/cmd/repl.hh"
+#include "nix/util/environment-variables.hh"
 
 namespace nix {
 

src/libcmd/repl.cc

@@ -2,34 +2,34 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "nix/error.hh"
-#include "nix/repl-interacter.hh"
-#include "nix/repl.hh"
+#include "nix/util/error.hh"
+#include "nix/cmd/repl-interacter.hh"
+#include "nix/cmd/repl.hh"
 
-#include "nix/ansicolor.hh"
-#include "nix/shared.hh"
-#include "nix/eval.hh"
-#include "nix/eval-settings.hh"
-#include "nix/attr-path.hh"
-#include "nix/signals.hh"
-#include "nix/store-api.hh"
-#include "nix/log-store.hh"
-#include "nix/common-eval-args.hh"
-#include "nix/get-drvs.hh"
-#include "nix/derivations.hh"
-#include "nix/globals.hh"
+#include "nix/util/ansicolor.hh"
+#include "nix/main/shared.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-settings.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/util/signals.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/log-store.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/globals.hh"
 #include "nix/flake/flake.hh"
 #include "nix/flake/lockfile.hh"
-#include "nix/users.hh"
-#include "nix/editor-for.hh"
-#include "nix/finally.hh"
-#include "nix/markdown.hh"
-#include "nix/local-fs-store.hh"
-#include "nix/print.hh"
-#include "nix/ref.hh"
-#include "nix/value.hh"
+#include "nix/util/users.hh"
+#include "nix/cmd/editor-for.hh"
+#include "nix/util/finally.hh"
+#include "nix/cmd/markdown.hh"
+#include "nix/store/local-fs-store.hh"
+#include "nix/expr/print.hh"
+#include "nix/util/ref.hh"
+#include "nix/expr/value.hh"
 
-#include "nix/strings.hh"
+#include "nix/util/strings.hh"
 
 namespace nix {
 

src/libexpr-c/nix_api_expr.cc

@@ -2,11 +2,11 @@
 #include <stdexcept>
 #include <string>
 
-#include "nix/eval.hh"
-#include "nix/eval-gc.hh"
-#include "nix/globals.hh"
-#include "nix/eval-settings.hh"
-#include "nix/ref.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-gc.hh"
+#include "nix/store/globals.hh"
+#include "nix/expr/eval-settings.hh"
+#include "nix/util/ref.hh"
 
 #include "nix_api_expr.h"
 #include "nix_api_expr_internal.h"

src/libexpr-c/nix_api_expr_internal.h

@@ -1,12 +1,12 @@
 #ifndef NIX_API_EXPR_INTERNAL_H
 #define NIX_API_EXPR_INTERNAL_H
 
-#include "nix/fetch-settings.hh"
-#include "nix/eval.hh"
-#include "nix/eval-settings.hh"
-#include "nix/attr-set.hh"
+#include "nix/fetchers/fetch-settings.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-settings.hh"
+#include "nix/expr/attr-set.hh"
 #include "nix_api_value.h"
-#include "nix/search-path.hh"
+#include "nix/expr/search-path.hh"
 
 struct nix_eval_state_builder
 {

src/libexpr-c/nix_api_external.cc

@@ -1,8 +1,8 @@
-#include "nix/attr-set.hh"
-#include "nix/config.hh"
-#include "nix/eval.hh"
-#include "nix/globals.hh"
-#include "nix/value.hh"
+#include "nix/expr/attr-set.hh"
+#include "nix/util/configuration.hh"
+#include "nix/expr/eval.hh"
+#include "nix/store/globals.hh"
+#include "nix/expr/value.hh"
 
 #include "nix_api_expr.h"
 #include "nix_api_expr_internal.h"
@@ -10,7 +10,7 @@
 #include "nix_api_util.h"
 #include "nix_api_util_internal.h"
 #include "nix_api_value.h"
-#include "nix/value/context.hh"
+#include "nix/expr/value/context.hh"
 
 #include <nlohmann/json.hpp>
 

src/libexpr-c/nix_api_value.cc

@@ -1,10 +1,10 @@
-#include "nix/attr-set.hh"
-#include "nix/config.hh"
-#include "nix/eval.hh"
-#include "nix/globals.hh"
-#include "nix/path.hh"
-#include "nix/primops.hh"
-#include "nix/value.hh"
+#include "nix/expr/attr-set.hh"
+#include "nix/util/configuration.hh"
+#include "nix/expr/eval.hh"
+#include "nix/store/globals.hh"
+#include "nix/store/path.hh"
+#include "nix/expr/primops.hh"
+#include "nix/expr/value.hh"
 
 #include "nix_api_expr.h"
 #include "nix_api_expr_internal.h"
@@ -12,7 +12,7 @@
 #include "nix_api_util_internal.h"
 #include "nix_api_store_internal.h"
 #include "nix_api_value.h"
-#include "nix/value/context.hh"
+#include "nix/expr/value/context.hh"
 
 // Internal helper functions to check [in] and [out] `Value *` parameters
 static const nix::Value & check_value_not_null(const nix_value * value)

src/libexpr-test-support/include/nix/expr/tests/libexpr.hh

@@ -4,16 +4,16 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "nix/fetch-settings.hh"
-#include "nix/value.hh"
-#include "nix/nixexpr.hh"
-#include "nix/nixexpr.hh"
-#include "nix/eval.hh"
-#include "nix/eval-gc.hh"
-#include "nix/eval-inline.hh"
-#include "nix/eval-settings.hh"
+#include "nix/fetchers/fetch-settings.hh"
+#include "nix/expr/value.hh"
+#include "nix/expr/nixexpr.hh"
+#include "nix/expr/nixexpr.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-gc.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval-settings.hh"
 
-#include "nix/tests/libstore.hh"
+#include "nix/store/tests/libstore.hh"
 
 namespace nix {
     class LibExprTest : public LibStoreTest {

src/libexpr-test-support/include/nix/expr/tests/meson.build

@@ -0,0 +1,9 @@
+# Public headers directory
+
+include_dirs = [include_directories('../../..')]
+
+headers = files(
+  'libexpr.hh',
+  'nix_api_expr.hh',
+  'value/context.hh',
+)

src/libexpr-test-support/include/nix/expr/tests/nix_api_expr.hh

@@ -2,7 +2,7 @@
 ///@file
 #include "nix_api_expr.h"
 #include "nix_api_value.h"
-#include "nix/tests/nix_api_store.hh"
+#include "nix/store/tests/nix_api_store.hh"
 
 #include <gtest/gtest.h>
 

src/libexpr-test-support/include/nix/expr/tests/value/context.hh

@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include "nix/value/context.hh"
+#include "nix/expr/value/context.hh"
 
 namespace rc {
 using namespace nix;

src/libexpr-test-support/include/nix/meson.build

@@ -1,9 +0,0 @@
-# Public headers directory
-
-include_dirs = [include_directories('..')]
-
-headers = files(
-  'tests/libexpr.hh',
-  'tests/nix_api_expr.hh',
-  'tests/value/context.hh',
-)

src/libexpr-test-support/meson.build

@@ -35,7 +35,7 @@ sources = files(
   'tests/value/context.cc',
 )
 
-subdir('include/nix')
+subdir('include/nix/expr/tests')
 
 subdir('nix-meson-build-support/export-all-symbols')
 subdir('nix-meson-build-support/windows-version')
@@ -52,7 +52,7 @@ this_library = library(
   install : true,
 )
 
-install_headers(headers, subdir : 'nix', preserve_path : true)
+install_headers(headers, subdir : 'nix/expr/tests', preserve_path : true)
 
 libraries_private = []
 

src/libexpr-test-support/package.nix

@@ -29,7 +29,7 @@ mkMesonLibrary (finalAttrs: {
     ./.version
     ./meson.build
     # ./meson.options
-    ./include/nix/meson.build
+    ./include/nix/expr/tests/meson.build
     (fileset.fileFilter (file: file.hasExt "cc") ./.)
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];

src/libexpr-test-support/tests/value/context.cc

@@ -1,7 +1,7 @@
 #include <rapidcheck.h>
 
-#include "nix/tests/path.hh"
-#include "nix/tests/value/context.hh"
+#include "nix/store/tests/path.hh"
+#include "nix/expr/tests/value/context.hh"
 
 namespace rc {
 using namespace nix;

src/libexpr-tests/derived-path.cc

@@ -2,8 +2,8 @@
 #include <gtest/gtest.h>
 #include <rapidcheck/gtest.h>
 
-#include "nix/tests/derived-path.hh"
-#include "nix/tests/libexpr.hh"
+#include "nix/store/tests/derived-path.hh"
+#include "nix/expr/tests/libexpr.hh"
 
 namespace nix {
 

src/libexpr-tests/error_traces.cc

@@ -1,7 +1,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "nix/tests/libexpr.hh"
+#include "nix/expr/tests/libexpr.hh"
 
 namespace nix {
 

src/libexpr-tests/eval.cc

@@ -1,8 +1,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "nix/eval.hh"
-#include "nix/tests/libexpr.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/tests/libexpr.hh"
 
 namespace nix {
 

src/libexpr-tests/json.cc

@@ -1,5 +1,5 @@
-#include "nix/tests/libexpr.hh"
-#include "nix/value-to-json.hh"
+#include "nix/expr/tests/libexpr.hh"
+#include "nix/expr/value-to-json.hh"
 
 namespace nix {
 // Testing the conversion to JSON

src/libexpr-tests/main.cc

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <cstdlib>
-#include "nix/globals.hh"
-#include "nix/logging.hh"
+#include "nix/store/globals.hh"
+#include "nix/util/logging.hh"
 
 using namespace nix;
 

src/libexpr-tests/nix_api_expr.cc

@@ -5,9 +5,9 @@
 #include "nix_api_expr.h"
 #include "nix_api_value.h"
 
-#include "nix/tests/nix_api_expr.hh"
-#include "nix/tests/string_callback.hh"
-#include "nix/file-system.hh"
+#include "nix/expr/tests/nix_api_expr.hh"
+#include "nix/util/tests/string_callback.hh"
+#include "nix/util/file-system.hh"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

src/libexpr-tests/nix_api_external.cc

@@ -7,8 +7,8 @@
 #include "nix_api_value.h"
 #include "nix_api_external.h"
 
-#include "nix/tests/nix_api_expr.hh"
-#include "nix/tests/string_callback.hh"
+#include "nix/expr/tests/nix_api_expr.hh"
+#include "nix/util/tests/string_callback.hh"
 
 #include <gtest/gtest.h>
 

src/libexpr-tests/nix_api_value.cc

@@ -6,8 +6,8 @@
 #include "nix_api_value.h"
 #include "nix_api_expr_internal.h"
 
-#include "nix/tests/nix_api_expr.hh"
-#include "nix/tests/string_callback.hh"
+#include "nix/expr/tests/nix_api_expr.hh"
+#include "nix/util/tests/string_callback.hh"
 
 #include <gmock/gmock.h>
 #include <cstddef>

src/libexpr-tests/primops.cc

@@ -1,10 +1,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "nix/eval-settings.hh"
-#include "nix/memory-source-accessor.hh"
+#include "nix/expr/eval-settings.hh"
+#include "nix/util/memory-source-accessor.hh"
 
-#include "nix/tests/libexpr.hh"
+#include "nix/expr/tests/libexpr.hh"
 
 namespace nix {
     class CaptureLogger : public Logger

src/libexpr-tests/search-path.cc

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "nix/search-path.hh"
+#include "nix/expr/search-path.hh"
 
 namespace nix {
 

src/libexpr-tests/trivial.cc

@@ -1,4 +1,4 @@
-#include "nix/tests/libexpr.hh"
+#include "nix/expr/tests/libexpr.hh"
 
 namespace nix {
     // Testing of trivial expressions

src/libexpr-tests/value/context.cc

@@ -2,9 +2,9 @@
 #include <gtest/gtest.h>
 #include <rapidcheck/gtest.h>
 
-#include "nix/tests/path.hh"
-#include "nix/tests/libexpr.hh"
-#include "nix/tests/value/context.hh"
+#include "nix/store/tests/path.hh"
+#include "nix/expr/tests/libexpr.hh"
+#include "nix/expr/tests/value/context.hh"
 
 namespace nix {
 

src/libexpr-tests/value/print.cc

@@ -1,7 +1,7 @@
-#include "nix/tests/libexpr.hh"
+#include "nix/expr/tests/libexpr.hh"
 
-#include "nix/value.hh"
-#include "nix/print.hh"
+#include "nix/expr/value.hh"
+#include "nix/expr/print.hh"
 
 namespace nix {
 

src/libexpr-tests/value/value.cc

@@ -1,6 +1,6 @@
-#include "nix/value.hh"
+#include "nix/expr/value.hh"
 
-#include "nix/tests/libstore.hh"
+#include "nix/store/tests/libstore.hh"
 
 namespace nix {
 

src/libexpr/attr-path.cc

@@ -1,5 +1,5 @@
-#include "nix/attr-path.hh"
-#include "nix/eval-inline.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/expr/eval-inline.hh"
 
 
 namespace nix {

src/libexpr/attr-set.cc

@@ -1,5 +1,5 @@
-#include "nix/attr-set.hh"
-#include "nix/eval-inline.hh"
+#include "nix/expr/attr-set.hh"
+#include "nix/expr/eval-inline.hh"
 
 #include <algorithm>
 

src/libexpr/eval-cache.cc

@@ -1,11 +1,11 @@
-#include "nix/users.hh"
-#include "nix/eval-cache.hh"
-#include "nix/sqlite.hh"
-#include "nix/eval.hh"
-#include "nix/eval-inline.hh"
-#include "nix/store-api.hh"
+#include "nix/util/users.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/store/sqlite.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/store/store-api.hh"
 // Need specialization involving `SymbolStr` just in this one module.
-#include "nix/strings-inline.hh"
+#include "nix/util/strings-inline.hh"
 
 namespace nix::eval_cache {
 

src/libexpr/eval-error.cc

@@ -1,6 +1,6 @@
-#include "nix/eval-error.hh"
-#include "nix/eval.hh"
-#include "nix/value.hh"
+#include "nix/expr/eval-error.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/value.hh"
 
 namespace nix {
 

src/libexpr/eval-gc.cc

@@ -1,9 +1,9 @@
-#include "nix/error.hh"
-#include "nix/environment-variables.hh"
-#include "nix/eval-settings.hh"
-#include "nix/config-global.hh"
-#include "nix/serialise.hh"
-#include "nix/eval-gc.hh"
+#include "nix/util/error.hh"
+#include "nix/util/environment-variables.hh"
+#include "nix/expr/eval-settings.hh"
+#include "nix/util/config-global.hh"
+#include "nix/util/serialise.hh"
+#include "nix/expr/eval-gc.hh"
 
 #include "expr-config-private.hh"
 

src/libexpr/eval-settings.cc

@@ -1,8 +1,8 @@
-#include "nix/users.hh"
-#include "nix/globals.hh"
-#include "nix/profiles.hh"
-#include "nix/eval.hh"
-#include "nix/eval-settings.hh"
+#include "nix/util/users.hh"
+#include "nix/store/globals.hh"
+#include "nix/store/profiles.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-settings.hh"
 
 namespace nix {
 

src/libexpr/eval.cc

@@ -1,24 +1,24 @@
-#include "nix/eval.hh"
-#include "nix/eval-settings.hh"
-#include "nix/primops.hh"
-#include "nix/print-options.hh"
-#include "nix/exit.hh"
-#include "nix/types.hh"
-#include "nix/util.hh"
-#include "nix/store-api.hh"
-#include "nix/derivations.hh"
-#include "nix/downstream-placeholder.hh"
-#include "nix/eval-inline.hh"
-#include "nix/filetransfer.hh"
-#include "nix/function-trace.hh"
-#include "nix/profiles.hh"
-#include "nix/print.hh"
-#include "nix/filtering-source-accessor.hh"
-#include "nix/memory-source-accessor.hh"
-#include "nix/gc-small-vector.hh"
-#include "nix/url.hh"
-#include "nix/fetch-to-store.hh"
-#include "nix/tarball.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-settings.hh"
+#include "nix/expr/primops.hh"
+#include "nix/expr/print-options.hh"
+#include "nix/util/exit.hh"
+#include "nix/util/types.hh"
+#include "nix/util/util.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/downstream-placeholder.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/store/filetransfer.hh"
+#include "nix/expr/function-trace.hh"
+#include "nix/store/profiles.hh"
+#include "nix/expr/print.hh"
+#include "nix/fetchers/filtering-source-accessor.hh"
+#include "nix/util/memory-source-accessor.hh"
+#include "nix/expr/gc-small-vector.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/fetch-to-store.hh"
+#include "nix/fetchers/tarball.hh"
 
 #include "parser-tab.hh"
 
@@ -39,7 +39,7 @@
 #  include <sys/resource.h>
 #endif
 
-#include "nix/strings-inline.hh"
+#include "nix/util/strings-inline.hh"
 
 using json = nlohmann::json;
 

src/libexpr/function-trace.cc

@@ -1,5 +1,5 @@
-#include "nix/function-trace.hh"
-#include "nix/logging.hh"
+#include "nix/expr/function-trace.hh"
+#include "nix/util/logging.hh"
 
 namespace nix {
 

src/libexpr/get-drvs.cc

@@ -1,8 +1,8 @@
-#include "nix/get-drvs.hh"
-#include "nix/eval-inline.hh"
-#include "nix/derivations.hh"
-#include "nix/store-api.hh"
-#include "nix/path-with-outputs.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/path-with-outputs.hh"
 
 #include <cstring>
 #include <regex>

src/libexpr/include/nix/expr/attr-path.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/eval.hh"
+#include "nix/expr/eval.hh"
 
 #include <string>
 #include <map>

src/libexpr/include/nix/expr/attr-set.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/nixexpr.hh"
-#include "nix/symbol-table.hh"
+#include "nix/expr/nixexpr.hh"
+#include "nix/expr/symbol-table.hh"
 
 #include <algorithm>
 

src/libexpr/include/nix/expr/eval-cache.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "nix/sync.hh"
-#include "nix/hash.hh"
-#include "nix/eval.hh"
+#include "nix/util/sync.hh"
+#include "nix/util/hash.hh"
+#include "nix/expr/eval.hh"
 
 #include <functional>
 #include <variant>

src/libexpr/include/nix/expr/eval-error.hh

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "nix/error.hh"
-#include "nix/pos-idx.hh"
+#include "nix/util/error.hh"
+#include "nix/util/pos-idx.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/eval-gc.hh

@@ -4,7 +4,7 @@
 #include <cstddef>
 
 // For `NIX_USE_BOEHMGC`, and if that's set, `GC_THREADS`
-#include "nix/expr-config.hh"
+#include "nix/expr/config.hh"
 
 #if NIX_USE_BOEHMGC
 

src/libexpr/include/nix/expr/eval-inline.hh

@@ -1,13 +1,13 @@
 #pragma once
 ///@file
 
-#include "nix/print.hh"
-#include "nix/eval.hh"
-#include "nix/eval-error.hh"
-#include "nix/eval-settings.hh"
+#include "nix/expr/print.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/eval-error.hh"
+#include "nix/expr/eval-settings.hh"
 
 // For `NIX_USE_BOEHMGC`, and if that's set, `GC_THREADS`
-#include "nix/expr-config.hh"
+#include "nix/expr/config.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/eval-settings.hh

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

src/libexpr/include/nix/expr/eval.hh

@@ -1,23 +1,23 @@
 #pragma once
 ///@file
 
-#include "nix/attr-set.hh"
-#include "nix/eval-error.hh"
-#include "nix/types.hh"
-#include "nix/value.hh"
-#include "nix/nixexpr.hh"
-#include "nix/symbol-table.hh"
-#include "nix/config.hh"
-#include "nix/experimental-features.hh"
-#include "nix/position.hh"
-#include "nix/pos-table.hh"
-#include "nix/source-accessor.hh"
-#include "nix/search-path.hh"
-#include "nix/repl-exit-status.hh"
-#include "nix/ref.hh"
+#include "nix/expr/attr-set.hh"
+#include "nix/expr/eval-error.hh"
+#include "nix/util/types.hh"
+#include "nix/expr/value.hh"
+#include "nix/expr/nixexpr.hh"
+#include "nix/expr/symbol-table.hh"
+#include "nix/util/configuration.hh"
+#include "nix/util/experimental-features.hh"
+#include "nix/util/position.hh"
+#include "nix/util/pos-table.hh"
+#include "nix/util/source-accessor.hh"
+#include "nix/expr/search-path.hh"
+#include "nix/expr/repl-exit-status.hh"
+#include "nix/util/ref.hh"
 
 // For `NIX_USE_BOEHMGC`, and if that's set, `GC_THREADS`
-#include "nix/expr-config.hh"
+#include "nix/expr/config.hh"
 
 #include <map>
 #include <optional>
@@ -947,4 +947,4 @@ bool isAllowedURI(std::string_view uri, const Strings & allowedPaths);
 
 }
 
-#include "nix/eval-inline.hh"
+#include "nix/expr/eval-inline.hh"

src/libexpr/include/nix/expr/function-trace.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/eval.hh"
+#include "nix/expr/eval.hh"
 
 #include <chrono>
 

src/libexpr/include/nix/expr/gc-small-vector.hh

@@ -2,7 +2,7 @@
 
 #include <boost/container/small_vector.hpp>
 
-#include "nix/value.hh"
+#include "nix/expr/value.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/get-drvs.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/eval.hh"
-#include "nix/path.hh"
+#include "nix/expr/eval.hh"
+#include "nix/store/path.hh"
 
 #include <string>
 #include <map>

src/libexpr/include/nix/expr/json-to-value.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/error.hh"
+#include "nix/util/error.hh"
 
 #include <string>
 

src/libexpr/include/nix/expr/meson.build

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

src/libexpr/include/nix/expr/nixexpr.hh

@@ -4,10 +4,10 @@
 #include <map>
 #include <vector>
 
-#include "nix/value.hh"
-#include "nix/symbol-table.hh"
-#include "nix/eval-error.hh"
-#include "nix/pos-idx.hh"
+#include "nix/expr/value.hh"
+#include "nix/expr/symbol-table.hh"
+#include "nix/expr/eval-error.hh"
+#include "nix/util/pos-idx.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/parser-state.hh

@@ -3,7 +3,7 @@
 
 #include <limits>
 
-#include "nix/eval.hh"
+#include "nix/expr/eval.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/primops.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/eval.hh"
+#include "nix/expr/eval.hh"
 
 #include <tuple>
 #include <vector>

src/libexpr/include/nix/expr/print-ambiguous.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nix/value.hh"
+#include "nix/expr/value.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/print.hh

@@ -9,8 +9,8 @@
 
 #include <iostream>
 
-#include "nix/fmt.hh"
-#include "nix/print-options.hh"
+#include "nix/util/fmt.hh"
+#include "nix/expr/print-options.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/search-path.hh

@@ -3,8 +3,8 @@
 
 #include <optional>
 
-#include "nix/types.hh"
-#include "nix/comparator.hh"
+#include "nix/util/types.hh"
+#include "nix/util/comparator.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/symbol-table.hh

@@ -5,9 +5,9 @@
 #include <map>
 #include <unordered_map>
 
-#include "nix/types.hh"
-#include "nix/chunked-vector.hh"
-#include "nix/error.hh"
+#include "nix/util/types.hh"
+#include "nix/util/chunked-vector.hh"
+#include "nix/util/error.hh"
 
 namespace nix {
 

src/libexpr/include/nix/expr/value-to-json.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/nixexpr.hh"
-#include "nix/eval.hh"
+#include "nix/expr/nixexpr.hh"
+#include "nix/expr/eval.hh"
 
 #include <string>
 #include <map>

src/libexpr/include/nix/expr/value-to-xml.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "nix/nixexpr.hh"
-#include "nix/eval.hh"
+#include "nix/expr/nixexpr.hh"
+#include "nix/expr/eval.hh"
 
 #include <string>
 #include <map>

src/libexpr/include/nix/expr/value.hh

@@ -4,12 +4,12 @@
 #include <cassert>
 #include <span>
 
-#include "nix/eval-gc.hh"
-#include "nix/symbol-table.hh"
-#include "nix/value/context.hh"
-#include "nix/source-path.hh"
-#include "nix/print-options.hh"
-#include "nix/checked-arithmetic.hh"
+#include "nix/expr/eval-gc.hh"
+#include "nix/expr/symbol-table.hh"
+#include "nix/expr/value/context.hh"
+#include "nix/util/source-path.hh"
+#include "nix/expr/print-options.hh"
+#include "nix/util/checked-arithmetic.hh"
 
 #include <nlohmann/json_fwd.hpp>
 

src/libexpr/include/nix/expr/value/context.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "nix/comparator.hh"
-#include "nix/derived-path.hh"
-#include "nix/variant-wrapper.hh"
+#include "nix/util/comparator.hh"
+#include "nix/store/derived-path.hh"
+#include "nix/util/variant-wrapper.hh"
 
 #include <nlohmann/json_fwd.hpp>
 

src/libexpr/json-to-value.cc

@@ -1,6 +1,6 @@
-#include "nix/json-to-value.hh"
-#include "nix/value.hh"
-#include "nix/eval.hh"
+#include "nix/expr/json-to-value.hh"
+#include "nix/expr/value.hh"
+#include "nix/expr/eval.hh"
 
 #include <limits>
 #include <variant>