Include rearrangement: libexpr

Change-Id: Ib230a3021d544d3ab1376542b73ea1df1a220a3c

src/libexpr/attr-path.cc

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

src/libexpr/attr-path.hh

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

src/libexpr/attr-set.cc

@@ -1,6 +1,6 @@
-#include "attr-set.hh"
-#include "eval.hh"
-#include "gc-alloc.hh"
+#include "lix/libexpr/attr-set.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/gc-alloc.hh"
 
 #include <algorithm>
 

src/libexpr/attr-set.hh

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

src/libexpr/eval-cache.cc

@@ -1,8 +1,8 @@
-#include "eval-cache.hh"
-#include "sqlite.hh"
-#include "eval.hh"
-#include "store-api.hh"
-#include "users.hh"
+#include "lix/libexpr/eval-cache.hh"
+#include "lix/libstore/sqlite.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/users.hh"
 
 namespace nix::eval_cache {
 

src/libexpr/eval-cache.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "sync.hh"
-#include "hash.hh"
-#include "eval.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libexpr/eval.hh"
 
 #include <functional>
 #include <variant>

src/libexpr/eval-error.cc

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

src/libexpr/eval-error.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "error.hh"
-#include "types.hh"
-#include "pos-idx.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libexpr/pos-idx.hh"
 
 namespace nix {
 

src/libexpr/eval-inline.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "print.hh"
-#include "eval.hh"
-#include "eval-error.hh"
-#include "gc-alloc.hh"
+#include "lix/libexpr/print.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-error.hh"
+#include "lix/libexpr/gc-alloc.hh"
 
 namespace nix {
 

src/libexpr/eval-settings.cc

@@ -1,8 +1,8 @@
-#include "file-system.hh"
-#include "globals.hh"
-#include "profiles.hh"
-#include "users.hh"
-#include "eval-settings.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libexpr/eval-settings.hh"
 
 namespace nix {
 

src/libexpr/eval-settings.hh

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

src/libexpr/eval.cc

@@ -1,25 +1,25 @@
-#include "eval.hh"
-#include "eval-settings.hh"
-#include "hash.hh"
-#include "primops.hh"
-#include "print-options.hh"
-#include "shared.hh"
-#include "suggestions.hh"
-#include "types.hh"
-#include "store-api.hh"
-#include "derivations.hh"
-#include "downstream-placeholder.hh"
-#include "gc-alloc.hh"
-#include "globals.hh"
-#include "eval-inline.hh"
-#include "filetransfer.hh"
-#include "function-trace.hh"
-#include "profiles.hh"
-#include "print.hh"
-#include "gc-small-vector.hh"
-#include "fetch-to-store.hh"
-#include "flake/flakeref.hh"
-#include "exit.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/print-options.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libutil/suggestions.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/downstream-placeholder.hh"
+#include "lix/libexpr/gc-alloc.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libexpr/function-trace.hh"
+#include "lix/libstore/profiles.hh"
+#include "lix/libexpr/print.hh"
+#include "lix/libexpr/gc-small-vector.hh"
+#include "lix/libfetchers/fetch-to-store.hh"
+#include "lix/libexpr/flake/flakeref.hh"
+#include "lix/libutil/exit.hh"
 
 #include <algorithm>
 #include <iostream>

src/libexpr/eval.hh

@@ -1,18 +1,18 @@
 #pragma once
 ///@file
 
-#include "attr-set.hh"
-#include "eval-error.hh"
-#include "gc-alloc.hh"
-#include "types.hh"
-#include "value.hh"
-#include "nixexpr.hh"
-#include "symbol-table.hh"
-#include "config.hh"
-#include "experimental-features.hh"
-#include "search-path.hh"
-#include "repl-exit-status.hh"
-#include "backed-string-view.hh"
+#include "lix/libexpr/attr-set.hh"
+#include "lix/libexpr/eval-error.hh"
+#include "lix/libexpr/gc-alloc.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libexpr/value.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libexpr/symbol-table.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/experimental-features.hh"
+#include "lix/libexpr/search-path.hh"
+#include "lix/libexpr/repl-exit-status.hh"
+#include "lix/libutil/backed-string-view.hh"
 
 #include <map>
 #include <optional>
@@ -792,4 +792,4 @@ static constexpr std::string_view corepkgsPrefix{"/__corepkgs__/"};
 
 }
 
-#include "eval-inline.hh" // IWYU pragma: keep
+#include "lix/libexpr/eval-inline.hh" // IWYU pragma: keep

src/libexpr/flake/config.cc

@@ -1,7 +1,7 @@
-#include "flake.hh"
-#include "logging.hh"
-#include "users.hh"
-#include "fetch-settings.hh"
+#include "lix/libexpr/flake/flake.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/users.hh"
+#include "lix/libfetchers/fetch-settings.hh"
 
 #include <nlohmann/json.hpp>
 

src/libexpr/flake/flake.cc

@@ -1,15 +1,15 @@
-#include "flake.hh"
-#include "eval.hh"
-#include "eval-settings.hh"
-#include "extra-primops.hh"
-#include "lockfile.hh"
-#include "primops.hh"
-#include "eval-inline.hh"
-#include "store-api.hh"
-#include "fetchers.hh"
-#include "finally.hh"
-#include "fetch-settings.hh"
-#include "terminal.hh"
+#include "lix/libexpr/flake/flake.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libexpr/extra-primops.hh"
+#include "lix/libexpr/flake/lockfile.hh"
+#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libfetchers/fetch-settings.hh"
+#include "lix/libutil/terminal.hh"
 
 namespace nix {
 

src/libexpr/flake/flake.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "flakeref.hh"
-#include "lockfile.hh"
-#include "value.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libexpr/flake/flakeref.hh"
+#include "lix/libexpr/flake/lockfile.hh"
+#include "lix/libexpr/value.hh"
 
 namespace nix {
 

src/libexpr/flake/flakeref.cc

@@ -1,9 +1,9 @@
-#include "flakeref.hh"
-#include "store-api.hh"
-#include "url.hh"
-#include "url-parts.hh"
-#include "fetchers.hh"
-#include "registry.hh"
+#include "lix/libexpr/flake/flakeref.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/url-parts.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libfetchers/registry.hh"
 
 namespace nix {
 

src/libexpr/flake/flakeref.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "hash.hh"
-#include "fetchers.hh"
-#include "outputs-spec.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libstore/outputs-spec.hh"
 
 #include <variant>
 

src/libexpr/flake/lockfile.cc

@@ -1,6 +1,6 @@
-#include "lockfile.hh"
-#include "store-api.hh"
-#include "url-parts.hh"
+#include "lix/libexpr/flake/lockfile.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/url-parts.hh"
 
 #include <iomanip>
 

src/libexpr/flake/lockfile.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "flakeref.hh"
+#include "lix/libexpr/flake/flakeref.hh"
 
 #include <nlohmann/json_fwd.hpp>
 

src/libexpr/function-trace.cc

@@ -1,5 +1,5 @@
-#include "function-trace.hh"
-#include "logging.hh"
+#include "lix/libexpr/function-trace.hh"
+#include "lix/libutil/logging.hh"
 
 namespace nix {
 

src/libexpr/gc-alloc.cc

@@ -1,4 +1,4 @@
-#include "gc-alloc.hh"
+#include "lix/libexpr/gc-alloc.hh"
 
 #include <cstring>
 #include <string_view>

src/libexpr/gc-alloc.hh

@@ -10,7 +10,7 @@
 #include <string_view>
 #include <vector>
 
-#include "checked-arithmetic.hh"
+#include "lix/libutil/checked-arithmetic.hh"
 
 #if HAVE_BOEHMGC
 #include <functional> // std::less

src/libexpr/get-drvs.cc

@@ -1,9 +1,9 @@
-#include "get-drvs.hh"
-#include "eval-inline.hh"
-#include "derivations.hh"
-#include "eval.hh"
-#include "store-api.hh"
-#include "path-with-outputs.hh"
+#include "lix/libexpr/get-drvs.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/path-with-outputs.hh"
 
 #include <cstring>
 #include <regex>

src/libexpr/get-drvs.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "eval.hh"
-#include "path.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libstore/path.hh"
 
 #include <string>
 #include <map>

src/libexpr/json-to-value.cc

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

src/libexpr/json-to-value.hh

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

src/libexpr/nixexpr.cc

@@ -1,9 +1,9 @@
-#include "nixexpr.hh"
-#include "derivations.hh"
-#include "eval.hh"
-#include "symbol-table.hh"
-#include "print.hh"
-#include "escape-string.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/symbol-table.hh"
+#include "lix/libexpr/print.hh"
+#include "lix/libutil/escape-string.hh"
 
 #include <cstdlib>
 #include <sstream>

src/libexpr/nixexpr.hh

@@ -4,14 +4,14 @@
 #include <map>
 #include <vector>
 
-#include "value.hh"
-#include "symbol-table.hh"
-#include "error.hh"
-#include "position.hh"
-#include "eval-error.hh"
-#include "pos-idx.hh"
-#include "pos-table.hh"
-#include "strings.hh"
+#include "lix/libexpr/value.hh"
+#include "lix/libexpr/symbol-table.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/position.hh"
+#include "lix/libexpr/eval-error.hh"
+#include "lix/libexpr/pos-idx.hh"
+#include "lix/libexpr/pos-table.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libexpr/parser/parser.cc

@@ -1,15 +1,15 @@
-#include "attr-set.hh"
-#include "error.hh"
-#include "eval-settings.hh"
-#include "eval.hh"
-#include "finally.hh"
-#include "nixexpr.hh"
-#include "symbol-table.hh"
-#include "users.hh"
+#include "lix/libexpr/attr-set.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libexpr/symbol-table.hh"
+#include "lix/libutil/users.hh"
 
-#include "change_head.hh"
-#include "grammar.hh"
-#include "state.hh"
+#include "lix/libexpr/parser/change_head.hh"
+#include "lix/libexpr/parser/grammar.hh"
+#include "lix/libexpr/parser/state.hh"
 
 #include <charconv>
 #include <memory>
@@ -18,7 +18,7 @@
 // While that is correct and generally not great, it is one of the less bad options to pick
 // in terms of diff noise.
 // NOLINTNEXTLINE(bugprone-suspicious-include)
-#include "parser-impl1.inc.cc"
+#include "lix/libexpr/parser/parser-impl1.inc.cc"
 
 namespace nix {
 

src/libexpr/parser/state.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "eval.hh"
-#include "logging.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libutil/logging.hh"
 
 namespace nix::parser {
 

src/libexpr/paths.cc

@@ -1,4 +1,4 @@
-#include "eval.hh"
+#include "lix/libexpr/eval.hh"
 
 namespace nix {
 

src/libexpr/pos-table.hh

@@ -5,10 +5,10 @@
 #include <numeric>
 #include <vector>
 
-#include "chunked-vector.hh"
-#include "pos-idx.hh"
-#include "position.hh"
-#include "sync.hh"
+#include "lix/libutil/chunked-vector.hh"
+#include "lix/libexpr/pos-idx.hh"
+#include "lix/libutil/position.hh"
+#include "lix/libutil/sync.hh"
 
 namespace nix {
 

src/libexpr/primops.cc

@@ -1,21 +1,21 @@
-#include "archive.hh"
-#include "derivations.hh"
-#include "downstream-placeholder.hh"
-#include "eval-inline.hh"
-#include "eval.hh"
-#include "eval-settings.hh"
-#include "extra-primops.hh"
-#include "gc-small-vector.hh"
-#include "globals.hh"
-#include "json-to-value.hh"
-#include "names.hh"
-#include "path-references.hh"
-#include "processes.hh"
-#include "store-api.hh"
-#include "value-to-json.hh"
-#include "value-to-xml.hh"
-#include "primops.hh"
-#include "fetch-to-store.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/downstream-placeholder.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libexpr/extra-primops.hh"
+#include "lix/libexpr/gc-small-vector.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libexpr/json-to-value.hh"
+#include "lix/libstore/names.hh"
+#include "lix/libstore/path-references.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libexpr/value-to-json.hh"
+#include "lix/libexpr/value-to-xml.hh"
+#include "lix/libexpr/primops.hh"
+#include "lix/libfetchers/fetch-to-store.hh"
 
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>

src/libexpr/primops.hh

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

src/libexpr/primops/context.cc

@@ -1,8 +1,8 @@
-#include "primops.hh"
-#include "eval-inline.hh"
-#include "extra-primops.hh"
-#include "derivations.hh"
-#include "store-api.hh"
+#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/extra-primops.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 

src/libexpr/primops/fetchClosure.cc

@@ -1,8 +1,8 @@
-#include "primops.hh"
-#include "extra-primops.hh"
-#include "store-api.hh"
-#include "make-content-addressed.hh"
-#include "url.hh"
+#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/extra-primops.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/make-content-addressed.hh"
+#include "lix/libutil/url.hh"
 
 namespace nix {
 

src/libexpr/primops/fetchMercurial.cc

@@ -1,10 +1,10 @@
-#include "primops.hh"
-#include "eval-inline.hh"
-#include "eval-settings.hh"
-#include "store-api.hh"
-#include "fetchers.hh"
-#include "url.hh"
-#include "url-parts.hh"
+#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/url-parts.hh"
 
 namespace nix {
 

src/libexpr/primops/fetchTree.cc

@@ -1,12 +1,12 @@
-#include "primops.hh"
-#include "eval-inline.hh"
-#include "eval-settings.hh"
-#include "extra-primops.hh"
-#include "store-api.hh"
-#include "fetchers.hh"
-#include "filetransfer.hh"
-#include "registry.hh"
-#include "url.hh"
+#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval-settings.hh"
+#include "lix/libexpr/extra-primops.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libfetchers/fetchers.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libfetchers/registry.hh"
+#include "lix/libutil/url.hh"
 
 #include <ctime>
 #include <iomanip>

src/libexpr/primops/fromTOML.cc

@@ -1,6 +1,6 @@
-#include "primops.hh"
-#include "eval-inline.hh"
-#include "extra-primops.hh"
+#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/extra-primops.hh"
 
 #include <sstream>
 #include <toml.hpp>

src/libexpr/print-ambiguous.cc

@@ -1,9 +1,9 @@
-#include "print-ambiguous.hh"
-#include "attr-set.hh"
-#include "logging.hh"
-#include "print.hh"
-#include "signals.hh"
-#include "escape-string.hh"
+#include "lix/libexpr/print-ambiguous.hh"
+#include "lix/libexpr/attr-set.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libexpr/print.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/escape-string.hh"
 
 namespace nix {
 

src/libexpr/print-ambiguous.hh

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

src/libexpr/print.cc

@@ -3,14 +3,14 @@
 #include <unordered_set>
 #include <sstream>
 
-#include "escape-string.hh"
-#include "print.hh"
-#include "ansicolor.hh"
-#include "store-api.hh"
-#include "english.hh"
-#include "signals.hh"
-#include "eval.hh"
-#include "terminal.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libexpr/print.hh"
+#include "lix/libutil/ansicolor.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libutil/english.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libutil/terminal.hh"
 
 namespace nix {
 

src/libexpr/print.hh

@@ -9,9 +9,9 @@
 
 #include <iostream>
 
-#include "fmt.hh"
-#include "print-options.hh"
-#include "print-elided.hh"
+#include "lix/libutil/fmt.hh"
+#include "lix/libexpr/print-options.hh"
+#include "lix/libutil/print-elided.hh"
 
 namespace nix {
 

src/libexpr/search-path.cc

@@ -1,4 +1,4 @@
-#include "search-path.hh"
+#include "lix/libexpr/search-path.hh"
 
 namespace nix {
 

src/libexpr/search-path.hh

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

src/libexpr/symbol-table.hh

@@ -5,8 +5,8 @@
 #include <map>
 #include <unordered_map>
 
-#include "types.hh"
-#include "chunked-vector.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/chunked-vector.hh"
 
 namespace nix {
 

src/libexpr/value-to-json.cc

@@ -1,7 +1,7 @@
-#include "value-to-json.hh"
-#include "eval-inline.hh"
-#include "signals.hh"
-#include "store-api.hh"
+#include "lix/libexpr/value-to-json.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libstore/store-api.hh"
 
 #include <cstdlib>
 #include <iomanip>

src/libexpr/value-to-json.hh

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

src/libexpr/value-to-xml.cc

@@ -1,6 +1,6 @@
-#include "value-to-xml.hh"
-#include "xml-writer.hh"
-#include "signals.hh"
+#include "lix/libexpr/value-to-xml.hh"
+#include "lix/libutil/xml-writer.hh"
+#include "lix/libutil/signals.hh"
 
 
 namespace nix {

src/libexpr/value-to-xml.hh

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

src/libexpr/value.cc

@@ -1,9 +1,9 @@
-#include "value.hh"
+#include "lix/libexpr/value.hh"
 
 #include <ostream>
 
-#include "eval.hh"
-#include "print.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/print.hh"
 
 
 namespace nix

src/libexpr/value.hh

@@ -7,14 +7,14 @@
 #include <ranges>
 #include <span>
 
-#include "gc-alloc.hh"
-#include "symbol-table.hh"
-#include "value/context.hh"
-#include "input-accessor.hh"
-#include "source-path.hh"
-#include "print-options.hh"
-#include "checked-arithmetic.hh"
-#include "concepts.hh"
+#include "lix/libexpr/gc-alloc.hh"
+#include "lix/libexpr/symbol-table.hh"
+#include "lix/libexpr/value/context.hh"
+#include "lix/libutil/input-accessor.hh"
+#include "lix/libutil/source-path.hh"
+#include "lix/libexpr/print-options.hh"
+#include "lix/libutil/checked-arithmetic.hh"
+#include "lix/libutil/concepts.hh"
 
 #include <nlohmann/json_fwd.hpp>
 

src/libexpr/value/context.cc

@@ -1,4 +1,4 @@
-#include "value/context.hh"
+#include "lix/libexpr/value/context.hh"
 
 #include <optional>
 

src/libexpr/value/context.hh

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