diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc
index fbb9c2183a..c702750bb6 100644
--- a/src/logging/Manager.cc
+++ b/src/logging/Manager.cc
@@ -22,6 +22,7 @@
 #include "zeek/logging/WriterBackend.h"
 #include "zeek/logging/WriterFrontend.h"
 #include "zeek/logging/logging.bif.h"
+#include "zeek/module_util.h"
 #include "zeek/plugin/Manager.h"
 #include "zeek/plugin/Plugin.h"
 #include "zeek/telemetry/Manager.h"
diff --git a/src/plugin/ComponentManager.h b/src/plugin/ComponentManager.h
index 9304a60cdc..016623069c 100644
--- a/src/plugin/ComponentManager.h
+++ b/src/plugin/ComponentManager.h
@@ -6,7 +6,6 @@
 #include <map>
 #include <string>
 
-#include "zeek/Attr.h"
 #include "zeek/DebugLogger.h"
 #include "zeek/Expr.h"
 #include "zeek/Reporter.h"
@@ -16,7 +15,6 @@
 #include "zeek/Val.h"
 #include "zeek/Var.h" // for add_type()
 #include "zeek/ZeekString.h"
-#include "zeek/module_util.h"
 #include "zeek/zeekygen/Manager.h"
 
 namespace zeek::plugin {
diff --git a/src/plugin/Manager.cc b/src/plugin/Manager.cc
index 8ab2294199..580359dbeb 100644
--- a/src/plugin/Manager.cc
+++ b/src/plugin/Manager.cc
@@ -9,7 +9,6 @@
 #endif
 #include <sys/stat.h>
 #include <cerrno>
-#include <climits> // for PATH_MAX
 #include <cstdlib>
 #include <fstream>
 #include <optional>
diff --git a/src/plugin/Manager.h b/src/plugin/Manager.h
index a79bd0bd7e..7f80fbed78 100644
--- a/src/plugin/Manager.h
+++ b/src/plugin/Manager.h
@@ -9,7 +9,6 @@
 
 #include "zeek/Reporter.h"
 #include "zeek/ZeekArgs.h"
-#include "zeek/plugin/Component.h"
 #include "zeek/plugin/Plugin.h"
 
 namespace zeek {
diff --git a/src/spicy/manager.cc b/src/spicy/manager.cc
index 6c5a9268f3..acddad19a8 100644
--- a/src/spicy/manager.cc
+++ b/src/spicy/manager.cc
@@ -27,6 +27,7 @@
 #include "zeek/Event.h"
 #include "zeek/analyzer/Manager.h"
 #include "zeek/file_analysis/Manager.h"
+#include "zeek/module_util.h"
 #include "zeek/packet_analysis/Manager.h"
 #include "zeek/spicy/file-analyzer.h"
 #include "zeek/spicy/packet-analyzer.h"
diff --git a/src/zeekygen/IdentifierInfo.h b/src/zeekygen/IdentifierInfo.h
index 9fa9996281..22fffa768c 100644
--- a/src/zeekygen/IdentifierInfo.h
+++ b/src/zeekygen/IdentifierInfo.h
@@ -9,8 +9,6 @@
 #include <vector>
 
 #include "zeek/ID.h"
-#include "zeek/IntrusivePtr.h"
-#include "zeek/util.h"
 #include "zeek/zeekygen/Info.h"
 
 namespace zeek {
diff --git a/src/zeekygen/Manager.h b/src/zeekygen/Manager.h
index f549349e57..796553b2ad 100644
--- a/src/zeekygen/Manager.h
+++ b/src/zeekygen/Manager.h
@@ -11,7 +11,6 @@
 
 #include "zeek/ID.h"
 #include "zeek/Reporter.h"
-#include "zeek/util.h"
 #include "zeek/zeekygen/Configuration.h"
 #include "zeek/zeekygen/SpicyModuleInfo.h"
 
diff --git a/src/zeekygen/ScriptInfo.h b/src/zeekygen/ScriptInfo.h
index bec033263d..1a1f2a0ea9 100644
--- a/src/zeekygen/ScriptInfo.h
+++ b/src/zeekygen/ScriptInfo.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <ctime> // for time_t
 #include <list>
 #include <map>
diff --git a/src/zeekygen/SpicyModuleInfo.h b/src/zeekygen/SpicyModuleInfo.h
index faddc8a3ff..8f71daf6a6 100644
--- a/src/zeekygen/SpicyModuleInfo.h
+++ b/src/zeekygen/SpicyModuleInfo.h
@@ -5,7 +5,6 @@
 #include <ctime> // for time_t
 #include <list>
 #include <string>
-#include <vector>
 
 #include "zeek/plugin/Plugin.h"
 #include "zeek/zeekygen/Info.h"
diff --git a/src/zeekygen/Target.h b/src/zeekygen/Target.h
index d9a06ec3ab..4612869095 100644
--- a/src/zeekygen/Target.h
+++ b/src/zeekygen/Target.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <cstdio>
 #include <map>
 #include <string>
diff --git a/src/zeekygen/utils.h b/src/zeekygen/utils.h
index 0537ced888..36f5f1425d 100644
--- a/src/zeekygen/utils.h
+++ b/src/zeekygen/utils.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <ctime> // for time_t
 #include <optional>
 #include <string>