diff --git a/src/libexpr/lexer-helpers.hh b/src/libexpr/lexer-helpers.hh
index caba6e18f..b4a166f46 100644
--- a/src/libexpr/lexer-helpers.hh
+++ b/src/libexpr/lexer-helpers.hh
@@ -1,5 +1,13 @@
 #pragma once
 
+#include <cstddef>
+
+// inluding the generated headers twice leads to errors
+#ifndef BISON_HEADER
+#include "lexer-tab.hh"
+#include "parser-tab.hh"
+#endif
+
 namespace nix::lexer::internal {
 
 void initLoc(YYLTYPE * loc);
diff --git a/src/libexpr/print-options.hh b/src/libexpr/print-options.hh
index 080ba26b8..9ad54e532 100644
--- a/src/libexpr/print-options.hh
+++ b/src/libexpr/print-options.hh
@@ -5,6 +5,7 @@
  */
 
 #include <limits>
+#include <stddef.h>
 
 namespace nix {
 
diff --git a/src/libstore/path-regex.hh b/src/libstore/path-regex.hh
index 56c2cfc1d..e34a305c5 100644
--- a/src/libstore/path-regex.hh
+++ b/src/libstore/path-regex.hh
@@ -1,6 +1,8 @@
 #pragma once
 ///@file
 
+#include <string_view>
+
 namespace nix {
 
 
diff --git a/src/libutil/callback.hh b/src/libutil/callback.hh
index 26c386d80..c2cada2f6 100644
--- a/src/libutil/callback.hh
+++ b/src/libutil/callback.hh
@@ -1,6 +1,7 @@
 #pragma once
 ///@file
 
+#include <cassert>
 #include <future>
 #include <functional>
 
diff --git a/src/libutil/config-impl.hh b/src/libutil/config-impl.hh
index c3aa61ddb..94c2cb2e4 100644
--- a/src/libutil/config-impl.hh
+++ b/src/libutil/config-impl.hh
@@ -13,6 +13,7 @@
  */
 
 #include "config.hh"
+#include "args.hh"
 
 namespace nix {
 
diff --git a/src/libutil/regex-combinators.hh b/src/libutil/regex-combinators.hh
index 87d6aa678..8a7b2c2c0 100644
--- a/src/libutil/regex-combinators.hh
+++ b/src/libutil/regex-combinators.hh
@@ -2,6 +2,7 @@
 ///@file
 
 #include <string_view>
+#include <string>
 
 namespace nix::regex {
 
diff --git a/src/libutil/unix/signals-impl.hh b/src/libutil/unix/signals-impl.hh
index 2193922be..037416e7d 100644
--- a/src/libutil/unix/signals-impl.hh
+++ b/src/libutil/unix/signals-impl.hh
@@ -14,6 +14,7 @@
 #include "error.hh"
 #include "logging.hh"
 #include "ansicolor.hh"
+#include "signals.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/nix/self-exe.hh b/src/nix/self-exe.hh
index 3161553ec..91e260f0b 100644
--- a/src/nix/self-exe.hh
+++ b/src/nix/self-exe.hh
@@ -2,6 +2,8 @@
 ///@file
 
 #include <filesystem>
+#include <optional>
+#include <string_view>
 
 namespace nix {