aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr
diff options
context:
space:
mode:
Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/attr-path.cc1
-rw-r--r--src/libexpr/eval.cc1
-rw-r--r--src/libexpr/flake/config.cc1
-rw-r--r--src/libexpr/get-drvs.cc1
-rw-r--r--src/libexpr/nixexpr.cc1
-rw-r--r--src/libexpr/print-ambiguous.cc3
-rw-r--r--src/libexpr/search-path.cc1
-rw-r--r--src/libexpr/value-to-json.cc1
-rw-r--r--src/libexpr/value-to-xml.cc4
-rw-r--r--src/libexpr/value/context.hh1
10 files changed, 3 insertions, 12 deletions
diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc
index f4da99a9a..3e60f295d 100644
--- a/src/libexpr/attr-path.cc
+++ b/src/libexpr/attr-path.cc
@@ -1,6 +1,5 @@
#include "attr-path.hh"
#include "eval-inline.hh"
-#include "util.hh"
namespace nix {
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index a8b37325b..c9a624eeb 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -5,7 +5,6 @@
#include "print-options.hh"
#include "shared.hh"
#include "types.hh"
-#include "util.hh"
#include "store-api.hh"
#include "derivations.hh"
#include "downstream-placeholder.hh"
diff --git a/src/libexpr/flake/config.cc b/src/libexpr/flake/config.cc
index 35c605de2..b330d96f9 100644
--- a/src/libexpr/flake/config.cc
+++ b/src/libexpr/flake/config.cc
@@ -1,4 +1,5 @@
#include "flake.hh"
+#include "logging.hh"
#include "users.hh"
#include "fetch-settings.hh"
diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc
index e686ffe8c..8c8e142b8 100644
--- a/src/libexpr/get-drvs.cc
+++ b/src/libexpr/get-drvs.cc
@@ -1,5 +1,4 @@
#include "get-drvs.hh"
-#include "util.hh"
#include "eval-inline.hh"
#include "derivations.hh"
#include "store-api.hh"
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 72a8764e6..6a1aa8f35 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -2,7 +2,6 @@
#include "derivations.hh"
#include "eval.hh"
#include "symbol-table.hh"
-#include "util.hh"
#include "print.hh"
#include "escape-string.hh"
diff --git a/src/libexpr/print-ambiguous.cc b/src/libexpr/print-ambiguous.cc
index ec30f5073..bcf86b5c6 100644
--- a/src/libexpr/print-ambiguous.cc
+++ b/src/libexpr/print-ambiguous.cc
@@ -1,6 +1,7 @@
#include "print-ambiguous.hh"
+#include "attr-set.hh"
+#include "logging.hh"
#include "print.hh"
-#include "eval.hh"
#include "signals.hh"
#include "escape-string.hh"
diff --git a/src/libexpr/search-path.cc b/src/libexpr/search-path.cc
index 180d5f8b1..a25767496 100644
--- a/src/libexpr/search-path.cc
+++ b/src/libexpr/search-path.cc
@@ -1,5 +1,4 @@
#include "search-path.hh"
-#include "util.hh"
namespace nix {
diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc
index ebb3379a8..5743d9057 100644
--- a/src/libexpr/value-to-json.cc
+++ b/src/libexpr/value-to-json.cc
@@ -1,6 +1,5 @@
#include "value-to-json.hh"
#include "eval-inline.hh"
-#include "util.hh"
#include "signals.hh"
#include "store-api.hh"
diff --git a/src/libexpr/value-to-xml.cc b/src/libexpr/value-to-xml.cc
index 5d1fbd28d..fda360eff 100644
--- a/src/libexpr/value-to-xml.cc
+++ b/src/libexpr/value-to-xml.cc
@@ -1,11 +1,7 @@
#include "value-to-xml.hh"
#include "xml-writer.hh"
-#include "eval-inline.hh"
-#include "util.hh"
#include "signals.hh"
-#include <cstdlib>
-
namespace nix {
diff --git a/src/libexpr/value/context.hh b/src/libexpr/value/context.hh
index 998b70e36..7f23cd3a4 100644
--- a/src/libexpr/value/context.hh
+++ b/src/libexpr/value/context.hh
@@ -1,7 +1,6 @@
#pragma once
///@file
-#include "util.hh"
#include "comparator.hh"
#include "derived-path.hh"
#include "variant-wrapper.hh"