util.{hh,cc}: Split out users.{hh,cc}

Change-Id: I1bd92479a2cb7e5c2c2e1541b80474adb05ea0df

4 files changed, 5 insertions, 4 deletions

diff --git a/src/libexpr/eval-cache.cc b/src/libexpr/eval-cache.cc
index 5969ee449..90fbfa308 100644
--- a/src/libexpr/eval-cache.cc
+++ b/src/libexpr/eval-cache.cc
@@ -1,8 +1,8 @@
 #include "eval-cache.hh"
 #include "sqlite.hh"
 #include "eval.hh"
-#include "eval-inline.hh"
 #include "store-api.hh"
+#include "users.hh"
 
 namespace nix::eval_cache {
 
diff --git a/src/libexpr/eval-settings.cc b/src/libexpr/eval-settings.cc
index 046ca557d..105fd3e9d 100644
--- a/src/libexpr/eval-settings.cc
+++ b/src/libexpr/eval-settings.cc
@@ -1,6 +1,7 @@
+#include "file-system.hh"
 #include "globals.hh"
 #include "profiles.hh"
-#include "eval.hh"
+#include "users.hh"
 #include "eval-settings.hh"
 
 namespace nix {
diff --git a/src/libexpr/flake/config.cc b/src/libexpr/flake/config.cc
index b9613462a..35c605de2 100644
--- a/src/libexpr/flake/config.cc
+++ b/src/libexpr/flake/config.cc
@@ -1,5 +1,5 @@
 #include "flake.hh"
-#include "globals.hh"
+#include "users.hh"
 #include "fetch-settings.hh"
 
 #include <nlohmann/json.hpp>
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 5424d8741..91cc7d089 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -19,7 +19,7 @@
 #include <variant>
 
 #include "finally.hh"
-#include "util.hh"
+#include "users.hh"
 
 #include "nixexpr.hh"
 #include "eval.hh"