diff --git a/lix/legacy/nix-build.cc b/lix/legacy/nix-build.cc
index 87ca8cd18..94aba0c07 100644
--- a/lix/legacy/nix-build.cc
+++ b/lix/legacy/nix-build.cc
@@ -1,7 +1,5 @@
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <filesystem>
 #include <regex>
 #include <sstream>
 #include <vector>
@@ -16,7 +14,6 @@
 #include "lix/libmain/shared.hh"
 #include "lix/libstore/path-with-outputs.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/get-drvs.hh"
 #include "lix/libcmd/common-eval-args.hh"
 #include "lix/libexpr/attr-path.hh"
diff --git a/lix/legacy/nix-collect-garbage.cc b/lix/legacy/nix-collect-garbage.cc
index 3d736e6cd..a3b4dd835 100644
--- a/lix/legacy/nix-collect-garbage.cc
+++ b/lix/legacy/nix-collect-garbage.cc
@@ -10,7 +10,6 @@
 #include "lix/libutil/types.hh"
 #include "nix-collect-garbage.hh"
 
-#include <iostream>
 #include <cerrno>
 
 namespace nix {
diff --git a/lix/legacy/nix-env.cc b/lix/legacy/nix-env.cc
index e18eb3650..5d2b4ad7b 100644
--- a/lix/legacy/nix-env.cc
+++ b/lix/legacy/nix-env.cc
@@ -13,7 +13,6 @@
 #include "lix/libstore/store-api.hh"
 #include "lix/libstore/local-fs-store.hh"
 #include "user-env.hh"
-#include "lix/libutil/json.hh"
 #include "lix/libutil/users.hh"
 #include "lix/libexpr/value-to-json.hh"
 #include "lix/libutil/xml-writer.hh"
diff --git a/lix/legacy/nix-instantiate.cc b/lix/legacy/nix-instantiate.cc
index 0c442a709..26da93c69 100644
--- a/lix/legacy/nix-instantiate.cc
+++ b/lix/legacy/nix-instantiate.cc
@@ -2,7 +2,6 @@
 #include "lix/libexpr/print-ambiguous.hh"
 #include "lix/libmain/shared.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/get-drvs.hh"
 #include "lix/libexpr/attr-path.hh"
 #include "lix/libexpr/value-to-xml.hh"
@@ -13,7 +12,6 @@
 #include "lix/libcmd/legacy.hh"
 #include "nix-instantiate.hh"
 
-#include <map>
 #include <iostream>
 
 
diff --git a/lix/legacy/nix-store.cc b/lix/legacy/nix-store.cc
index 370894ffe..15d9fe1d9 100644
--- a/lix/legacy/nix-store.cc
+++ b/lix/legacy/nix-store.cc
@@ -5,14 +5,14 @@
 #include "lix/libutil/async.hh"
 #include "lix/libutil/exit.hh"
 #include "lix/libstore/globals.hh"
-#include "lix/libstore/build-result.hh"
+#include "lix/libstore/build-result.hh" // IWYU pragma: keep
 #include "lix/libstore/store-cast.hh"
 #include "lix/libstore/gc-store.hh"
 #include "lix/libstore/log-store.hh"
 #include "lix/libstore/local-store.hh"
 #include "lix/libutil/monitor-fd.hh"
 #include "lix/libstore/serve-protocol.hh"
-#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libstore/serve-protocol-impl.hh" // IWYU pragma: keep
 #include "lix/libmain/shared.hh"
 #include "graphml.hh"
 #include "lix/libcmd/legacy.hh"
diff --git a/lix/legacy/user-env.cc b/lix/legacy/user-env.cc
index cbaf52e30..bc931c20a 100644
--- a/lix/legacy/user-env.cc
+++ b/lix/legacy/user-env.cc
@@ -3,10 +3,8 @@
 #include "lix/libstore/store-api.hh"
 #include "lix/libstore/path-with-outputs.hh"
 #include "lix/libstore/local-fs-store.hh"
-#include "lix/libstore/globals.hh"
 #include "lix/libmain/shared.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libstore/profiles.hh"
 #include "lix/libexpr/print-ambiguous.hh"
 
diff --git a/lix/libcmd/built-path.cc b/lix/libcmd/built-path.cc
index ef2f8182c..677e4af32 100644
--- a/lix/libcmd/built-path.cc
+++ b/lix/libcmd/built-path.cc
@@ -7,8 +7,6 @@
 
 #include <kj/async.h>
 
-#include <optional>
-
 namespace nix {
 
 #define CMP_ONE(CHILD_TYPE, MY_TYPE, FIELD, COMPARATOR) \
diff --git a/lix/libcmd/cmd-profiles.hh b/lix/libcmd/cmd-profiles.hh
index c08370a39..322154803 100644
--- a/lix/libcmd/cmd-profiles.hh
+++ b/lix/libcmd/cmd-profiles.hh
@@ -7,8 +7,6 @@
 #include "lix/libexpr/get-drvs.hh"
 #include "lix/libutil/types.hh"
 #include "lix/libutil/json-fwd.hh"
-#include "lix/libutil/url.hh"
-#include "lix/libutil/url-name.hh"
 
 #include <string>
 #include <set>
diff --git a/lix/libcmd/command.cc b/lix/libcmd/command.cc
index 7f77c19be..ce306c545 100644
--- a/lix/libcmd/command.cc
+++ b/lix/libcmd/command.cc
@@ -2,7 +2,6 @@
 #include "lix/libstore/store-api.hh"
 #include "lix/libstore/local-fs-store.hh"
 #include "lix/libstore/derivations.hh"
-#include "lix/libexpr/nixexpr.hh"
 #include "lix/libstore/profiles.hh"
 #include "lix/libcmd/repl.hh"
 
diff --git a/lix/libcmd/installable-flake.cc b/lix/libcmd/installable-flake.cc
index 3db1f6031..9586e7d24 100644
--- a/lix/libcmd/installable-flake.cc
+++ b/lix/libcmd/installable-flake.cc
@@ -1,24 +1,11 @@
-#include "lix/libstore/globals.hh"
 #include "lix/libcmd/installable-flake.hh"
-#include "lix/libcmd/installable-derived-path.hh"
 #include "lix/libstore/outputs-spec.hh"
 #include "lix/libcmd/command.hh"
 #include "lix/libexpr/attr-path.hh"
 #include "lix/libcmd/common-eval-args.hh"
-#include "lix/libstore/derivations.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/get-drvs.hh"
-#include "lix/libstore/store-api.hh"
-#include "lix/libmain/shared.hh"
 #include "lix/libexpr/flake/flake.hh"
 #include "lix/libexpr/eval-cache.hh"
-#include "lix/libutil/url.hh"
-#include "lix/libfetchers/registry.hh"
-#include "lix/libstore/build-result.hh"
-
-#include <regex>
-#include <queue>
 
 #include <nlohmann/json.hpp>
 
diff --git a/lix/libcmd/installables.hh b/lix/libcmd/installables.hh
index 423ea33d8..39e4f79a4 100644
--- a/lix/libcmd/installables.hh
+++ b/lix/libcmd/installables.hh
@@ -3,7 +3,6 @@
 
 #include "lix/libexpr/eval.hh"
 #include "lix/libstore/path.hh"
-#include "lix/libstore/outputs-spec.hh"
 #include "lix/libstore/derived-path.hh"
 #include "lix/libcmd/built-path.hh"
 #include "lix/libstore/store-api.hh"
diff --git a/lix/libcmd/repl.cc b/lix/libcmd/repl.cc
index 315cd4851..383183a24 100644
--- a/lix/libcmd/repl.cc
+++ b/lix/libcmd/repl.cc
@@ -12,10 +12,7 @@
 
 #include "lix/libutil/ansicolor.hh"
 #include "lix/libmain/shared.hh"
-#include "lix/libutil/escape-string.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/eval-cache.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/eval-settings.hh"
 #include "lix/libexpr/attr-path.hh"
 #include "lix/libutil/signals.hh"
diff --git a/lix/libexpr/attr-path.cc b/lix/libexpr/attr-path.cc
index ab93fd9c9..670d18814 100644
--- a/lix/libexpr/attr-path.cc
+++ b/lix/libexpr/attr-path.cc
@@ -1,5 +1,4 @@
 #include "lix/libexpr/attr-path.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libutil/strings.hh"
 #include "print-options.hh"
 #include <algorithm>
diff --git a/lix/libexpr/attr-path.hh b/lix/libexpr/attr-path.hh
index 0c5480ada..ba11411f1 100644
--- a/lix/libexpr/attr-path.hh
+++ b/lix/libexpr/attr-path.hh
@@ -4,7 +4,6 @@
 #include "lix/libexpr/eval.hh"
 
 #include <string>
-#include <map>
 
 namespace nix {
 
diff --git a/lix/libexpr/attr-set.hh b/lix/libexpr/attr-set.hh
index 374a10763..8bdb13c5e 100644
--- a/lix/libexpr/attr-set.hh
+++ b/lix/libexpr/attr-set.hh
@@ -5,7 +5,6 @@
 #include "lix/libexpr/symbol-table.hh"
 
 #include <algorithm>
-#include <optional>
 
 namespace nix {
 
diff --git a/lix/libexpr/eval-cache.hh b/lix/libexpr/eval-cache.hh
index 42a74d246..5cd78f027 100644
--- a/lix/libexpr/eval-cache.hh
+++ b/lix/libexpr/eval-cache.hh
@@ -1,7 +1,6 @@
 #pragma once
 ///@file
 
-#include "lix/libutil/sync.hh"
 #include "lix/libutil/hash.hh"
 #include "lix/libexpr/eval.hh"
 
diff --git a/lix/libexpr/eval.cc b/lix/libexpr/eval.cc
index 3e3490ec4..f4920992b 100644
--- a/lix/libexpr/eval.cc
+++ b/lix/libexpr/eval.cc
@@ -7,7 +7,6 @@
 #include "lix/libutil/error.hh"
 #include "lix/libutil/english.hh"
 #include "lix/libutil/fmt.hh"
-#include "lix/libutil/hash.hh"
 #include "lix/libexpr/primops.hh"
 #include "lix/libexpr/print-options.hh"
 #include "lix/libmain/shared.hh"
@@ -17,8 +16,6 @@
 #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"
diff --git a/lix/libexpr/flake/flake.cc b/lix/libexpr/flake/flake.cc
index c5eeac831..507b95b38 100644
--- a/lix/libexpr/flake/flake.cc
+++ b/lix/libexpr/flake/flake.cc
@@ -3,8 +3,6 @@
 #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/async.hh"
diff --git a/lix/libexpr/flake/flakeref.hh b/lix/libexpr/flake/flakeref.hh
index 4c0897b39..7209f9d5b 100644
--- a/lix/libexpr/flake/flakeref.hh
+++ b/lix/libexpr/flake/flakeref.hh
@@ -2,12 +2,9 @@
 ///@file
 
 #include "lix/libutil/types.hh"
-#include "lix/libutil/hash.hh"
 #include "lix/libfetchers/fetchers.hh"
 #include "lix/libstore/outputs-spec.hh"
 
-#include <variant>
-
 namespace nix {
 
 class Store;
diff --git a/lix/libexpr/flake/lockfile.cc b/lix/libexpr/flake/lockfile.cc
index 808618feb..6998d6656 100644
--- a/lix/libexpr/flake/lockfile.cc
+++ b/lix/libexpr/flake/lockfile.cc
@@ -1,5 +1,4 @@
 #include "lix/libexpr/flake/lockfile.hh"
-#include "json-to-value.hh"
 #include "lix/libstore/store-api.hh"
 #include "lix/libutil/error.hh"
 #include "lix/libutil/json.hh"
diff --git a/lix/libexpr/function-trace.hh b/lix/libexpr/function-trace.hh
index 91439b0aa..e18fd0763 100644
--- a/lix/libexpr/function-trace.hh
+++ b/lix/libexpr/function-trace.hh
@@ -1,9 +1,7 @@
 #pragma once
 ///@file
 
-#include "eval.hh"
-
-#include <chrono>
+#include "lix/libutil/position.hh"
 
 namespace nix {
 
diff --git a/lix/libexpr/get-drvs.cc b/lix/libexpr/get-drvs.cc
index d1b611242..55b59e89c 100644
--- a/lix/libexpr/get-drvs.cc
+++ b/lix/libexpr/get-drvs.cc
@@ -1,5 +1,4 @@
 #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/path.hh"
diff --git a/lix/libexpr/json-to-value.cc b/lix/libexpr/json-to-value.cc
index c1939a32b..c5c99604c 100644
--- a/lix/libexpr/json-to-value.cc
+++ b/lix/libexpr/json-to-value.cc
@@ -4,7 +4,6 @@
 #include "lix/libutil/json.hh"
 
 #include <limits>
-#include <variant>
 
 namespace nix {
 
diff --git a/lix/libexpr/json-to-value.hh b/lix/libexpr/json-to-value.hh
index 78778b373..ab66284a1 100644
--- a/lix/libexpr/json-to-value.hh
+++ b/lix/libexpr/json-to-value.hh
@@ -3,7 +3,7 @@
 
 #include "lix/libutil/error.hh"
 
-#include <string>
+#include <string_view>
 
 namespace nix {
 
diff --git a/lix/libexpr/nixexpr.cc b/lix/libexpr/nixexpr.cc
index bdc858558..ad1cb3682 100644
--- a/lix/libexpr/nixexpr.cc
+++ b/lix/libexpr/nixexpr.cc
@@ -1,9 +1,7 @@
 #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>
diff --git a/lix/libexpr/nixexpr.hh b/lix/libexpr/nixexpr.hh
index e4de3a731..780c4ccb8 100644
--- a/lix/libexpr/nixexpr.hh
+++ b/lix/libexpr/nixexpr.hh
@@ -6,12 +6,9 @@
 
 #include "lix/libexpr/value.hh"
 #include "lix/libexpr/symbol-table.hh"
-#include "lix/libutil/error.hh"
 #include "lix/libutil/json.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 {
diff --git a/lix/libexpr/parser/grammar.hh b/lix/libexpr/parser/grammar.hh
index 5a97614d9..1266e3b53 100644
--- a/lix/libexpr/parser/grammar.hh
+++ b/lix/libexpr/parser/grammar.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "tao/pegtl.hpp"
+#include "tao/pegtl.hpp" // IWYU pragma: keep
 #include <type_traits>
 #include <variant>
 
diff --git a/lix/libexpr/parser/parser-impl1.inc.cc b/lix/libexpr/parser/parser-impl1.inc.cc
index 62f12e34e..98d3f383b 100644
--- a/lix/libexpr/parser/parser-impl1.inc.cc
+++ b/lix/libexpr/parser/parser-impl1.inc.cc
@@ -1,3 +1,14 @@
+#include "eval-settings.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libexpr/parser/change_head.hh"
+#include "lix/libexpr/parser/grammar.hh"
+#include "lix/libexpr/parser/state.hh"
+#include "lix/libexpr/pos-idx.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/users.hh"
+
+#include <charconv>
+
 // flip this define when doing parser development to enable some g checks.
 #if 0
 #include <tao/pegtl/contrib/analyze.hpp>
diff --git a/lix/libexpr/parser/parser.cc b/lix/libexpr/parser/parser.cc
index f6364e399..c7354c525 100644
--- a/lix/libexpr/parser/parser.cc
+++ b/lix/libexpr/parser/parser.cc
@@ -1,17 +1,10 @@
-#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 "lix/libexpr/parser/change_head.hh"
 #include "lix/libexpr/parser/grammar.hh"
 #include "lix/libexpr/parser/state.hh"
 
-#include <charconv>
 #include <memory>
 
 // Linter complains that this is a "suspicious include of file with '.cc' extension".
diff --git a/lix/libexpr/parser/state.hh b/lix/libexpr/parser/state.hh
index 6153fcddf..e51af8e26 100644
--- a/lix/libexpr/parser/state.hh
+++ b/lix/libexpr/parser/state.hh
@@ -1,7 +1,8 @@
 #pragma once
 ///@file
 
-#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libexpr/pos-idx.hh"
 #include "lix/libutil/logging.hh"
 
 namespace nix::parser {
diff --git a/lix/libexpr/pos-idx.hh b/lix/libexpr/pos-idx.hh
index 406fc1b36..2677fc8f1 100644
--- a/lix/libexpr/pos-idx.hh
+++ b/lix/libexpr/pos-idx.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include <cinttypes>
+#include <cstdint>
 
 namespace nix {
 
diff --git a/lix/libexpr/pos-table.hh b/lix/libexpr/pos-table.hh
index 05bd8ba45..a77d3b143 100644
--- a/lix/libexpr/pos-table.hh
+++ b/lix/libexpr/pos-table.hh
@@ -1,11 +1,8 @@
 #pragma once
 ///@file
 
-#include <cinttypes>
-#include <numeric>
 #include <vector>
 
-#include "lix/libutil/chunked-vector.hh"
 #include "lix/libexpr/pos-idx.hh"
 #include "lix/libutil/position.hh"
 #include "lix/libutil/sync.hh"
diff --git a/lix/libexpr/primops.cc b/lix/libexpr/primops.cc
index b2bf8ab5a..607ebd8fc 100644
--- a/lix/libexpr/primops.cc
+++ b/lix/libexpr/primops.cc
@@ -1,7 +1,6 @@
 #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"
@@ -18,7 +17,6 @@
 #include "lix/libexpr/value-to-xml.hh"
 #include "lix/libexpr/primops.hh"
 #include "lix/libfetchers/fetch-to-store.hh"
-#include "lix/libutil/result.hh"
 #include "lix/libutil/types.hh"
 
 #include <boost/container/small_vector.hpp>
diff --git a/lix/libexpr/primops.hh b/lix/libexpr/primops.hh
index 91544dc11..4bbfa075a 100644
--- a/lix/libexpr/primops.hh
+++ b/lix/libexpr/primops.hh
@@ -3,7 +3,6 @@
 
 #include "lix/libexpr/eval.hh"
 
-#include <tuple>
 #include <vector>
 
 namespace nix {
diff --git a/lix/libexpr/primops/context.cc b/lix/libexpr/primops/context.cc
index 603368501..178f21a0d 100644
--- a/lix/libexpr/primops/context.cc
+++ b/lix/libexpr/primops/context.cc
@@ -1,5 +1,4 @@
 #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"
diff --git a/lix/libexpr/primops/fetchClosure.cc b/lix/libexpr/primops/fetchClosure.cc
index 07083e646..6343ff34b 100644
--- a/lix/libexpr/primops/fetchClosure.cc
+++ b/lix/libexpr/primops/fetchClosure.cc
@@ -1,4 +1,4 @@
-#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/eval.hh"
 #include "lix/libexpr/extra-primops.hh"
 #include "lix/libstore/store-api.hh"
 #include "lix/libstore/make-content-addressed.hh"
diff --git a/lix/libexpr/primops/fetchMercurial.cc b/lix/libexpr/primops/fetchMercurial.cc
index db89cd131..41727db59 100644
--- a/lix/libexpr/primops/fetchMercurial.cc
+++ b/lix/libexpr/primops/fetchMercurial.cc
@@ -1,9 +1,6 @@
 #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 {
diff --git a/lix/libexpr/primops/fetchTree.cc b/lix/libexpr/primops/fetchTree.cc
index b86b3abe9..93b08ecc9 100644
--- a/lix/libexpr/primops/fetchTree.cc
+++ b/lix/libexpr/primops/fetchTree.cc
@@ -1,5 +1,4 @@
-#include "lix/libexpr/primops.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/libstore/store-api.hh"
diff --git a/lix/libexpr/primops/fromTOML.cc b/lix/libexpr/primops/fromTOML.cc
index b22488684..a3319b15e 100644
--- a/lix/libexpr/primops/fromTOML.cc
+++ b/lix/libexpr/primops/fromTOML.cc
@@ -1,5 +1,4 @@
-#include "lix/libexpr/primops.hh"
-#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval.hh"
 #include "lix/libexpr/extra-primops.hh"
 
 #include <sstream>
diff --git a/lix/libexpr/print-options.hh b/lix/libexpr/print-options.hh
index 080ba26b8..6941126c5 100644
--- a/lix/libexpr/print-options.hh
+++ b/lix/libexpr/print-options.hh
@@ -4,6 +4,7 @@
  * @brief Options for printing Nix values.
  */
 
+#include <cstddef>
 #include <limits>
 
 namespace nix {
diff --git a/lix/libexpr/print.cc b/lix/libexpr/print.cc
index 05bf74863..228c5a6dc 100644
--- a/lix/libexpr/print.cc
+++ b/lix/libexpr/print.cc
@@ -7,9 +7,9 @@
 #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/print-elided.hh"
 #include "lix/libutil/terminal.hh"
 
 namespace nix {
diff --git a/lix/libexpr/print.hh b/lix/libexpr/print.hh
index 5f389dcd8..8392bf5fa 100644
--- a/lix/libexpr/print.hh
+++ b/lix/libexpr/print.hh
@@ -11,7 +11,6 @@
 
 #include "lix/libutil/fmt.hh"
 #include "lix/libexpr/print-options.hh"
-#include "lix/libutil/print-elided.hh"
 
 namespace nix {
 
diff --git a/lix/libexpr/symbol-table.hh b/lix/libexpr/symbol-table.hh
index 84f62cea3..0b99fdadd 100644
--- a/lix/libexpr/symbol-table.hh
+++ b/lix/libexpr/symbol-table.hh
@@ -1,8 +1,6 @@
 #pragma once
 ///@file
 
-#include <list>
-#include <map>
 #include <unordered_map>
 
 #include "lix/libutil/types.hh"
diff --git a/lix/libexpr/value-to-json.cc b/lix/libexpr/value-to-json.cc
index 85187641a..27b6aecb6 100644
--- a/lix/libexpr/value-to-json.cc
+++ b/lix/libexpr/value-to-json.cc
@@ -1,11 +1,9 @@
 #include "lix/libexpr/value-to-json.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libutil/json.hh"
 #include "lix/libutil/signals.hh"
 #include "lix/libstore/store-api.hh"
 
 #include <cstdlib>
-#include <iomanip>
 
 
 namespace nix {
diff --git a/lix/libexpr/value-to-json.hh b/lix/libexpr/value-to-json.hh
index c08f268b5..81ee4e8f0 100644
--- a/lix/libexpr/value-to-json.hh
+++ b/lix/libexpr/value-to-json.hh
@@ -5,9 +5,6 @@
 #include "lix/libexpr/eval.hh"
 #include "lix/libutil/json-fwd.hh"
 
-#include <string>
-#include <map>
-
 namespace nix {
 
 JSON printValueAsJSON(EvalState & state, bool strict,
diff --git a/lix/libexpr/value-to-xml.hh b/lix/libexpr/value-to-xml.hh
index b8563d282..7d28b7d67 100644
--- a/lix/libexpr/value-to-xml.hh
+++ b/lix/libexpr/value-to-xml.hh
@@ -4,9 +4,6 @@
 #include "lix/libexpr/nixexpr.hh"
 #include "lix/libexpr/eval.hh"
 
-#include <string>
-#include <map>
-
 namespace nix {
 
 void printValueAsXML(EvalState & state, bool strict, bool location,
diff --git a/lix/libexpr/value.hh b/lix/libexpr/value.hh
index 03b6c67ad..275f003c1 100644
--- a/lix/libexpr/value.hh
+++ b/lix/libexpr/value.hh
@@ -10,7 +10,6 @@
 #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"
diff --git a/lix/libexpr/value/context.cc b/lix/libexpr/value/context.cc
index 77cca78d3..eca91cdd0 100644
--- a/lix/libexpr/value/context.cc
+++ b/lix/libexpr/value/context.cc
@@ -1,7 +1,5 @@
 #include "lix/libexpr/value/context.hh"
 
-#include <optional>
-
 namespace nix {
 
 NixStringContextElem NixStringContextElem::parse(
diff --git a/lix/libutil/json.hh b/lix/libutil/json.hh
index 64e5fc7f3..989b5b061 100644
--- a/lix/libutil/json.hh
+++ b/lix/libutil/json.hh
@@ -9,9 +9,9 @@
 
 #include "lix/libutil/error.hh"
 #include "lix/libutil/fmt.hh"
-#include "lix/libutil/json-fwd.hh" // IWYU pragma: keep
+#include "lix/libutil/json-fwd.hh" // IWYU pragma: export
 #include <concepts>
-#include <nlohmann/json.hpp> // IWYU pragma: keep
+#include <nlohmann/json.hpp> // IWYU pragma: export
 #include <list>
 #include <string_view>
 #include <type_traits>