diff --git a/src/Attr.cc b/src/Attr.cc
index b8c87b7ff0..82605d4da6 100644
--- a/src/Attr.cc
+++ b/src/Attr.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Attr.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/Desc.h"
 #include "zeek/Expr.h"
 #include "zeek/IntrusivePtr.h"
diff --git a/src/Base64.cc b/src/Base64.cc
index fbc6ad1eab..3e0c806230 100644
--- a/src/Base64.cc
+++ b/src/Base64.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Base64.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cmath>
 
 #include "zeek/Conn.h"
diff --git a/src/Base64.h b/src/Base64.h
index dd74d35c14..fd74b22569 100644
--- a/src/Base64.h
+++ b/src/Base64.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <string>
 
 namespace zeek {
diff --git a/src/CCL.cc b/src/CCL.cc
index 70b05bf9a1..ba9ace7484 100644
--- a/src/CCL.cc
+++ b/src/CCL.cc
@@ -2,11 +2,9 @@
 
 #include "zeek/CCL.h"
 
-#include "zeek/zeek-config.h"
-
 #include <algorithm>
 
-#include "zeek/DFA.h"
+#include "zeek/NFA.h" // for SYM_BOL and SYM_EOL
 #include "zeek/RE.h"
 
 namespace zeek::detail {
diff --git a/src/CompHash.cc b/src/CompHash.cc
index f3f46aac01..bd366e276c 100644
--- a/src/CompHash.cc
+++ b/src/CompHash.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/CompHash.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cstring>
 #include <map>
 #include <vector>
diff --git a/src/Conn.cc b/src/Conn.cc
index 5e7f065033..c00e86b337 100644
--- a/src/Conn.cc
+++ b/src/Conn.cc
@@ -2,13 +2,10 @@
 
 #include "zeek/Conn.h"
 
-#include "zeek/zeek-config.h"
-
 #include <binpac.h>
 #include <cctype>
 
 #include "zeek/Desc.h"
-#include "zeek/Event.h"
 #include "zeek/NetVar.h"
 #include "zeek/Reporter.h"
 #include "zeek/RunState.h"
@@ -17,7 +14,6 @@
 #include "zeek/analyzer/Analyzer.h"
 #include "zeek/analyzer/Manager.h"
 #include "zeek/analyzer/protocol/pia/PIA.h"
-#include "zeek/iosource/IOSource.h"
 #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h"
 #include "zeek/packet_analysis/protocol/tcp/TCP.h"
 #include "zeek/session/Manager.h"
diff --git a/src/Conn.h b/src/Conn.h
index fb0289a470..41fe4f4d85 100644
--- a/src/Conn.h
+++ b/src/Conn.h
@@ -4,8 +4,6 @@
 
 #include <sys/types.h>
 #include <string>
-#include <tuple>
-#include <type_traits>
 
 #include "zeek/IPAddr.h"
 #include "zeek/IntrusivePtr.h"
diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc
index 42948accef..f43a9688a7 100644
--- a/src/DNS_Mgr.cc
+++ b/src/DNS_Mgr.cc
@@ -38,7 +38,6 @@ using ztd::out_ptr::out_ptr;
 #include "zeek/Hash.h"
 #include "zeek/ID.h"
 #include "zeek/IntrusivePtr.h"
-#include "zeek/NetVar.h"
 #include "zeek/Reporter.h"
 #include "zeek/RunState.h"
 #include "zeek/Val.h"
diff --git a/src/DNS_Mgr.h b/src/DNS_Mgr.h
index 8a2ea88831..e7a7d8a3e7 100644
--- a/src/DNS_Mgr.h
+++ b/src/DNS_Mgr.h
@@ -5,13 +5,11 @@
 #include <netdb.h>
 #include <list>
 #include <map>
-#include <queue>
 #include <utility>
 #include <variant>
 
 #include "zeek/EventHandler.h"
 #include "zeek/IPAddr.h"
-#include "zeek/List.h"
 #include "zeek/iosource/IOSource.h"
 #include "zeek/util.h"
 
diff --git a/src/DbgBreakpoint.cc b/src/DbgBreakpoint.cc
index 5d75cc1cc2..d3b195e3e3 100644
--- a/src/DbgBreakpoint.cc
+++ b/src/DbgBreakpoint.cc
@@ -4,8 +4,6 @@
 
 #include "zeek/DbgBreakpoint.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cassert>
 
 #include "zeek/Debug.h"
@@ -15,7 +13,6 @@
 #include "zeek/ID.h"
 #include "zeek/Reporter.h"
 #include "zeek/Scope.h"
-#include "zeek/Stmt.h"
 #include "zeek/Timer.h"
 #include "zeek/Val.h"
 #include "zeek/module_util.h"
diff --git a/src/DbgBreakpoint.h b/src/DbgBreakpoint.h
index bf0aae016d..18555acefe 100644
--- a/src/DbgBreakpoint.h
+++ b/src/DbgBreakpoint.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 
-#include "zeek/util.h"
-
 namespace zeek::detail {
 
 class Stmt;
diff --git a/src/DbgWatch.cc b/src/DbgWatch.cc
index daa865f2b5..c340969a0d 100644
--- a/src/DbgWatch.cc
+++ b/src/DbgWatch.cc
@@ -4,8 +4,6 @@
 
 #include "zeek/DbgWatch.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/Debug.h"
 #include "zeek/Reporter.h"
 
diff --git a/src/DbgWatch.h b/src/DbgWatch.h
index e5ba83e3d2..5928b69d49 100644
--- a/src/DbgWatch.h
+++ b/src/DbgWatch.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "zeek/util.h"
-
 namespace zeek {
 class Obj;
 }
diff --git a/src/Debug.cc b/src/Debug.cc
index f4e12bbb61..a11e202f6a 100644
--- a/src/Debug.cc
+++ b/src/Debug.cc
@@ -4,8 +4,6 @@
 
 #include "zeek/Debug.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cctype>
 #include <csignal>
 #include <cstdarg>
diff --git a/src/Debug.h b/src/Debug.h
index 4f04bc0898..422db2352f 100644
--- a/src/Debug.h
+++ b/src/Debug.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <deque>
 #include <map>
 #include <string>
@@ -11,7 +12,10 @@
 
 #include "zeek/Obj.h"
 #include "zeek/StmtEnums.h"
-#include "zeek/util.h"
+
+#ifdef _MSC_VER
+#include <unistd.h> // Needed to ignore __attribute__((format(printf))) on MSVC
+#endif
 
 namespace zeek {
 
diff --git a/src/DebugCmds.cc b/src/DebugCmds.cc
index dd5c41b3f7..11b7c18849 100644
--- a/src/DebugCmds.cc
+++ b/src/DebugCmds.cc
@@ -5,8 +5,6 @@
 
 #include "zeek/DebugCmds.h"
 
-#include "zeek/zeek-config.h"
-
 #include <regex.h>
 #include <sys/types.h>
 #include <cassert>
@@ -22,7 +20,6 @@
 #include "zeek/PolicyFile.h"
 #include "zeek/Reporter.h"
 #include "zeek/Scope.h"
-#include "zeek/Stmt.h"
 #include "zeek/Val.h"
 #include "zeek/util.h"
 
diff --git a/src/DebugLogger.h b/src/DebugLogger.h
index 4756cba0f9..04796fe17e 100644
--- a/src/DebugLogger.h
+++ b/src/DebugLogger.h
@@ -7,13 +7,13 @@
 
 #ifdef DEBUG
 
-#include "zeek/zeek-config.h"
-
 #include <cstdio>
 #include <set>
 #include <string>
 
-#include "zeek/util.h"
+#ifdef _MSC_VER
+#include <unistd.h> // Needed to ignore __attribute__((format(printf))) on MSVC
+#endif
 
 #define DBG_LOG(stream, ...)                                                                                           \
     if ( ::zeek::detail::debug_logger.IsEnabled(stream) )                                                              \
diff --git a/src/Desc.cc b/src/Desc.cc
index 58b8d4d294..3e001ce4e9 100644
--- a/src/Desc.cc
+++ b/src/Desc.cc
@@ -2,14 +2,11 @@
 
 #include "zeek/Desc.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cerrno>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
 
-#include "zeek/3rdparty/ConvertUTF.h"
 #include "zeek/File.h"
 #include "zeek/IPAddr.h"
 #include "zeek/Reporter.h"
diff --git a/src/Discard.cc b/src/Discard.cc
index a1cfbb9ece..9c5ec0272f 100644
--- a/src/Discard.cc
+++ b/src/Discard.cc
@@ -2,14 +2,11 @@
 
 #include "zeek/Discard.h"
 
-#include "zeek/zeek-config.h"
-
 #include <algorithm>
 
 #include "zeek/Func.h"
 #include "zeek/IP.h"
 #include "zeek/Reporter.h" // for InterpreterException
-#include "zeek/RunState.h"
 #include "zeek/Val.h"
 #include "zeek/Var.h"
 #include "zeek/ZeekString.h"
diff --git a/src/EquivClass.cc b/src/EquivClass.cc
index 2e9482b621..9f4ead67a3 100644
--- a/src/EquivClass.cc
+++ b/src/EquivClass.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/EquivClass.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/CCL.h"
 #include "zeek/util.h"
 
diff --git a/src/EventRegistry.h b/src/EventRegistry.h
index b125cfda3a..3db64960ea 100644
--- a/src/EventRegistry.h
+++ b/src/EventRegistry.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <map>
 #include <memory>
 #include <string>
diff --git a/src/Expr.cc b/src/Expr.cc
index 9e872d846f..2199339bff 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Expr.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/DebugLogger.h"
 #include "zeek/Desc.h"
 #include "zeek/Event.h"
@@ -22,7 +20,6 @@
 #include "zeek/Trigger.h"
 #include "zeek/Type.h"
 #include "zeek/broker/Data.h"
-#include "zeek/digest.h"
 #include "zeek/module_util.h"
 #include "zeek/script_opt/Expr.h"
 #include "zeek/script_opt/ScriptOpt.h"
diff --git a/src/File.cc b/src/File.cc
index 28826bb516..63b761de56 100644
--- a/src/File.cc
+++ b/src/File.cc
@@ -18,18 +18,15 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <algorithm>
 #include <cerrno>
 
 #include "zeek/Attr.h"
 #include "zeek/Desc.h"
 #include "zeek/Event.h"
-#include "zeek/Expr.h"
-#include "zeek/NetVar.h"
 #include "zeek/Reporter.h"
 #include "zeek/RunState.h"
 #include "zeek/Type.h"
-#include "zeek/Var.h"
+#include "zeek/event.bif.netvar_h"
 
 namespace zeek {
 
diff --git a/src/Frag.cc b/src/Frag.cc
index 5995080e18..8666e24b5c 100644
--- a/src/Frag.cc
+++ b/src/Frag.cc
@@ -2,9 +2,6 @@
 
 #include "zeek/Frag.h"
 
-#include "zeek/zeek-config.h"
-
-#include "zeek/Hash.h"
 #include "zeek/IP.h"
 #include "zeek/NetVar.h"
 #include "zeek/Reporter.h"
diff --git a/src/Frame.h b/src/Frame.h
index 306dab2453..9b80e01601 100644
--- a/src/Frame.h
+++ b/src/Frame.h
@@ -13,7 +13,6 @@
 #include "zeek/Obj.h"
 #include "zeek/Type.h"
 #include "zeek/ZeekArgs.h"
-#include "zeek/ZeekList.h" // for typedef val_list
 
 namespace zeek {
 
diff --git a/src/Func.cc b/src/Func.cc
index e45a4fdcca..eabe9da805 100644
--- a/src/Func.cc
+++ b/src/Func.cc
@@ -16,6 +16,7 @@
 #include <csignal>
 #include <cstdlib>
 
+// Most of these includes are needed for code included from bif files.
 #include "zeek/Base64.h"
 #include "zeek/Debug.h"
 #include "zeek/Desc.h"
diff --git a/src/ID.cc b/src/ID.cc
index e860894439..7ebb744d6b 100644
--- a/src/ID.cc
+++ b/src/ID.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/ID.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/Attr.h"
 #include "zeek/Desc.h"
 #include "zeek/Dict.h"
diff --git a/src/IP.cc b/src/IP.cc
index 7fe2075cc5..c9d7807e76 100644
--- a/src/IP.cc
+++ b/src/IP.cc
@@ -10,7 +10,6 @@
 #include "zeek/Reporter.h"
 #include "zeek/Type.h"
 #include "zeek/Val.h"
-#include "zeek/Var.h"
 #include "zeek/ZeekString.h"
 
 namespace zeek {
diff --git a/src/IntSet.cc b/src/IntSet.cc
index 6e661121a9..c1e76d8d8f 100644
--- a/src/IntSet.cc
+++ b/src/IntSet.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/IntSet.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cstring>
 
 namespace zeek::detail {
diff --git a/src/MMDB.cc b/src/MMDB.cc
index 617f064d8b..406ceee513 100644
--- a/src/MMDB.cc
+++ b/src/MMDB.cc
@@ -6,7 +6,6 @@
 #include <netinet/ip.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <chrono>
 
 #include "zeek/Func.h"
 #include "zeek/IPAddr.h"
diff --git a/src/NFA.cc b/src/NFA.cc
index 20e1e75abc..c378493386 100644
--- a/src/NFA.cc
+++ b/src/NFA.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/NFA.h"
 
-#include "zeek/zeek-config.h"
-
 #include <algorithm>
 
 #include "zeek/Desc.h"
diff --git a/src/NetVar.cc b/src/NetVar.cc
index 65251f1f53..b989c33de5 100644
--- a/src/NetVar.cc
+++ b/src/NetVar.cc
@@ -2,8 +2,7 @@
 
 #include "zeek/NetVar.h"
 
-#include "zeek/zeek-config.h"
-
+// EventHandler.h is needed for event.bif.netvar_init later.
 #include "zeek/EventHandler.h"
 #include "zeek/ID.h"
 #include "zeek/Val.h"
diff --git a/src/NetVar.h b/src/NetVar.h
index 01d601c260..3c3be27044 100644
--- a/src/NetVar.h
+++ b/src/NetVar.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+// These includes are needed for the inclusion of the bif headers at the end
+// of this file.
 #include "zeek/EventRegistry.h"
 #include "zeek/Val.h"
 
diff --git a/src/Notifier.cc b/src/Notifier.cc
index 63afa3ddbd..0554284314 100644
--- a/src/Notifier.cc
+++ b/src/Notifier.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Notifier.h"
 
-#include <set>
-
 #include "zeek/DebugLogger.h"
 
 zeek::notifier::detail::Registry zeek::notifier::detail::registry;
diff --git a/src/Obj.cc b/src/Obj.cc
index 5e346fead9..1556f58172 100644
--- a/src/Obj.cc
+++ b/src/Obj.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Obj.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cstdlib>
 
 #include "zeek/Desc.h"
diff --git a/src/Obj.h b/src/Obj.h
index 661527f3bf..6faa669626 100644
--- a/src/Obj.h
+++ b/src/Obj.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <climits>
 
 namespace zeek {
diff --git a/src/OpaqueVal.cc b/src/OpaqueVal.cc
index b4dcc25a32..0b300cb02b 100644
--- a/src/OpaqueVal.cc
+++ b/src/OpaqueVal.cc
@@ -19,7 +19,6 @@
 
 #include "zeek/CompHash.h"
 #include "zeek/Desc.h"
-#include "zeek/NetVar.h"
 #include "zeek/Reporter.h"
 #include "zeek/Scope.h"
 #include "zeek/Var.h"
diff --git a/src/PolicyFile.cc b/src/PolicyFile.cc
index b5e8662c65..323c0fd89f 100644
--- a/src/PolicyFile.cc
+++ b/src/PolicyFile.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/PolicyFile.h"
 
-#include "zeek/zeek-config.h"
-
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cassert>
diff --git a/src/PriorityQueue.cc b/src/PriorityQueue.cc
index 0ed902d290..2495e55ba5 100644
--- a/src/PriorityQueue.cc
+++ b/src/PriorityQueue.cc
@@ -2,13 +2,9 @@
 
 #include "zeek/PriorityQueue.h"
 
-#include "zeek/zeek-config.h"
-
-#include <cstdio>
 #include <cstdlib>
 
 #include "zeek/Reporter.h"
-#include "zeek/util.h"
 
 namespace zeek::detail {
 
diff --git a/src/PriorityQueue.h b/src/PriorityQueue.h
index 78cb456970..3926d7df40 100644
--- a/src/PriorityQueue.h
+++ b/src/PriorityQueue.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <cmath>
 #include <cstdint>
 
diff --git a/src/RE.cc b/src/RE.cc
index bad2c01507..1ece4ebe2b 100644
--- a/src/RE.cc
+++ b/src/RE.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/RE.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cstdlib>
 #include <utility>
 
diff --git a/src/RandTest.h b/src/RandTest.h
index 6862e78504..e1f0682fe5 100644
--- a/src/RandTest.h
+++ b/src/RandTest.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <cstdint>
 
 #define RT_MONTEN                                                                                                      \
diff --git a/src/Reassem.cc b/src/Reassem.cc
index cbf0c0dc88..9733f5a9a3 100644
--- a/src/Reassem.cc
+++ b/src/Reassem.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Reassem.h"
 
-#include "zeek/zeek-config.h"
-
 #include <algorithm>
 #include <cinttypes>
 #include <limits>
diff --git a/src/Reporter.cc b/src/Reporter.cc
index 0368f72478..0cb93b8755 100644
--- a/src/Reporter.cc
+++ b/src/Reporter.cc
@@ -4,8 +4,6 @@
 
 #include "zeek/Reporter.h"
 
-#include "zeek/zeek-config.h"
-
 #include <syslog.h>
 #include <unistd.h>
 
@@ -16,7 +14,6 @@
 #include "zeek/Expr.h"
 #include "zeek/Frame.h"
 #include "zeek/ID.h"
-#include "zeek/NetVar.h"
 #include "zeek/RunState.h"
 #include "zeek/Timer.h"
 #include "zeek/file_analysis/File.h"
diff --git a/src/Rule.cc b/src/Rule.cc
index 523ed5a61f..c306ad0293 100644
--- a/src/Rule.cc
+++ b/src/Rule.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Rule.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/RuleAction.h"
 #include "zeek/RuleCondition.h"
 #include "zeek/RuleMatcher.h"
diff --git a/src/RuleAction.cc b/src/RuleAction.cc
index 0e99cdc4c4..1aabae37a1 100644
--- a/src/RuleAction.cc
+++ b/src/RuleAction.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/RuleAction.h"
 
-#include "zeek/zeek-config.h"
-
 #include <algorithm>
 #include <string>
 
@@ -12,7 +10,6 @@
 #include "zeek/Event.h"
 #include "zeek/Func.h"
 #include "zeek/ID.h"
-#include "zeek/NetVar.h"
 #include "zeek/RuleMatcher.h"
 #include "zeek/Type.h"
 #include "zeek/analyzer/Manager.h"
diff --git a/src/RuleCondition.cc b/src/RuleCondition.cc
index a888d53e53..f553a3b229 100644
--- a/src/RuleCondition.cc
+++ b/src/RuleCondition.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/RuleCondition.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/Func.h"
 #include "zeek/ID.h"
 #include "zeek/Reporter.h"
diff --git a/src/RuleCondition.h b/src/RuleCondition.h
index f49e6661d2..fb67072aff 100644
--- a/src/RuleCondition.h
+++ b/src/RuleCondition.h
@@ -5,8 +5,6 @@
 #include <sys/types.h> // for u_char
 #include <cstdint>     // for u_char
 
-#include "zeek/util.h"
-
 namespace zeek::detail {
 
 class RuleEndpointState;
diff --git a/src/RuleMatcher.h b/src/RuleMatcher.h
index 6f801645ba..9242ceb5c0 100644
--- a/src/RuleMatcher.h
+++ b/src/RuleMatcher.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <sys/types.h> // for u_char
-#include <climits>
 #include <functional>
 #include <map>
 #include <set>
diff --git a/src/RunState.h b/src/RunState.h
index 451b9cb63b..115539b2c6 100644
--- a/src/RunState.h
+++ b/src/RunState.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <optional>
 #include <string>
 
diff --git a/src/ScannedFile.cc b/src/ScannedFile.cc
index 52df993ac5..16e538468c 100644
--- a/src/ScannedFile.cc
+++ b/src/ScannedFile.cc
@@ -3,7 +3,6 @@
 #include "zeek/ScannedFile.h"
 
 #include <cerrno>
-#include <climits> // for PATH_MAX
 
 #include "zeek/DebugLogger.h"
 #include "zeek/Reporter.h"
diff --git a/src/ScannedFile.h b/src/ScannedFile.h
index 2658d47f48..84e9e20a6a 100644
--- a/src/ScannedFile.h
+++ b/src/ScannedFile.h
@@ -2,12 +2,13 @@
 
 #pragma once
 
-#include <zeek/Obj.h>
 #include <list>
 #include <optional>
 #include <string>
 #include <vector>
 
+#include "zeek/Obj.h"
+
 namespace zeek::detail {
 
 // Script file we have already scanned (or are in the process of scanning).
diff --git a/src/Scope.cc b/src/Scope.cc
index 4bebbcdbbf..26e67b0b26 100644
--- a/src/Scope.cc
+++ b/src/Scope.cc
@@ -2,13 +2,11 @@
 
 #include "zeek/Scope.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/Desc.h"
 #include "zeek/ID.h"
 #include "zeek/IntrusivePtr.h"
 #include "zeek/Reporter.h"
-#include "zeek/Val.h"
+#include "zeek/Type.h"
 #include "zeek/module_util.h"
 
 namespace zeek::detail {
diff --git a/src/ScriptCoverageManager.h b/src/ScriptCoverageManager.h
index fe7886a969..6cd6852753 100644
--- a/src/ScriptCoverageManager.h
+++ b/src/ScriptCoverageManager.h
@@ -9,7 +9,6 @@
 
 #include "zeek/ID.h"
 #include "zeek/StmtBase.h"
-#include "zeek/util.h"
 
 namespace zeek::detail {
 
diff --git a/src/ScriptProfile.cc b/src/ScriptProfile.cc
index cd244ab5b5..5a86941c03 100644
--- a/src/ScriptProfile.cc
+++ b/src/ScriptProfile.cc
@@ -2,6 +2,8 @@
 
 #include "zeek/ScriptProfile.h"
 
+#include <cinttypes>
+
 namespace zeek {
 
 namespace detail {
diff --git a/src/ScriptProfile.h b/src/ScriptProfile.h
index fae054c2f9..cea8b002fc 100644
--- a/src/ScriptProfile.h
+++ b/src/ScriptProfile.h
@@ -7,7 +7,6 @@
 #include <string>
 
 #include "zeek/Func.h"
-#include "zeek/Stmt.h"
 
 namespace zeek {
 
diff --git a/src/ScriptValidation.cc b/src/ScriptValidation.cc
index cc2bf69092..6660d50377 100644
--- a/src/ScriptValidation.cc
+++ b/src/ScriptValidation.cc
@@ -3,8 +3,6 @@
 #include "zeek/ScriptValidation.h"
 
 #include "zeek/Func.h"
-#include "zeek/Reporter.h"
-#include "zeek/Stmt.h"
 #include "zeek/Traverse.h"
 
 namespace zeek::detail {
diff --git a/src/SerializationFormat.h b/src/SerializationFormat.h
index 6f18aae740..a0a2391fc9 100644
--- a/src/SerializationFormat.h
+++ b/src/SerializationFormat.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <cstdint>
 #include <string>
 
diff --git a/src/SmithWaterman.cc b/src/SmithWaterman.cc
index eb748e22cb..30bece0476 100644
--- a/src/SmithWaterman.cc
+++ b/src/SmithWaterman.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/SmithWaterman.h"
 
-#include "zeek/zeek-config.h"
-
 #include <algorithm>
 #include <cctype>
 
diff --git a/src/SmithWaterman.h b/src/SmithWaterman.h
index 665931d618..fa0550f7d8 100644
--- a/src/SmithWaterman.h
+++ b/src/SmithWaterman.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <map>
+#include <string>
 #include <vector>
 
 #include "zeek/ZeekString.h"
diff --git a/src/Stats.h b/src/Stats.h
index 129f047420..115aab7c11 100644
--- a/src/Stats.h
+++ b/src/Stats.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <cstdint>
 #include <memory>
 
diff --git a/src/Stmt.cc b/src/Stmt.cc
index 47e839e189..1a1a9103bd 100644
--- a/src/Stmt.cc
+++ b/src/Stmt.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Stmt.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/CompHash.h"
 #include "zeek/Debug.h"
 #include "zeek/Desc.h"
@@ -13,7 +11,6 @@
 #include "zeek/File.h"
 #include "zeek/Frame.h"
 #include "zeek/IntrusivePtr.h"
-#include "zeek/NetVar.h"
 #include "zeek/Reporter.h"
 #include "zeek/Scope.h"
 #include "zeek/Traverse.h"
diff --git a/src/Tag.h b/src/Tag.h
index 2d730ba87b..a35ba119c6 100644
--- a/src/Tag.h
+++ b/src/Tag.h
@@ -2,13 +2,10 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <cstdint>
 #include <string>
 
 #include "zeek/IntrusivePtr.h"
-#include "zeek/util.h"
 
 namespace zeek {
 
diff --git a/src/Timer.cc b/src/Timer.cc
index 70fa7f4ff7..47dda1db61 100644
--- a/src/Timer.cc
+++ b/src/Timer.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Timer.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/Desc.h"
 #include "zeek/NetVar.h"
 #include "zeek/RunState.h"
diff --git a/src/TraverseTypes.h b/src/TraverseTypes.h
index fbc0fa4c9d..5a2cd4a613 100644
--- a/src/TraverseTypes.h
+++ b/src/TraverseTypes.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 namespace zeek::detail {
 
 class TraversalCallback;
diff --git a/src/TunnelEncapsulation.h b/src/TunnelEncapsulation.h
index 06c293dc5d..402e6cca0d 100644
--- a/src/TunnelEncapsulation.h
+++ b/src/TunnelEncapsulation.h
@@ -4,7 +4,6 @@
 
 #include <vector>
 
-#include "zeek/ID.h"
 #include "zeek/IP.h"
 #include "zeek/IPAddr.h"
 #include "zeek/NetVar.h"
diff --git a/src/Type.cc b/src/Type.cc
index 2fa1209613..5a5c62b627 100644
--- a/src/Type.cc
+++ b/src/Type.cc
@@ -2,10 +2,7 @@
 
 #include "zeek/Type.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cinttypes>
-#include <list>
 #include <map>
 #include <string>
 #include <unordered_set>
diff --git a/src/UID.cc b/src/UID.cc
index df5ac1a03f..f18ac0208a 100644
--- a/src/UID.cc
+++ b/src/UID.cc
@@ -7,8 +7,6 @@
 #include "zeek/Reporter.h"
 #include "zeek/util.h"
 
-using namespace std;
-
 namespace zeek {
 
 void UID::Set(zeek_uint_t bits, const uint64_t* v, size_t n) {
diff --git a/src/Var.cc b/src/Var.cc
index 44ced49665..a93cdd1c75 100644
--- a/src/Var.cc
+++ b/src/Var.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/Var.h"
 
-#include "zeek/zeek-config.h"
-
 #include <memory>
 
 #include "zeek/Desc.h"
@@ -18,7 +16,6 @@
 #include "zeek/Stmt.h"
 #include "zeek/Traverse.h"
 #include "zeek/Val.h"
-#include "zeek/module_util.h"
 #include "zeek/script_opt/IDOptInfo.h"
 #include "zeek/script_opt/ScriptOpt.h"
 #include "zeek/script_opt/StmtOptInfo.h"
diff --git a/src/WeirdState.cc b/src/WeirdState.cc
index 014676b3af..b7fc2742c4 100644
--- a/src/WeirdState.cc
+++ b/src/WeirdState.cc
@@ -3,7 +3,6 @@
 #include "zeek/WeirdState.h"
 
 #include "zeek/RunState.h"
-#include "zeek/util.h"
 
 namespace zeek::detail {
 
diff --git a/src/ZVal.cc b/src/ZVal.cc
index b6510fb8fc..a5088f636b 100644
--- a/src/ZVal.cc
+++ b/src/ZVal.cc
@@ -4,7 +4,6 @@
 #include "zeek/Func.h"
 #include "zeek/OpaqueVal.h"
 #include "zeek/Reporter.h"
-#include "zeek/ZeekString.h"
 
 using namespace zeek;
 
diff --git a/src/ZVal.h b/src/ZVal.h
index 1223c67b39..91be06960e 100644
--- a/src/ZVal.h
+++ b/src/ZVal.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
+#include "zeek/IntrusivePtr.h"
 
 namespace zeek {
 
@@ -19,6 +19,7 @@ class RecordVal;
 class StringVal;
 class SubNetVal;
 class TableVal;
+class Type;
 class TypeVal;
 class Val;
 class VectorVal;
@@ -32,6 +33,7 @@ using RecordValPtr = IntrusivePtr<RecordVal>;
 using StringValPtr = IntrusivePtr<StringVal>;
 using SubNetValPtr = IntrusivePtr<SubNetVal>;
 using TableValPtr = IntrusivePtr<TableVal>;
+using TypePtr = IntrusivePtr<Type>;
 using TypeValPtr = IntrusivePtr<TypeVal>;
 using ValPtr = IntrusivePtr<Val>;
 using VectorValPtr = IntrusivePtr<VectorVal>;
diff --git a/src/ZeekString.cc b/src/ZeekString.cc
index f51810dba3..6ebd7c70aa 100644
--- a/src/ZeekString.cc
+++ b/src/ZeekString.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/ZeekString.h"
 
-#include "zeek/zeek-config.h"
-
 #include <algorithm>
 #include <cctype>
 #include <iostream>
diff --git a/src/ZeekString.h b/src/ZeekString.h
index 52fe440680..a861977837 100644
--- a/src/ZeekString.h
+++ b/src/ZeekString.h
@@ -2,11 +2,9 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <sys/types.h>
 #include <iosfwd>
-#include <string>
+#include <string_view>
 #include <vector>
 
 namespace zeek {
diff --git a/src/binpac_zeek.h b/src/binpac_zeek.h
index 7f3309c127..2ba717e066 100644
--- a/src/binpac_zeek.h
+++ b/src/binpac_zeek.h
@@ -10,9 +10,6 @@
 #include "zeek/file_analysis/Analyzer.h"
 #include "zeek/iosource/Packet.h"
 #include "zeek/packet_analysis/Analyzer.h"
-#include "zeek/util.h"
-
-#include "event.bif.func_h"
 
 namespace binpac {
 
diff --git a/src/main.cc b/src/main.cc
index 905f80eacb..877d3786a2 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,7 +1,5 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek/zeek-config.h"
-
 #include <unistd.h>
 #include <cinttypes>
 
@@ -11,6 +9,8 @@
 #include "zeek/supervisor/Supervisor.h"
 #include "zeek/zeek-setup.h"
 
+#include "const.bif.netvar_h"
+
 #ifdef _MSC_VER
 #include <fcntl.h> // For _O_BINARY.
 
diff --git a/src/module_util.cc b/src/module_util.cc
index 4fd8f96b51..7602f55f75 100644
--- a/src/module_util.cc
+++ b/src/module_util.cc
@@ -4,7 +4,6 @@
 #include "zeek/module_util.h"
 
 #include <cstring>
-#include <iostream>
 #include <string>
 
 #include "zeek/3rdparty/doctest.h"
diff --git a/src/net_util.cc b/src/net_util.cc
index ccd6876fb3..b756d07ed9 100644
--- a/src/net_util.cc
+++ b/src/net_util.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/net_util.h"
 
-#include "zeek/zeek-config.h"
-
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
diff --git a/src/util.cc b/src/util.cc
index 27e4f030dd..6bc246172d 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -41,24 +41,25 @@
 #include <algorithm>
 #include <array>
 #include <iostream>
-#include <random>
 #include <string>
 #include <vector>
 
 #include "zeek/3rdparty/ConvertUTF.h"
 #include "zeek/Desc.h"
 #include "zeek/Hash.h"
-#include "zeek/NetVar.h"
 #include "zeek/Obj.h"
 #include "zeek/Reporter.h"
 #include "zeek/RunState.h"
-#include "zeek/ScannedFile.h"
 #include "zeek/Val.h"
 #include "zeek/digest.h"
 #include "zeek/input.h"
 #include "zeek/iosource/Manager.h"
 #include "zeek/iosource/PktSrc.h"
 
+#ifdef _MSC_VER
+#include "zeek/ScannedFile.h"
+#endif
+
 #include "zeek/3rdparty/doctest.h"
 
 using namespace std;
diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index 0055cf1b3a..f00d0478e3 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -23,6 +23,8 @@
 #include "zeek/3rdparty/sqlite3.h"
 #endif
 
+#include <binpac.h>
+
 #include "zeek/DNS_Mgr.h"
 #include "zeek/Debug.h"
 #include "zeek/Desc.h"
@@ -49,7 +51,6 @@
 #include "zeek/Trigger.h"
 #include "zeek/Var.h"
 #include "zeek/analyzer/Manager.h"
-#include "zeek/binpac_zeek.h"
 #include "zeek/broker/Manager.h"
 #include "zeek/cluster/Backend.h"
 #include "zeek/cluster/Manager.h"