10 files changed, 16 insertions, 14 deletions
diff --git a/tests/functional/repl_characterization/repl_characterization.cc b/tests/functional/repl_characterization/repl_characterization.cc
index 0d3e5352d..c91d6c1e3 100644
--- a/tests/functional/repl_characterization/repl_characterization.cc
+++ b/tests/functional/repl_characterization/repl_characterization.cc
@@ -6,12 +6,10 @@
 #include <string_view>
 #include <unistd.h>
 
-#include "escape-string.hh"
 #include "test-session.hh"
 #include "tests/characterization.hh"
 #include "tests/cli-literate-parser.hh"
-#include "tests/terminal-code-eater.hh"
-#include "util.hh"
+#include "strings.hh"
 
 using namespace std::string_literals;
 
diff --git a/tests/functional/repl_characterization/test-session.cc b/tests/functional/repl_characterization/test-session.cc
index c3eb45b85..be3d407f3 100644
--- a/tests/functional/repl_characterization/test-session.cc
+++ b/tests/functional/repl_characterization/test-session.cc
@@ -3,8 +3,9 @@
 #include <unistd.h>
 
 #include "test-session.hh"
-#include "util.hh"
 #include "escape-char.hh"
+#include "processes.hh"
+#include "strings.hh"
 
 namespace nix {
 
diff --git a/tests/functional/repl_characterization/test-session.hh b/tests/functional/repl_characterization/test-session.hh
index 9961849fc..c77cce6d5 100644
--- a/tests/functional/repl_characterization/test-session.hh
+++ b/tests/functional/repl_characterization/test-session.hh
@@ -6,7 +6,7 @@
 #include <span>
 #include <string>
 
-#include "util.hh"
+#include "file-descriptor.hh"
 #include "tests/terminal-code-eater.hh"
 
 namespace nix {
diff --git a/tests/unit/libcmd/args.cc b/tests/unit/libcmd/args.cc
index 73550dacf..886467ea0 100644
--- a/tests/unit/libcmd/args.cc
+++ b/tests/unit/libcmd/args.cc
@@ -10,7 +10,6 @@
 #include "filetransfer.hh"
 #include "shared.hh"
 #include "store-api.hh"
-#include "util.hh"
 
 constexpr std::string_view INVALID_CHANNEL = "channel:example";
 constexpr std::string_view CHANNEL_URL = "https://nixos.org/channels/example/nixexprs.tar.xz";
diff --git a/tests/unit/libstore-support/tests/test-data.hh b/tests/unit/libstore-support/tests/test-data.hh
index 7aa1dd90d..1fec6f912 100644
--- a/tests/unit/libstore-support/tests/test-data.hh
+++ b/tests/unit/libstore-support/tests/test-data.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util.hh"
+#include "environment-variables.hh"
 #include "types.hh"
 
 namespace nix {
diff --git a/tests/unit/libstore/machines.cc b/tests/unit/libstore/machines.cc
index 0277237bb..ba27d85b7 100644
--- a/tests/unit/libstore/machines.cc
+++ b/tests/unit/libstore/machines.cc
@@ -1,5 +1,7 @@
+#include "file-system.hh"
 #include "machines.hh"
 #include "globals.hh"
+#include "strings.hh"
 #include "tests/test-data.hh"
 
 #include <gmock/gmock-matchers.h>
diff --git a/tests/unit/libutil-support/tests/characterization.hh b/tests/unit/libutil-support/tests/characterization.hh
index 7f570f619..db82476da 100644
--- a/tests/unit/libutil-support/tests/characterization.hh
+++ b/tests/unit/libutil-support/tests/characterization.hh
@@ -1,11 +1,13 @@
 #pragma once
 ///@file
 
+#include "environment-variables.hh"
+#include "file-system.hh"
+
 #include <gtest/gtest.h>
 
 #include <filesystem>
 
-#include "util.hh"
 #include "types.hh"
 
 namespace nix {
diff --git a/tests/unit/libutil-support/tests/cli-literate-parser.cc b/tests/unit/libutil-support/tests/cli-literate-parser.cc
index 822f5e276..f74fe85eb 100644
--- a/tests/unit/libutil-support/tests/cli-literate-parser.cc
+++ b/tests/unit/libutil-support/tests/cli-literate-parser.cc
@@ -3,7 +3,6 @@
 #include "escape-char.hh"
 #include "libexpr/print.hh"
 #include "types.hh"
-#include "util.hh"
 #include <ranges>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/trim.hpp>
@@ -18,7 +17,7 @@
 #include "libexpr/print.hh"
 #include "shlex.hh"
 #include "types.hh"
-#include "util.hh"
+#include "strings.hh"
 
 static constexpr const bool DEBUG_PARSER = false;
 
diff --git a/tests/unit/libutil/logging.cc b/tests/unit/libutil/logging.cc
index 94cbe9c51..f99f49527 100644
--- a/tests/unit/libutil/logging.cc
+++ b/tests/unit/libutil/logging.cc
@@ -2,7 +2,6 @@
 
 #include "logging.hh"
 #include "nixexpr.hh"
-#include "util.hh"
 #include <fstream>
 
 #include <gtest/gtest.h>
diff --git a/tests/unit/libutil/tests.cc b/tests/unit/libutil/tests.cc
index 720370066..9a44ad59b 100644
--- a/tests/unit/libutil/tests.cc
+++ b/tests/unit/libutil/tests.cc
@@ -1,14 +1,16 @@
-#include "util.hh"
+#include "file-system.hh"
+#include "processes.hh"
+#include "strings.hh"
 #include "types.hh"
+#include "terminal.hh"
 
-#include <limits.h>
 #include <gtest/gtest.h>
 
 #include <numeric>
 
 namespace nix {
 
-/* ----------- tests for util.hh ------------------------------------------------*/
+/* ----------- tests for libutil ------------------------------------------------*/
 
     /* ----------------------------------------------------------------------------
      * absPath