From 8df041cbc6686eebda7efced8dab256838cff900 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 12 Jul 2024 15:37:54 +0200
Subject: [PATCH] Solve unused header warnings reported by clangd

---
 src/libcmd/repl.cc                          |  4 +---
 src/libexpr-c/nix_api_expr.cc               |  4 +---
 src/libexpr/attr-set.hh                     |  1 -
 src/libexpr/eval-error.hh                   |  2 --
 src/libexpr/eval-settings.hh                |  1 +
 src/libexpr/eval.cc                         |  4 +---
 src/libexpr/eval.hh                         |  6 +++---
 src/libexpr/nixexpr.cc                      |  1 -
 src/libexpr/nixexpr.hh                      |  3 ---
 src/libexpr/pos-table.hh                    |  4 +---
 src/libexpr/primops.cc                      |  1 -
 src/libexpr/value.hh                        |  1 -
 src/libfetchers/fetchers.hh                 |  2 ++
 src/libfetchers/tarball.cc                  |  2 --
 src/libfetchers/tarball.hh                  |  9 +++++----
 src/libflake/flake/flakeref.hh              |  6 ++----
 src/libflake/flake/lockfile.cc              |  3 ++-
 src/libmain/shared.cc                       |  2 +-
 src/libmain/shared.hh                       |  4 ----
 src/libstore/derivations.hh                 |  1 -
 src/libstore/derived-path.hh                |  1 +
 src/libstore/filetransfer.hh                | 10 ++++++----
 src/libstore/gc-store.hh                    |  3 ++-
 src/libstore/machines.hh                    |  2 +-
 src/libstore/misc.cc                        |  2 ++
 src/libstore/nar-accessor.cc                |  1 -
 src/libstore/serve-protocol-impl.hh         |  1 -
 src/libstore/store-api.hh                   |  4 ----
 src/libstore/unix/user-lock.cc              |  7 ++++---
 src/libstore/unix/user-lock.hh              |  6 ++----
 src/libutil/args.hh                         |  2 +-
 src/libutil/error.hh                        |  4 ----
 src/libutil/file-content-address.hh         |  2 --
 src/libutil/fs-sink.hh                      |  1 -
 src/libutil/logging.hh                      |  1 -
 src/libutil/ref.hh                          |  2 --
 src/libutil/source-accessor.hh              |  1 +
 src/libutil/terminal.hh                     |  3 ++-
 src/libutil/types.hh                        |  2 --
 src/nix-store/nix-store.cc                  |  6 +++---
 src/nix/config-check.cc                     |  1 +
 src/nix/env.cc                              |  4 +++-
 src/nix/flake.cc                            |  1 -
 src/nix/main.cc                             |  3 +--
 src/nix/verify.cc                           |  4 ++--
 tests/unit/libexpr-support/tests/libexpr.hh |  2 +-
 46 files changed, 53 insertions(+), 84 deletions(-)

diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc
index ce1c5af69..dc5a311e7 100644
--- a/src/libcmd/repl.cc
+++ b/src/libcmd/repl.cc
@@ -1,7 +1,6 @@
 #include <iostream>
 #include <cstdlib>
 #include <cstring>
-#include <climits>
 
 #include "repl-interacter.hh"
 #include "repl.hh"
@@ -10,8 +9,6 @@
 #include "shared.hh"
 #include "config-global.hh"
 #include "eval.hh"
-#include "eval-cache.hh"
-#include "eval-inline.hh"
 #include "eval-settings.hh"
 #include "attr-path.hh"
 #include "signals.hh"
@@ -29,6 +26,7 @@
 #include "markdown.hh"
 #include "local-fs-store.hh"
 #include "print.hh"
+#include "ref.hh"
 
 #if HAVE_BOEHMGC
 #define GC_INCLUDE_NEW
diff --git a/src/libexpr-c/nix_api_expr.cc b/src/libexpr-c/nix_api_expr.cc
index 13e0f5f3a..2494c653c 100644
--- a/src/libexpr-c/nix_api_expr.cc
+++ b/src/libexpr-c/nix_api_expr.cc
@@ -1,12 +1,10 @@
 #include <cstring>
-#include <iostream>
 #include <stdexcept>
 #include <string>
 
-#include "config.hh"
 #include "eval.hh"
+#include "eval-gc.hh"
 #include "globals.hh"
-#include "util.hh"
 #include "eval-settings.hh"
 
 #include "nix_api_expr.h"
