diff --git a/src/libflake-tests/flakeref.cc b/src/libflake-tests/flakeref.cc
index e2cb91bb8..34d281c52 100644
--- a/src/libflake-tests/flakeref.cc
+++ b/src/libflake-tests/flakeref.cc
@@ -1,8 +1,15 @@
 #include <gtest/gtest.h>
+#include <set>
+#include <string>
+#include <utility>
 
 #include "nix/fetchers/fetch-settings.hh"
 #include "nix/flake/flakeref.hh"
 #include "nix/fetchers/attrs.hh"
+#include "nix/fetchers/fetchers.hh"
+#include "nix/util/configuration.hh"
+#include "nix/util/error.hh"
+#include "nix/util/experimental-features.hh"
 
 namespace nix {
 
diff --git a/src/libflake-tests/nix_api_flake.cc b/src/libflake-tests/nix_api_flake.cc
index f7e0cb719..da7f01401 100644
--- a/src/libflake-tests/nix_api_flake.cc
+++ b/src/libflake-tests/nix_api_flake.cc
@@ -1,15 +1,17 @@
+#include <gtest/gtest.h>
+#include <filesystem>
+#include <string>
+
 #include "nix/util/file-system.hh"
 #include "nix_api_store.h"
 #include "nix_api_util.h"
 #include "nix_api_expr.h"
 #include "nix_api_value.h"
 #include "nix_api_flake.h"
-
-#include "nix/expr/tests/nix_api_expr.hh"
 #include "nix/util/tests/string_callback.hh"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "nix/store/tests/nix_api_store.hh"
+#include "nix/util/tests/nix_api_util.hh"
+#include "nix_api_fetchers.h"
 
 namespace nixC {
 
diff --git a/src/libflake-tests/url-name.cc b/src/libflake-tests/url-name.cc
index 81ba516c8..64cbe5c9d 100644
--- a/src/libflake-tests/url-name.cc
+++ b/src/libflake-tests/url-name.cc
@@ -1,6 +1,8 @@
-#include "nix/flake/url-name.hh"
 #include <gtest/gtest.h>
 
+#include "nix/flake/url-name.hh"
+#include "nix/util/url.hh"
+
 namespace nix {
 
 /* ----------- tests for url-name.hh --------------------------------------------------*/
diff --git a/src/libflake/include/nix/flake/flake-primops.hh b/src/libflake/include/nix/flake/flake-primops.hh
index 57a5e3422..a2a3d1612 100644
--- a/src/libflake/include/nix/flake/flake-primops.hh
+++ b/src/libflake/include/nix/flake/flake-primops.hh
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "nix/expr/eval.hh"
-#include "nix/flake/settings.hh"
 
 namespace nix {
 namespace flake {
diff --git a/src/libflake/include/nix/flake/flakeref.hh b/src/libflake/include/nix/flake/flakeref.hh
index 7a26382a7..65a2dfed5 100644
--- a/src/libflake/include/nix/flake/flakeref.hh
+++ b/src/libflake/include/nix/flake/flakeref.hh
@@ -1,23 +1,14 @@
 #pragma once
 ///@file
 
-#include <boost/container/detail/std_fwd.hpp>
 #include <regex>
-#include <compare>
 #include <iosfwd>
-#include <optional>
 #include <string>
 #include <tuple>
 #include <utility>
-#include <variant>
 
-#include "nix/util/types.hh"
-#include "nix/fetchers/fetchers.hh"
 #include "nix/store/outputs-spec.hh"
 #include "nix/fetchers/registry.hh"
-#include "nix/fetchers/attrs.hh"
-#include "nix/util/ref.hh"
-#include "nix/util/source-accessor.hh"
 
 namespace nix {
 
diff --git a/src/libflake/include/nix/flake/settings.hh b/src/libflake/include/nix/flake/settings.hh
index 7e5d18746..7187a3294 100644
--- a/src/libflake/include/nix/flake/settings.hh
+++ b/src/libflake/include/nix/flake/settings.hh
@@ -2,11 +2,9 @@
 ///@file
 
 #include <sys/types.h>
-#include <optional>
 #include <string>
 
 #include "nix/util/configuration.hh"
-#include "nix/util/experimental-features.hh"
 
 namespace nix {
 // Forward declarations
diff --git a/src/libflake/include/nix/flake/url-name.hh b/src/libflake/include/nix/flake/url-name.hh
index 0c79b74aa..d313db33b 100644
--- a/src/libflake/include/nix/flake/url-name.hh
+++ b/src/libflake/include/nix/flake/url-name.hh
@@ -1,11 +1,6 @@
 #include <optional>
 #include <string>
 
-#include "nix/util/url.hh"
-#include "nix/util/url-parts.hh"
-#include "nix/util/util.hh"
-#include "nix/util/split.hh"
-
 namespace nix {
 struct ParsedURL;