5 files changed, 6 insertions, 2 deletions
diff --git a/tests/functional/repl_characterization/repl_characterization.cc b/tests/functional/repl_characterization/repl_characterization.cc
index 0d3e5352d..4cc1e7e37 100644
--- a/tests/functional/repl_characterization/repl_characterization.cc
+++ b/tests/functional/repl_characterization/repl_characterization.cc
@@ -12,6 +12,7 @@
 #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 ab0710b24..be3d407f3 100644
--- a/tests/functional/repl_characterization/test-session.cc
+++ b/tests/functional/repl_characterization/test-session.cc
@@ -3,9 +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/unit/libstore/machines.cc b/tests/unit/libstore/machines.cc
index dc192e5be..ba27d85b7 100644
--- a/tests/unit/libstore/machines.cc
+++ b/tests/unit/libstore/machines.cc
@@ -1,6 +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/cli-literate-parser.cc b/tests/unit/libutil-support/tests/cli-literate-parser.cc
index 822f5e276..69bf9fb46 100644
--- a/tests/unit/libutil-support/tests/cli-literate-parser.cc
+++ b/tests/unit/libutil-support/tests/cli-literate-parser.cc
@@ -19,6 +19,7 @@
 #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/tests.cc b/tests/unit/libutil/tests.cc
index a42afd997..324ebd335 100644
--- a/tests/unit/libutil/tests.cc
+++ b/tests/unit/libutil/tests.cc
@@ -1,8 +1,9 @@
 #include "file-system.hh"
-#include "util.hh"
 #include "processes.hh"
+#include "strings.hh"
 #include "types.hh"
 #include "terminal.hh"
+#include "util.hh"
 
 #include <gtest/gtest.h>