diff --git a/src/libexpr/attr-set.hh b/src/libexpr/attr-set.hh
index ba798196d..9d10783d9 100644
--- a/src/libexpr/attr-set.hh
+++ b/src/libexpr/attr-set.hh
@@ -5,7 +5,6 @@
 #include "symbol-table.hh"
 
 #include <algorithm>
-#include <optional>
 
 namespace nix {
 
diff --git a/src/libexpr/eval-error.hh b/src/libexpr/eval-error.hh
index fe48e054b..2f6046473 100644
--- a/src/libexpr/eval-error.hh
+++ b/src/libexpr/eval-error.hh
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <algorithm>
-
 #include "error.hh"
 #include "pos-idx.hh"
 
diff --git a/src/libexpr/eval-settings.hh b/src/libexpr/eval-settings.hh
index 191dde21a..b915ba530 100644
--- a/src/libexpr/eval-settings.hh
+++ b/src/libexpr/eval-settings.hh
@@ -2,6 +2,7 @@
 ///@file
 
 #include "config.hh"
+#include "ref.hh"
 
 namespace nix {
 
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index efca9dd2f..1da934693 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -1,6 +1,6 @@
 #include "eval.hh"
+#include "eval-gc.hh"
 #include "eval-settings.hh"
-#include "hash.hh"
 #include "primops.hh"
 #include "print-options.hh"
 #include "exit.hh"
@@ -16,7 +16,6 @@
 #include "print.hh"
 #include "filtering-source-accessor.hh"
 #include "memory-source-accessor.hh"
-#include "signals.hh"
 #include "gc-small-vector.hh"
 #include "url.hh"
 #include "fetch-to-store.hh"
@@ -24,7 +23,6 @@
 #include "parser-tab.hh"
 
 #include <algorithm>
-#include <chrono>
 #include <iostream>
 #include <sstream>
 #include <cstring>
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index e45358055..e5818a501 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -3,21 +3,21 @@
 
 #include "attr-set.hh"
 #include "eval-error.hh"
-#include "eval-gc.hh"
 #include "types.hh"
 #include "value.hh"
 #include "nixexpr.hh"
 #include "symbol-table.hh"
 #include "config.hh"
 #include "experimental-features.hh"
+#include "position.hh"
+#include "pos-table.hh"
 #include "source-accessor.hh"
 #include "search-path.hh"
 #include "repl-exit-status.hh"
+#include "ref.hh"
 
 #include <map>
 #include <optional>
-#include <unordered_map>
-#include <mutex>
 #include <functional>
 
 namespace nix {
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 44198a252..816389165 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -1,5 +1,4 @@
 #include "nixexpr.hh"
-#include "derivations.hh"
 #include "eval.hh"
 #include "symbol-table.hh"
 #include "util.hh"
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index e37e3bdd1..5152e3119 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -6,11 +6,8 @@
 
 #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"
 
 namespace nix {
 
diff --git a/src/libexpr/pos-table.hh b/src/libexpr/pos-table.hh
index 8a0a3ba86..ba2b91cf3 100644
--- a/src/libexpr/pos-table.hh
+++ b/src/libexpr/pos-table.hh
@@ -1,10 +1,8 @@
 #pragma once
 
-#include <cinttypes>
-#include <numeric>
+#include <cstdint>
 #include <vector>
 
-#include "chunked-vector.hh"
 #include "pos-idx.hh"
 #include "position.hh"
 #include "sync.hh"
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index bcde0bb12..127823d49 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1,4 +1,3 @@
-#include "archive.hh"
 #include "derivations.hh"
 #include "downstream-placeholder.hh"
 #include "eval-inline.hh"
diff --git a/src/libexpr/value.hh b/src/libexpr/value.hh
index 208cab21d..1f7b75f6e 100644
--- a/src/libexpr/value.hh
+++ b/src/libexpr/value.hh
@@ -2,7 +2,6 @@
 ///@file
 
 #include <cassert>
-#include <climits>
 #include <span>
 
 #include "symbol-table.hh"
diff --git a/src/libfetchers/fetchers.hh b/src/libfetchers/fetchers.hh
index 551be9a1f..6126b263c 100644
--- a/src/libfetchers/fetchers.hh
+++ b/src/libfetchers/fetchers.hh
@@ -11,6 +11,8 @@
 #include <memory>
 #include <nlohmann/json_fwd.hpp>
 
+#include "ref.hh"
+
 namespace nix { class Store; class StorePath; struct SourceAccessor; }
 
 namespace nix::fetchers {
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
index aa8ff652f..4425575bd 100644
--- a/src/libfetchers/tarball.cc
+++ b/src/libfetchers/tarball.cc
@@ -2,12 +2,10 @@
 #include "fetchers.hh"
 #include "cache.hh"
 #include "filetransfer.hh"
-#include "globals.hh"
 #include "store-api.hh"
 #include "archive.hh"
 #include "tarfile.hh"
 #include "types.hh"
-#include "split.hh"
 #include "store-path-accessor.hh"
 #include "store-api.hh"
 #include "git-utils.hh"
diff --git a/src/libfetchers/tarball.hh b/src/libfetchers/tarball.hh
index ba0dfd623..d9bdd123d 100644
--- a/src/libfetchers/tarball.hh
+++ b/src/libfetchers/tarball.hh
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "types.hh"
-#include "path.hh"
-#include "hash.hh"
-
 #include <optional>
 
+#include "hash.hh"
+#include "path.hh"
+#include "ref.hh"
+#include "types.hh"
+
 namespace nix {
 class Store;
 struct SourceAccessor;
diff --git a/src/libflake/flake/flakeref.hh b/src/libflake/flake/flakeref.hh
index 04c812ed0..54794ccab 100644
--- a/src/libflake/flake/flakeref.hh
+++ b/src/libflake/flake/flakeref.hh
@@ -1,14 +1,12 @@
 #pragma once
 ///@file
 
+#include <regex>
+
 #include "types.hh"
-#include "hash.hh"
 #include "fetchers.hh"
 #include "outputs-spec.hh"
 
-#include <regex>
-#include <variant>
-
 namespace nix {
 
 class Store;
diff --git a/src/libflake/flake/lockfile.cc b/src/libflake/flake/lockfile.cc
index d252214dd..83ca2c678 100644
--- a/src/libflake/flake/lockfile.cc
+++ b/src/libflake/flake/lockfile.cc
@@ -1,6 +1,7 @@
+#include <unordered_set>
+
 #include "lockfile.hh"
 #include "store-api.hh"
-#include "url-parts.hh"
 
 #include <algorithm>
 #include <iomanip>
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index fc55fe3f1..fee4d0c1e 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -8,7 +8,6 @@
 #include "signals.hh"
 
 #include <algorithm>
-#include <cctype>
 #include <exception>
 #include <iostream>
 
@@ -23,6 +22,7 @@
 
 #include <openssl/crypto.h>
 
+#include "exit.hh"
 
 namespace nix {
 
diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh
index aa44e1321..712b404d3 100644
--- a/src/libmain/shared.hh
+++ b/src/libmain/shared.hh
@@ -8,13 +8,9 @@
 #include "common-args.hh"
 #include "path.hh"
 #include "derived-path.hh"
-#include "exit.hh"
 
 #include <signal.h>
 
-#include <locale>
-
-
 namespace nix {
 
 int handleExceptions(const std::string & programName, std::function<void()> fun);
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 522523e45..9b82e5d12 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -14,7 +14,6 @@
 #include <map>
 #include <variant>
 
-
 namespace nix {
 
 struct StoreDirConfig;
diff --git a/src/libstore/derived-path.hh b/src/libstore/derived-path.hh
index b238f844e..af66ed4f0 100644
--- a/src/libstore/derived-path.hh
+++ b/src/libstore/derived-path.hh
@@ -5,6 +5,7 @@
 #include "outputs-spec.hh"
 #include "comparator.hh"
 #include "config.hh"
+#include "ref.hh"
 
 #include <variant>
 
diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh
index 1c271cbec..1f5b4ab93 100644
--- a/src/libstore/filetransfer.hh
+++ b/src/libstore/filetransfer.hh
@@ -1,13 +1,15 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "hash.hh"
-#include "config.hh"
-
 #include <string>
 #include <future>
 
+#include "logging.hh"
+#include "types.hh"
+#include "ref.hh"
+#include "config.hh"
+#include "serialise.hh"
+
 namespace nix {
 
 struct FileTransferSettings : Config
diff --git a/src/libstore/gc-store.hh b/src/libstore/gc-store.hh
index ab1059fb1..020f770b0 100644
--- a/src/libstore/gc-store.hh
+++ b/src/libstore/gc-store.hh
@@ -1,8 +1,9 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include <unordered_set>
 
+#include "store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/machines.hh b/src/libstore/machines.hh
index 2a55c4456..983652d5f 100644
--- a/src/libstore/machines.hh
+++ b/src/libstore/machines.hh
@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "ref.hh"
 #include "store-reference.hh"
 
 namespace nix {
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index cc3f4884f..dd0efbe19 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -1,3 +1,5 @@
+#include <unordered_set>
+
 #include "derivations.hh"
 #include "parsed-derivations.hh"
 #include "globals.hh"
diff --git a/src/libstore/nar-accessor.cc b/src/libstore/nar-accessor.cc
index b1079b027..6376efbf4 100644
--- a/src/libstore/nar-accessor.cc
+++ b/src/libstore/nar-accessor.cc
@@ -3,7 +3,6 @@
 
 #include <map>
 #include <stack>
-#include <algorithm>
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libstore/serve-protocol-impl.hh b/src/libstore/serve-protocol-impl.hh
index 67bc5dc6e..6f3b177ac 100644
--- a/src/libstore/serve-protocol-impl.hh
+++ b/src/libstore/serve-protocol-impl.hh
@@ -10,7 +10,6 @@
 
 #include "serve-protocol.hh"
 #include "length-prefixed-protocol-helper.hh"
-#include "store-api.hh"
 
 namespace nix {
 
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index a5effb4c1..749d7ea09 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -18,14 +18,10 @@
 
 #include <nlohmann/json_fwd.hpp>
 #include <atomic>
-#include <limits>
 #include <map>
-#include <unordered_map>
-#include <unordered_set>
 #include <memory>
 #include <string>
 #include <chrono>
-#include <variant>
 
 
 namespace nix {
diff --git a/src/libstore/unix/user-lock.cc b/src/libstore/unix/user-lock.cc
index 8057aa13e..29f4b2cb3 100644
--- a/src/libstore/unix/user-lock.cc
+++ b/src/libstore/unix/user-lock.cc
@@ -1,12 +1,13 @@
+#include <vector>
+#include <pwd.h>
+#include <grp.h>
+
 #include "user-lock.hh"
 #include "file-system.hh"
 #include "globals.hh"
 #include "pathlocks.hh"
 #include "users.hh"
 
-#include <pwd.h>
-#include <grp.h>
-
 namespace nix {
 
 #if __linux__
diff --git a/src/libstore/unix/user-lock.hh b/src/libstore/unix/user-lock.hh
index 1c268e1fb..a7caf8518 100644
--- a/src/libstore/unix/user-lock.hh
+++ b/src/libstore/unix/user-lock.hh
@@ -1,10 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-
-#include <optional>
-
+#include <memory>
+#include <vector>
 #include <sys/types.h>
 
 namespace nix {
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index 7759b74a9..f6e74e67e 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -1,7 +1,6 @@
 #pragma once
 ///@file
 
-#include <iostream>
 #include <functional>
 #include <map>
 #include <memory>
@@ -11,6 +10,7 @@
 
 #include "types.hh"
 #include "experimental-features.hh"
+#include "ref.hh"
 
 namespace nix {
 
diff --git a/src/libutil/error.hh b/src/libutil/error.hh
index 1fe98077e..8cc8fb303 100644
--- a/src/libutil/error.hh
+++ b/src/libutil/error.hh
@@ -16,16 +16,12 @@
  */
 
 #include "suggestions.hh"
-#include "ref.hh"
-#include "types.hh"
 #include "fmt.hh"
 
 #include <cstring>
 #include <list>
 #include <memory>
-#include <map>
 #include <optional>
-#include <compare>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/libutil/file-content-address.hh b/src/libutil/file-content-address.hh
index 4c7218f19..ec42d3d34 100644
--- a/src/libutil/file-content-address.hh
+++ b/src/libutil/file-content-address.hh
@@ -2,8 +2,6 @@
 ///@file
 
 #include "source-accessor.hh"
-#include "fs-sink.hh"
-#include "util.hh"
 
 namespace nix {
 
diff --git a/src/libutil/fs-sink.hh b/src/libutil/fs-sink.hh
index 774c0d942..de165fb7d 100644
--- a/src/libutil/fs-sink.hh
+++ b/src/libutil/fs-sink.hh
@@ -1,7 +1,6 @@
 #pragma once
 ///@file
 
-#include "types.hh"
 #include "serialise.hh"
 #include "source-accessor.hh"
 #include "file-system.hh"
diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh
index 9e81132e3..250f92099 100644
--- a/src/libutil/logging.hh
+++ b/src/libutil/logging.hh
@@ -1,7 +1,6 @@
 #pragma once
 ///@file
 
-#include "types.hh"
 #include "error.hh"
 #include "config.hh"
 
diff --git a/src/libutil/ref.hh b/src/libutil/ref.hh
index 03aa64273..8318251bd 100644
--- a/src/libutil/ref.hh
+++ b/src/libutil/ref.hh
@@ -1,9 +1,7 @@
 #pragma once
 ///@file
 
-#include <compare>
 #include <memory>
-#include <exception>
 #include <stdexcept>
 
 namespace nix {
diff --git a/src/libutil/source-accessor.hh b/src/libutil/source-accessor.hh
index cc8db01f5..32ab3685d 100644
--- a/src/libutil/source-accessor.hh
+++ b/src/libutil/source-accessor.hh
@@ -4,6 +4,7 @@
 
 #include "canon-path.hh"
 #include "hash.hh"
+#include "ref.hh"
 
 namespace nix {
 
diff --git a/src/libutil/terminal.hh b/src/libutil/terminal.hh
index 902e75945..7ff05a487 100644
--- a/src/libutil/terminal.hh
+++ b/src/libutil/terminal.hh
@@ -1,7 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include <limits>
+#include <string>
 
 namespace nix {
 /**
diff --git a/src/libutil/types.hh b/src/libutil/types.hh
index c86f52175..325e3ea73 100644
--- a/src/libutil/types.hh
+++ b/src/libutil/types.hh
@@ -1,12 +1,10 @@
 #pragma once
 ///@file
 
-#include "ref.hh"
 
 #include <list>
 #include <set>
 #include <string>
-#include <limits>
 #include <map>
 #include <variant>
 #include <vector>
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index d0840a02e..f073074e8 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -2,13 +2,11 @@
 #include "derivations.hh"
 #include "dotgraph.hh"
 #include "globals.hh"
-#include "build-result.hh"
 #include "store-cast.hh"
 #include "local-fs-store.hh"
 #include "log-store.hh"
 #include "serve-protocol.hh"
 #include "serve-protocol-connection.hh"
-#include "serve-protocol-impl.hh"
 #include "shared.hh"
 #include "graphml.hh"
 #include "legacy.hh"
@@ -23,12 +21,14 @@
 
 #include <iostream>
 #include <algorithm>
-#include <cstdio>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include "build-result.hh"
+#include "exit.hh"
+#include "serve-protocol-impl.hh"
 
 namespace nix_store {
 
diff --git a/src/nix/config-check.cc b/src/nix/config-check.cc
index 9575bf338..09d140733 100644
--- a/src/nix/config-check.cc
+++ b/src/nix/config-check.cc
@@ -1,6 +1,7 @@
 #include <sstream>
 
 #include "command.hh"
+#include "exit.hh"
 #include "logging.hh"
 #include "serve-protocol.hh"
 #include "shared.hh"
diff --git a/src/nix/env.cc b/src/nix/env.cc
index 021c47cbb..bc9cd91ad 100644
--- a/src/nix/env.cc
+++ b/src/nix/env.cc
@@ -1,6 +1,8 @@
+#include <unordered_set>
+#include <queue>
+
 #include "command.hh"
 #include "run.hh"
-#include <queue>
 
 using namespace nix;
 
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index b65c7f59d..896425c5a 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -19,7 +19,6 @@
 #include "users.hh"
 
 #include <nlohmann/json.hpp>
-#include <queue>
 #include <iomanip>
 
 using namespace nix;
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 775052351..ec3e2a406 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -1,9 +1,8 @@
-#include <algorithm>
-
 #include "args/root.hh"
 #include "current-process.hh"
 #include "command.hh"
 #include "common-args.hh"
+#include "eval-gc.hh"
 #include "eval.hh"
 #include "eval-settings.hh"
 #include "globals.hh"
diff --git a/src/nix/verify.cc b/src/nix/verify.cc
index 2a0cbd19f..124a05bed 100644
--- a/src/nix/verify.cc
+++ b/src/nix/verify.cc
@@ -1,14 +1,14 @@
 #include "command.hh"
 #include "shared.hh"
 #include "store-api.hh"
-#include "sync.hh"
 #include "thread-pool.hh"
-#include "references.hh"
 #include "signals.hh"
 #include "keys.hh"
 
 #include <atomic>
 
+#include "exit.hh"
+
 using namespace nix;
 
 struct CmdVerify : StorePathsCommand
diff --git a/tests/unit/libexpr-support/tests/libexpr.hh b/tests/unit/libexpr-support/tests/libexpr.hh
index eacbf0d5c..bfb425bff 100644
--- a/tests/unit/libexpr-support/tests/libexpr.hh
+++ b/tests/unit/libexpr-support/tests/libexpr.hh
@@ -7,9 +7,9 @@
 #include "value.hh"
 #include "nixexpr.hh"
 #include "eval.hh"
+#include "eval-gc.hh"
 #include "eval-inline.hh"
 #include "eval-settings.hh"
-#include "store-api.hh"
 
 #include "tests/libstore.hh"