From 896e41c794600051a81eb29f021e69d01cd2f0d9 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 6 May 2025 16:48:49 -0700 Subject: [PATCH 1/8] Remove unnecessary #includes in base files in repo --- src/Attr.cc | 2 -- src/Base64.cc | 2 -- src/Base64.h | 2 -- src/CCL.cc | 4 +--- src/CompHash.cc | 2 -- src/Conn.cc | 4 ---- src/Conn.h | 2 -- src/DNS_Mgr.cc | 1 - src/DNS_Mgr.h | 2 -- src/DbgBreakpoint.cc | 3 --- src/DbgBreakpoint.h | 3 +-- src/DbgWatch.cc | 2 -- src/DbgWatch.h | 2 -- src/Debug.cc | 2 -- src/Debug.h | 6 +++++- src/DebugCmds.cc | 3 --- src/DebugLogger.h | 6 +++--- src/Desc.cc | 3 --- src/Discard.cc | 3 --- src/EquivClass.cc | 2 -- src/EventRegistry.h | 2 -- src/Expr.cc | 3 --- src/File.cc | 5 +---- src/Frag.cc | 3 --- src/Frame.h | 1 - src/Func.cc | 1 + src/ID.cc | 2 -- src/IP.cc | 1 - src/IntSet.cc | 2 -- src/MMDB.cc | 1 - src/NFA.cc | 2 -- src/NetVar.cc | 3 +-- src/NetVar.h | 2 ++ src/Notifier.cc | 2 -- src/Obj.cc | 2 -- src/Obj.h | 2 -- src/OpaqueVal.cc | 1 - src/PolicyFile.cc | 2 -- src/PriorityQueue.cc | 4 ---- src/PriorityQueue.h | 2 -- src/RE.cc | 2 -- src/RandTest.h | 2 -- src/Reassem.cc | 2 -- src/Reporter.cc | 3 --- src/Rule.cc | 2 -- src/RuleAction.cc | 3 --- src/RuleCondition.cc | 2 -- src/RuleCondition.h | 2 -- src/RuleMatcher.h | 1 - src/RunState.h | 2 -- src/ScannedFile.cc | 1 - src/ScannedFile.h | 3 ++- src/Scope.cc | 4 +--- src/ScriptCoverageManager.h | 1 - src/ScriptProfile.cc | 2 ++ src/ScriptProfile.h | 1 - src/ScriptValidation.cc | 2 -- src/SerializationFormat.h | 2 -- src/SmithWaterman.cc | 2 -- src/SmithWaterman.h | 1 + src/Stats.h | 2 -- src/Stmt.cc | 3 --- src/Tag.h | 3 --- src/Timer.cc | 2 -- src/TraverseTypes.h | 2 -- src/TunnelEncapsulation.h | 1 - src/Type.cc | 3 --- src/UID.cc | 2 -- src/Var.cc | 3 --- src/WeirdState.cc | 1 - src/ZVal.cc | 1 - src/ZVal.h | 4 +++- src/ZeekString.cc | 2 -- src/ZeekString.h | 4 +--- src/binpac_zeek.h | 3 --- src/main.cc | 4 ++-- src/module_util.cc | 1 - src/net_util.cc | 2 -- src/util.cc | 7 ++++--- src/zeek-setup.cc | 3 ++- 80 files changed, 33 insertions(+), 159 deletions(-) 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 #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 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 -#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 #include #include 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 #include #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 #include -#include -#include #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 #include #include -#include #include #include #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 #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 #include -#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 #include #include 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 #include #include #include @@ -11,7 +12,10 @@ #include "zeek/Obj.h" #include "zeek/StmtEnums.h" -#include "zeek/util.h" + +#ifdef _MSC_VER +#include // 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 #include #include @@ -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 #include #include -#include "zeek/util.h" +#ifdef _MSC_VER +#include // 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 #include #include #include -#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 #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 #include #include 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 #include #include -#include #include #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 #include +// 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 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 #include #include -#include #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 #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 - #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 #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 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 #include #include 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 #include #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 #include 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 #include 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 #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 #include #include 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 #include @@ -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 #include @@ -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 // for u_char #include // 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 // for u_char -#include #include #include #include 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 #include 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 -#include // 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 #include #include #include #include +#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 + 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 #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 #include 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 #include 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 +#include #include #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 #include 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 #include #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 -#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 -#include #include #include #include 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 #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; using StringValPtr = IntrusivePtr; using SubNetValPtr = IntrusivePtr; using TableValPtr = IntrusivePtr; +using TypePtr = IntrusivePtr; using TypeValPtr = IntrusivePtr; using ValPtr = IntrusivePtr; using VectorValPtr = IntrusivePtr; 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 #include #include 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 #include -#include +#include #include 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 #include @@ -11,6 +9,8 @@ #include "zeek/supervisor/Supervisor.h" #include "zeek/zeek-setup.h" +#include "const.bif.netvar_h" + #ifdef _MSC_VER #include // 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 -#include #include #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 #include #include 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 #include #include -#include #include #include #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 + #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" From 456c1fa42cf58355634da8b990d5f49c49e323bb Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 8 Apr 2025 14:57:34 -0700 Subject: [PATCH 2/8] Remove unnecessary #includes in analyzer/packet analyzer/file analyzer headers --- src/Discard.cc | 2 ++ src/Discard.h | 2 +- src/analyzer/Analyzer.h | 1 - src/analyzer/Component.h | 2 -- src/analyzer/Manager.h | 2 +- src/analyzer/protocol/conn-size/ConnSize.h | 1 - src/analyzer/protocol/dce-rpc/DCE_RPC.h | 4 +--- src/analyzer/protocol/dns/DNS.cc | 6 +++--- src/analyzer/protocol/dns/DNS.h | 1 - src/analyzer/protocol/gssapi/GSSAPI.h | 1 - src/analyzer/protocol/imap/IMAP.h | 3 --- src/analyzer/protocol/krb/KRB.h | 6 +++--- src/analyzer/protocol/mime/MIME.h | 1 - src/analyzer/protocol/mqtt/MQTT.h | 1 - src/analyzer/protocol/mysql/MySQL.h | 1 - src/analyzer/protocol/ncp/NCP.h | 1 - src/analyzer/protocol/ntlm/NTLM.h | 1 - src/analyzer/protocol/ntp/NTP.h | 2 -- src/analyzer/protocol/radius/RADIUS.h | 1 - src/analyzer/protocol/rdp/RDP.h | 1 - src/analyzer/protocol/rdp/RDPEUDP.h | 1 - src/analyzer/protocol/rfb/RFB.h | 1 - src/analyzer/protocol/rpc/NFS.h | 1 - src/analyzer/protocol/rpc/RPC.h | 1 - src/analyzer/protocol/rpc/XDR.h | 2 -- src/analyzer/protocol/sip/SIP.h | 1 - src/analyzer/protocol/snmp/SNMP.h | 3 ++- src/analyzer/protocol/snmp/snmp.pac | 1 - src/analyzer/protocol/ssh/SSH.h | 1 - src/analyzer/protocol/ssl/DTLS.h | 2 +- src/analyzer/protocol/ssl/SSL.h | 1 - src/analyzer/protocol/syslog/legacy/Syslog.h | 2 +- src/analyzer/protocol/tcp/TCP.h | 2 -- src/analyzer/protocol/zip/ZIP.h | 2 -- src/file_analysis/Component.h | 2 -- src/file_analysis/File.cc | 4 ++-- src/file_analysis/File.h | 2 -- src/file_analysis/FileReassembler.h | 1 - src/file_analysis/analyzer/data_event/DataEvent.h | 2 -- src/file_analysis/analyzer/entropy/Entropy.cc | 1 + src/file_analysis/analyzer/entropy/Entropy.h | 3 --- src/file_analysis/analyzer/extract/Extract.cc | 2 +- src/file_analysis/analyzer/extract/Extract.h | 1 - src/file_analysis/analyzer/hash/Hash.h | 2 -- src/file_analysis/analyzer/pe/PE.h | 3 --- src/packet_analysis/Component.h | 2 -- src/packet_analysis/Dispatcher.h | 1 - src/packet_analysis/Manager.h | 1 - src/packet_analysis/protocol/ayiya/AYIYA.h | 2 +- src/packet_analysis/protocol/fddi/FDDI.h | 2 +- src/packet_analysis/protocol/geneve/Geneve.h | 3 ++- src/packet_analysis/protocol/gre/GRE.h | 2 +- src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc | 1 + src/packet_analysis/protocol/ieee802_11/IEEE802_11.h | 2 +- .../protocol/ieee802_11_radio/IEEE802_11_Radio.h | 2 +- src/packet_analysis/protocol/ip/IP.cc | 1 - src/packet_analysis/protocol/ip/IPBasedAnalyzer.h | 1 - src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h | 4 +++- src/packet_analysis/protocol/llc/LLC.h | 2 +- src/packet_analysis/protocol/mpls/MPLS.h | 2 +- src/packet_analysis/protocol/nflog/NFLog.h | 2 +- src/packet_analysis/protocol/novell_802_3/Novell_802_3.h | 2 +- src/packet_analysis/protocol/ppp/PPP.h | 2 +- src/packet_analysis/protocol/ppp_serial/PPPSerial.h | 2 +- src/packet_analysis/protocol/pppoe/PPPoE.h | 2 +- src/packet_analysis/protocol/tcp/TCP.h | 1 - src/packet_analysis/protocol/tcp/TCPSessionAdapter.h | 2 -- src/packet_analysis/protocol/teredo/Teredo.h | 1 - src/packet_analysis/protocol/vntag/VNTag.h | 2 +- src/packet_analysis/protocol/vxlan/VXLAN.h | 2 +- src/spicy/manager.cc | 1 + testing/btest/plugins/protocol-plugin/src/Foo.cc | 1 + 72 files changed, 41 insertions(+), 91 deletions(-) diff --git a/src/Discard.cc b/src/Discard.cc index 9c5ec0272f..8ad64a880e 100644 --- a/src/Discard.cc +++ b/src/Discard.cc @@ -22,6 +22,8 @@ Discarder::Discarder() { discarder_maxlen = static_cast(id::find_val("discarder_maxlen")->AsCount()); } +Discarder::~Discarder() {} + bool Discarder::IsActive() { return check_ip || check_tcp || check_udp || check_icmp; } bool Discarder::NextPacket(const std::shared_ptr& ip, int len, int caplen) { diff --git a/src/Discard.h b/src/Discard.h index 9049516329..7adb6ea21c 100644 --- a/src/Discard.h +++ b/src/Discard.h @@ -19,7 +19,7 @@ namespace detail { class Discarder final { public: Discarder(); - ~Discarder() = default; + ~Discarder(); bool IsActive(); diff --git a/src/analyzer/Analyzer.h b/src/analyzer/Analyzer.h index 78b7bfadfa..ee35a457e6 100644 --- a/src/analyzer/Analyzer.h +++ b/src/analyzer/Analyzer.h @@ -10,7 +10,6 @@ #include "zeek/EventHandler.h" #include "zeek/IntrusivePtr.h" -#include "zeek/Obj.h" #include "zeek/Tag.h" #include "zeek/Timer.h" diff --git a/src/analyzer/Component.h b/src/analyzer/Component.h index 324cc6e5bb..9f5e645e1b 100644 --- a/src/analyzer/Component.h +++ b/src/analyzer/Component.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include "zeek/Tag.h" #include "zeek/plugin/Component.h" #include "zeek/util.h" diff --git a/src/analyzer/Manager.h b/src/analyzer/Manager.h index 6657b5f2d9..f358e4adcf 100644 --- a/src/analyzer/Manager.h +++ b/src/analyzer/Manager.h @@ -24,10 +24,10 @@ #include #include "zeek/IP.h" +#include "zeek/IPAddr.h" #include "zeek/Tag.h" #include "zeek/analyzer/Analyzer.h" #include "zeek/analyzer/Component.h" -#include "zeek/analyzer/analyzer.bif.h" #include "zeek/net_util.h" #include "zeek/plugin/ComponentManager.h" diff --git a/src/analyzer/protocol/conn-size/ConnSize.h b/src/analyzer/protocol/conn-size/ConnSize.h index 3e2c62be25..2ba0aacfbe 100644 --- a/src/analyzer/protocol/conn-size/ConnSize.h +++ b/src/analyzer/protocol/conn-size/ConnSize.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/NetVar.h" #include "zeek/analyzer/Analyzer.h" namespace zeek::analyzer::conn_size { diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.h b/src/analyzer/protocol/dce-rpc/DCE_RPC.h index 7ddafd7716..a4ef01869f 100644 --- a/src/analyzer/protocol/dce-rpc/DCE_RPC.h +++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.h @@ -2,10 +2,8 @@ #pragma once -#include "zeek/IPAddr.h" -#include "zeek/NetVar.h" +#include "zeek/Conn.h" #include "zeek/analyzer/protocol/dce-rpc/dce_rpc_pac.h" -#include "zeek/analyzer/protocol/dce-rpc/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP.h" namespace zeek::analyzer::dce_rpc { diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index 12b30f22b5..4930c2dcfd 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -792,7 +792,7 @@ bool DNS_Interpreter::ParseRR_EDNS(detail::DNS_MsgInfo* msg, const u_char*& data void DNS_Interpreter::ExtractOctets(const u_char*& data, int& len, String** p) { uint16_t dlen = ExtractShort(data, len); - dlen = min(len, static_cast(dlen)); + dlen = std::min(len, static_cast(dlen)); if ( p ) *p = new String(data, dlen, false); @@ -802,8 +802,8 @@ void DNS_Interpreter::ExtractOctets(const u_char*& data, int& len, String** p) { } String* DNS_Interpreter::ExtractStream(const u_char*& data, int& len, int l) { - l = max(l, 0); - int dlen = min(len, l); // Len in bytes of the algorithm use + l = std::max(l, 0); + int dlen = std::min(len, l); // Len in bytes of the algorithm use auto rval = new String(data, dlen, false); data += dlen; diff --git a/src/analyzer/protocol/dns/DNS.h b/src/analyzer/protocol/dns/DNS.h index 0894b3bad8..7c6fe57f36 100644 --- a/src/analyzer/protocol/dns/DNS.h +++ b/src/analyzer/protocol/dns/DNS.h @@ -3,7 +3,6 @@ #pragma once #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "zeek/binpac_zeek.h" namespace zeek::analyzer::dns { namespace detail { diff --git a/src/analyzer/protocol/gssapi/GSSAPI.h b/src/analyzer/protocol/gssapi/GSSAPI.h index 7c56439717..68d8f43a0b 100644 --- a/src/analyzer/protocol/gssapi/GSSAPI.h +++ b/src/analyzer/protocol/gssapi/GSSAPI.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/gssapi/events.bif.h" #include "zeek/analyzer/protocol/gssapi/gssapi_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/imap/IMAP.h b/src/analyzer/protocol/imap/IMAP.h index 572cdc1ea3..0cc6b0118e 100644 --- a/src/analyzer/protocol/imap/IMAP.h +++ b/src/analyzer/protocol/imap/IMAP.h @@ -2,9 +2,6 @@ #pragma once -// for std::transform -#include - #include "zeek/analyzer/protocol/tcp/TCP.h" #include "analyzer/protocol/imap/imap_pac.h" diff --git a/src/analyzer/protocol/krb/KRB.h b/src/analyzer/protocol/krb/KRB.h index 2e737f6d96..d30490eb82 100644 --- a/src/analyzer/protocol/krb/KRB.h +++ b/src/analyzer/protocol/krb/KRB.h @@ -2,15 +2,15 @@ #pragma once +// This is needed for USE_KRB5 below. #include "zeek/zeek-config.h" -#include - #ifdef USE_KRB5 #include #endif -#include "analyzer/protocol/krb/krb_pac.h" +#include "zeek/analyzer/Analyzer.h" +#include "zeek/analyzer/protocol/krb/krb_pac.h" namespace zeek::analyzer::krb { diff --git a/src/analyzer/protocol/mime/MIME.h b/src/analyzer/protocol/mime/MIME.h index c9079b3900..62c538a511 100644 --- a/src/analyzer/protocol/mime/MIME.h +++ b/src/analyzer/protocol/mime/MIME.h @@ -4,7 +4,6 @@ #include #include -#include #include #include "zeek/Reporter.h" diff --git a/src/analyzer/protocol/mqtt/MQTT.h b/src/analyzer/protocol/mqtt/MQTT.h index 2818402b66..546a8010d9 100644 --- a/src/analyzer/protocol/mqtt/MQTT.h +++ b/src/analyzer/protocol/mqtt/MQTT.h @@ -4,7 +4,6 @@ #pragma once -#include "zeek/ID.h" #include "zeek/analyzer/protocol/tcp/TCP.h" namespace binpac { diff --git a/src/analyzer/protocol/mysql/MySQL.h b/src/analyzer/protocol/mysql/MySQL.h index 5f7b8abcde..ed5dee4b4f 100644 --- a/src/analyzer/protocol/mysql/MySQL.h +++ b/src/analyzer/protocol/mysql/MySQL.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/mysql/events.bif.h" #include "zeek/analyzer/protocol/mysql/mysql_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/ncp/NCP.h b/src/analyzer/protocol/ncp/NCP.h index 4ccd3c1186..590158c99d 100644 --- a/src/analyzer/protocol/ncp/NCP.h +++ b/src/analyzer/protocol/ncp/NCP.h @@ -17,7 +17,6 @@ // // http://faydoc.tripod.com/structures/21/2149.htm -#include "zeek/NetVar.h" #include "zeek/analyzer/protocol/tcp/TCP.h" #include "analyzer/protocol/ncp/ncp_pac.h" diff --git a/src/analyzer/protocol/ntlm/NTLM.h b/src/analyzer/protocol/ntlm/NTLM.h index fda392405a..a741c48812 100644 --- a/src/analyzer/protocol/ntlm/NTLM.h +++ b/src/analyzer/protocol/ntlm/NTLM.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/ntlm/events.bif.h" #include "zeek/analyzer/protocol/ntlm/ntlm_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/ntp/NTP.h b/src/analyzer/protocol/ntp/NTP.h index 2b1412e5dc..e67553658d 100644 --- a/src/analyzer/protocol/ntp/NTP.h +++ b/src/analyzer/protocol/ntp/NTP.h @@ -2,9 +2,7 @@ #pragma once -#include "zeek/analyzer/protocol/ntp/events.bif.h" #include "zeek/analyzer/protocol/ntp/ntp_pac.h" -#include "zeek/analyzer/protocol/ntp/types.bif.h" namespace zeek::analyzer::ntp { diff --git a/src/analyzer/protocol/radius/RADIUS.h b/src/analyzer/protocol/radius/RADIUS.h index baca03ee4f..c3d1069411 100644 --- a/src/analyzer/protocol/radius/RADIUS.h +++ b/src/analyzer/protocol/radius/RADIUS.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/radius/events.bif.h" #include "zeek/analyzer/protocol/radius/radius_pac.h" namespace zeek::analyzer::radius { diff --git a/src/analyzer/protocol/rdp/RDP.h b/src/analyzer/protocol/rdp/RDP.h index 832127b3c7..c89107fb44 100644 --- a/src/analyzer/protocol/rdp/RDP.h +++ b/src/analyzer/protocol/rdp/RDP.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/rdp/events.bif.h" #include "zeek/analyzer/protocol/rdp/rdp_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/rdp/RDPEUDP.h b/src/analyzer/protocol/rdp/RDPEUDP.h index 5b3222e92f..5e8d0c52a9 100644 --- a/src/analyzer/protocol/rdp/RDPEUDP.h +++ b/src/analyzer/protocol/rdp/RDPEUDP.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/rdp/events.bif.h" #include "zeek/analyzer/protocol/rdp/rdpeudp_pac.h" namespace zeek::analyzer::rdpeudp { diff --git a/src/analyzer/protocol/rfb/RFB.h b/src/analyzer/protocol/rfb/RFB.h index 9d799a9271..2337ba90c2 100644 --- a/src/analyzer/protocol/rfb/RFB.h +++ b/src/analyzer/protocol/rfb/RFB.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/rfb/events.bif.h" #include "zeek/analyzer/protocol/rfb/rfb_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/rpc/NFS.h b/src/analyzer/protocol/rpc/NFS.h index 5b1c74513a..8633b78878 100644 --- a/src/analyzer/protocol/rpc/NFS.h +++ b/src/analyzer/protocol/rpc/NFS.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/NetVar.h" #include "zeek/analyzer/protocol/rpc/RPC.h" namespace zeek::analyzer::rpc { diff --git a/src/analyzer/protocol/rpc/RPC.h b/src/analyzer/protocol/rpc/RPC.h index 7654fb6141..8e198db983 100644 --- a/src/analyzer/protocol/rpc/RPC.h +++ b/src/analyzer/protocol/rpc/RPC.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/NetVar.h" #include "zeek/analyzer/protocol/tcp/TCP.h" namespace zeek::analyzer::rpc { diff --git a/src/analyzer/protocol/rpc/XDR.h b/src/analyzer/protocol/rpc/XDR.h index 846d9dfd6c..89208726ea 100644 --- a/src/analyzer/protocol/rpc/XDR.h +++ b/src/analyzer/protocol/rpc/XDR.h @@ -5,8 +5,6 @@ #include #include -#include "zeek/util.h" - namespace zeek::analyzer::rpc { extern uint32_t extract_XDR_uint32(const u_char*& buf, int& len); diff --git a/src/analyzer/protocol/sip/SIP.h b/src/analyzer/protocol/sip/SIP.h index 5f0f652620..634e23a6dd 100644 --- a/src/analyzer/protocol/sip/SIP.h +++ b/src/analyzer/protocol/sip/SIP.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/sip/events.bif.h" #include "zeek/analyzer/protocol/sip/sip_pac.h" namespace zeek::analyzer::sip { diff --git a/src/analyzer/protocol/snmp/SNMP.h b/src/analyzer/protocol/snmp/SNMP.h index 63edb063fe..3800263ac9 100644 --- a/src/analyzer/protocol/snmp/SNMP.h +++ b/src/analyzer/protocol/snmp/SNMP.h @@ -2,7 +2,8 @@ #pragma once -#include "analyzer/protocol/snmp/snmp_pac.h" +#include "zeek/analyzer/Analyzer.h" +#include "zeek/analyzer/protocol/snmp/snmp_pac.h" namespace zeek::analyzer::snmp { diff --git a/src/analyzer/protocol/snmp/snmp.pac b/src/analyzer/protocol/snmp/snmp.pac index c345f98f49..dafd2cdac2 100644 --- a/src/analyzer/protocol/snmp/snmp.pac +++ b/src/analyzer/protocol/snmp/snmp.pac @@ -2,7 +2,6 @@ %include zeek.pac %extern{ -#include "zeek/Reporter.h" #include "zeek/analyzer/protocol/snmp/types.bif.h" #include "zeek/analyzer/protocol/snmp/events.bif.h" %} diff --git a/src/analyzer/protocol/ssh/SSH.h b/src/analyzer/protocol/ssh/SSH.h index 284e0c828e..2adba14fde 100644 --- a/src/analyzer/protocol/ssh/SSH.h +++ b/src/analyzer/protocol/ssh/SSH.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/ssh/events.bif.h" #include "zeek/analyzer/protocol/ssh/ssh_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/ssl/DTLS.h b/src/analyzer/protocol/ssl/DTLS.h index 8b7f95bdcb..04d564e9ea 100644 --- a/src/analyzer/protocol/ssl/DTLS.h +++ b/src/analyzer/protocol/ssl/DTLS.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek/analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/Analyzer.h" namespace binpac { namespace DTLS { diff --git a/src/analyzer/protocol/ssl/SSL.h b/src/analyzer/protocol/ssl/SSL.h index e721e0e600..4a08259fe9 100644 --- a/src/analyzer/protocol/ssl/SSL.h +++ b/src/analyzer/protocol/ssl/SSL.h @@ -3,7 +3,6 @@ #pragma once #include "zeek/analyzer/protocol/pia/PIA.h" -#include "zeek/analyzer/protocol/ssl/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP.h" namespace binpac { diff --git a/src/analyzer/protocol/syslog/legacy/Syslog.h b/src/analyzer/protocol/syslog/legacy/Syslog.h index d64f8bc40b..fdb552dd7c 100644 --- a/src/analyzer/protocol/syslog/legacy/Syslog.h +++ b/src/analyzer/protocol/syslog/legacy/Syslog.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek/analyzer/protocol/tcp/TCP.h" +#include "zeek/analyzer/Analyzer.h" #include "analyzer/protocol/syslog/legacy/syslog_pac.h" diff --git a/src/analyzer/protocol/tcp/TCP.h b/src/analyzer/protocol/tcp/TCP.h index b804352cee..74d92ceb16 100644 --- a/src/analyzer/protocol/tcp/TCP.h +++ b/src/analyzer/protocol/tcp/TCP.h @@ -3,10 +3,8 @@ #pragma once #include "zeek/Conn.h" -#include "zeek/IPAddr.h" #include "zeek/analyzer/Analyzer.h" #include "zeek/analyzer/protocol/tcp/TCP_Endpoint.h" -#include "zeek/analyzer/protocol/tcp/TCP_Flags.h" #include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h" namespace zeek::analyzer::pia { diff --git a/src/analyzer/protocol/zip/ZIP.h b/src/analyzer/protocol/zip/ZIP.h index c82d575be4..cf161e08ca 100644 --- a/src/analyzer/protocol/zip/ZIP.h +++ b/src/analyzer/protocol/zip/ZIP.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/file_analysis/Component.h b/src/file_analysis/Component.h index f3a9facc3c..6ae8228d9d 100644 --- a/src/file_analysis/Component.h +++ b/src/file_analysis/Component.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include "zeek/Tag.h" #include "zeek/plugin/Component.h" diff --git a/src/file_analysis/File.cc b/src/file_analysis/File.cc index 73d98fdbd9..8b52ddf25b 100644 --- a/src/file_analysis/File.cc +++ b/src/file_analysis/File.cc @@ -2,21 +2,21 @@ #include "zeek/file_analysis/File.h" -#include #include +#include "zeek/Conn.h" #include "zeek/Event.h" #include "zeek/Reporter.h" #include "zeek/RuleMatcher.h" #include "zeek/Type.h" #include "zeek/Val.h" #include "zeek/analyzer/Analyzer.h" -#include "zeek/analyzer/Manager.h" #include "zeek/file_analysis/Analyzer.h" #include "zeek/file_analysis/FileReassembler.h" #include "zeek/file_analysis/FileTimer.h" #include "zeek/file_analysis/Manager.h" #include "zeek/file_analysis/analyzer/extract/Extract.h" +#include "zeek/file_analysis/analyzer/extract/events.bif.h" namespace zeek::file_analysis { diff --git a/src/file_analysis/File.h b/src/file_analysis/File.h index 96096555dd..73fb384eb3 100644 --- a/src/file_analysis/File.h +++ b/src/file_analysis/File.h @@ -4,12 +4,10 @@ #include #include -#include #include "zeek/Tag.h" #include "zeek/WeirdState.h" #include "zeek/ZeekArgs.h" -#include "zeek/ZeekList.h" // for ValPList #include "zeek/ZeekString.h" #include "zeek/file_analysis/AnalyzerSet.h" diff --git a/src/file_analysis/FileReassembler.h b/src/file_analysis/FileReassembler.h index 1eb622aacb..96d980151a 100644 --- a/src/file_analysis/FileReassembler.h +++ b/src/file_analysis/FileReassembler.h @@ -7,7 +7,6 @@ namespace zeek { class Connection; -class File; namespace file_analysis { diff --git a/src/file_analysis/analyzer/data_event/DataEvent.h b/src/file_analysis/analyzer/data_event/DataEvent.h index 2af1e892dd..325b0c5198 100644 --- a/src/file_analysis/analyzer/data_event/DataEvent.h +++ b/src/file_analysis/analyzer/data_event/DataEvent.h @@ -2,8 +2,6 @@ #pragma once -#include - #include "zeek/EventHandler.h" #include "zeek/Val.h" #include "zeek/file_analysis/Analyzer.h" diff --git a/src/file_analysis/analyzer/entropy/Entropy.cc b/src/file_analysis/analyzer/entropy/Entropy.cc index 54687ed88e..5f200f2965 100644 --- a/src/file_analysis/analyzer/entropy/Entropy.cc +++ b/src/file_analysis/analyzer/entropy/Entropy.cc @@ -6,6 +6,7 @@ #include "zeek/Event.h" #include "zeek/file_analysis/Manager.h" +#include "zeek/file_analysis/analyzer/entropy/events.bif.h" #include "zeek/util.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/entropy/Entropy.h b/src/file_analysis/analyzer/entropy/Entropy.h index 98897d2898..a613f2a4e3 100644 --- a/src/file_analysis/analyzer/entropy/Entropy.h +++ b/src/file_analysis/analyzer/entropy/Entropy.h @@ -2,13 +2,10 @@ #pragma once -#include - #include "zeek/OpaqueVal.h" #include "zeek/Val.h" #include "zeek/file_analysis/Analyzer.h" #include "zeek/file_analysis/File.h" -#include "zeek/file_analysis/analyzer/entropy/events.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/extract/Extract.cc b/src/file_analysis/analyzer/extract/Extract.cc index b3635dc6c8..458f5f91e1 100644 --- a/src/file_analysis/analyzer/extract/Extract.cc +++ b/src/file_analysis/analyzer/extract/Extract.cc @@ -5,8 +5,8 @@ #include #include -#include "zeek/Event.h" #include "zeek/file_analysis/Manager.h" +#include "zeek/file_analysis/analyzer/extract/events.bif.h" #include "zeek/util.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/extract/Extract.h b/src/file_analysis/analyzer/extract/Extract.h index 8c7e9a56f0..4d11047655 100644 --- a/src/file_analysis/analyzer/extract/Extract.h +++ b/src/file_analysis/analyzer/extract/Extract.h @@ -8,7 +8,6 @@ #include "zeek/Val.h" #include "zeek/file_analysis/Analyzer.h" #include "zeek/file_analysis/File.h" -#include "zeek/file_analysis/analyzer/extract/events.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/hash/Hash.h b/src/file_analysis/analyzer/hash/Hash.h index 8bf3d93e1e..b3a30e3d97 100644 --- a/src/file_analysis/analyzer/hash/Hash.h +++ b/src/file_analysis/analyzer/hash/Hash.h @@ -2,8 +2,6 @@ #pragma once -#include - #include "zeek/OpaqueVal.h" #include "zeek/Val.h" #include "zeek/file_analysis/Analyzer.h" diff --git a/src/file_analysis/analyzer/pe/PE.h b/src/file_analysis/analyzer/pe/PE.h index 33d3617415..d2efe24ad7 100644 --- a/src/file_analysis/analyzer/pe/PE.h +++ b/src/file_analysis/analyzer/pe/PE.h @@ -2,9 +2,6 @@ #pragma once -#include - -#include "zeek/File.h" #include "zeek/Val.h" #include "file_analysis/analyzer/pe/pe_pac.h" diff --git a/src/packet_analysis/Component.h b/src/packet_analysis/Component.h index 96df483b69..1d176939cb 100644 --- a/src/packet_analysis/Component.h +++ b/src/packet_analysis/Component.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include #include "zeek/Tag.h" diff --git a/src/packet_analysis/Dispatcher.h b/src/packet_analysis/Dispatcher.h index 96f9e2219d..175631817f 100644 --- a/src/packet_analysis/Dispatcher.h +++ b/src/packet_analysis/Dispatcher.h @@ -3,7 +3,6 @@ #pragma once #include -#include #include #include diff --git a/src/packet_analysis/Manager.h b/src/packet_analysis/Manager.h index 00f36c2b8e..0b5cfc03b1 100644 --- a/src/packet_analysis/Manager.h +++ b/src/packet_analysis/Manager.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/Func.h" #include "zeek/PacketFilter.h" #include "zeek/Tag.h" #include "zeek/iosource/Packet.h" diff --git a/src/packet_analysis/protocol/ayiya/AYIYA.h b/src/packet_analysis/protocol/ayiya/AYIYA.h index b1fbcddc24..c5a1eb799f 100644 --- a/src/packet_analysis/protocol/ayiya/AYIYA.h +++ b/src/packet_analysis/protocol/ayiya/AYIYA.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::AYIYA { diff --git a/src/packet_analysis/protocol/fddi/FDDI.h b/src/packet_analysis/protocol/fddi/FDDI.h index 32078a94e5..b89724608e 100644 --- a/src/packet_analysis/protocol/fddi/FDDI.h +++ b/src/packet_analysis/protocol/fddi/FDDI.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::FDDI { diff --git a/src/packet_analysis/protocol/geneve/Geneve.h b/src/packet_analysis/protocol/geneve/Geneve.h index cec9d93f0d..45d9a48e96 100644 --- a/src/packet_analysis/protocol/geneve/Geneve.h +++ b/src/packet_analysis/protocol/geneve/Geneve.h @@ -2,11 +2,12 @@ #pragma once +#include #include #include "zeek/Span.h" +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::Geneve { diff --git a/src/packet_analysis/protocol/gre/GRE.h b/src/packet_analysis/protocol/gre/GRE.h index 6f603531ef..2883600cdf 100644 --- a/src/packet_analysis/protocol/gre/GRE.h +++ b/src/packet_analysis/protocol/gre/GRE.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::GRE { diff --git a/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc b/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc index 6ec50f70fc..3dbefd9c62 100644 --- a/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc +++ b/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc @@ -2,6 +2,7 @@ #include "zeek/packet_analysis/protocol/icmp/ICMPSessionAdapter.h" +#include "zeek/Conn.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/conn-size/ConnSize.h" diff --git a/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h b/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h index c191b1757a..2f76116e4c 100644 --- a/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h +++ b/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::IEEE802_11 { diff --git a/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h b/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h index f203c8c51e..0e0078e7a5 100644 --- a/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h +++ b/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::IEEE802_11_Radio { diff --git a/src/packet_analysis/protocol/ip/IP.cc b/src/packet_analysis/protocol/ip/IP.cc index 3f345cca3b..e57a04d267 100644 --- a/src/packet_analysis/protocol/ip/IP.cc +++ b/src/packet_analysis/protocol/ip/IP.cc @@ -8,7 +8,6 @@ #include "zeek/Event.h" #include "zeek/Frag.h" #include "zeek/IP.h" -#include "zeek/IPAddr.h" #include "zeek/NetVar.h" #include "zeek/PacketFilter.h" #include "zeek/RunState.h" diff --git a/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h b/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h index 729824c4dc..bc6d0d08e8 100644 --- a/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h +++ b/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h @@ -5,7 +5,6 @@ #include #include -#include "zeek/ID.h" #include "zeek/Tag.h" #include "zeek/packet_analysis/Analyzer.h" diff --git a/src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h b/src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h index 6e998315f9..0209ca0562 100644 --- a/src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h +++ b/src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h @@ -2,8 +2,10 @@ #pragma once +#include + +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::LinuxSLL2 { diff --git a/src/packet_analysis/protocol/llc/LLC.h b/src/packet_analysis/protocol/llc/LLC.h index 9c584ed412..12609b9b9e 100644 --- a/src/packet_analysis/protocol/llc/LLC.h +++ b/src/packet_analysis/protocol/llc/LLC.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::LLC { diff --git a/src/packet_analysis/protocol/mpls/MPLS.h b/src/packet_analysis/protocol/mpls/MPLS.h index 0cefd55441..0c94888f23 100644 --- a/src/packet_analysis/protocol/mpls/MPLS.h +++ b/src/packet_analysis/protocol/mpls/MPLS.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::MPLS { diff --git a/src/packet_analysis/protocol/nflog/NFLog.h b/src/packet_analysis/protocol/nflog/NFLog.h index c434666a9e..88dd6b00ad 100644 --- a/src/packet_analysis/protocol/nflog/NFLog.h +++ b/src/packet_analysis/protocol/nflog/NFLog.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::NFLog { diff --git a/src/packet_analysis/protocol/novell_802_3/Novell_802_3.h b/src/packet_analysis/protocol/novell_802_3/Novell_802_3.h index 17e30c4da1..116357617e 100644 --- a/src/packet_analysis/protocol/novell_802_3/Novell_802_3.h +++ b/src/packet_analysis/protocol/novell_802_3/Novell_802_3.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::Novell_802_3 { diff --git a/src/packet_analysis/protocol/ppp/PPP.h b/src/packet_analysis/protocol/ppp/PPP.h index ad3c8f8a29..df8df0e0fc 100644 --- a/src/packet_analysis/protocol/ppp/PPP.h +++ b/src/packet_analysis/protocol/ppp/PPP.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::PPP { diff --git a/src/packet_analysis/protocol/ppp_serial/PPPSerial.h b/src/packet_analysis/protocol/ppp_serial/PPPSerial.h index ef48485d83..81e3aad658 100644 --- a/src/packet_analysis/protocol/ppp_serial/PPPSerial.h +++ b/src/packet_analysis/protocol/ppp_serial/PPPSerial.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::PPPSerial { diff --git a/src/packet_analysis/protocol/pppoe/PPPoE.h b/src/packet_analysis/protocol/pppoe/PPPoE.h index 14e91f8fbb..e6c58bd9a8 100644 --- a/src/packet_analysis/protocol/pppoe/PPPoE.h +++ b/src/packet_analysis/protocol/pppoe/PPPoE.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::PPPoE { diff --git a/src/packet_analysis/protocol/tcp/TCP.h b/src/packet_analysis/protocol/tcp/TCP.h index 5ce37ef0ba..f946e55e9c 100644 --- a/src/packet_analysis/protocol/tcp/TCP.h +++ b/src/packet_analysis/protocol/tcp/TCP.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/tcp/TCP_Flags.h" #include "zeek/packet_analysis/Analyzer.h" #include "zeek/packet_analysis/Component.h" #include "zeek/packet_analysis/protocol/ip/IPBasedAnalyzer.h" diff --git a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h index 0ee029274b..e6d3e47144 100644 --- a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h +++ b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h @@ -5,8 +5,6 @@ #include "zeek/Tag.h" #include "zeek/analyzer/protocol/tcp/TCP_Endpoint.h" #include "zeek/analyzer/protocol/tcp/TCP_Flags.h" -#include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h" #include "zeek/session/Manager.h" diff --git a/src/packet_analysis/protocol/teredo/Teredo.h b/src/packet_analysis/protocol/teredo/Teredo.h index d4577d02ae..7e2ca41948 100644 --- a/src/packet_analysis/protocol/teredo/Teredo.h +++ b/src/packet_analysis/protocol/teredo/Teredo.h @@ -5,7 +5,6 @@ #include #include "zeek/Conn.h" -#include "zeek/NetVar.h" #include "zeek/RE.h" #include "zeek/Reporter.h" #include "zeek/packet_analysis/Analyzer.h" diff --git a/src/packet_analysis/protocol/vntag/VNTag.h b/src/packet_analysis/protocol/vntag/VNTag.h index cc731af4e8..792e6a4749 100644 --- a/src/packet_analysis/protocol/vntag/VNTag.h +++ b/src/packet_analysis/protocol/vntag/VNTag.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::VNTag { diff --git a/src/packet_analysis/protocol/vxlan/VXLAN.h b/src/packet_analysis/protocol/vxlan/VXLAN.h index a9fb002eb3..8684075325 100644 --- a/src/packet_analysis/protocol/vxlan/VXLAN.h +++ b/src/packet_analysis/protocol/vxlan/VXLAN.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::VXLAN { diff --git a/src/spicy/manager.cc b/src/spicy/manager.cc index b7cacd435f..6c5a9268f3 100644 --- a/src/spicy/manager.cc +++ b/src/spicy/manager.cc @@ -24,6 +24,7 @@ #include +#include "zeek/Event.h" #include "zeek/analyzer/Manager.h" #include "zeek/file_analysis/Manager.h" #include "zeek/packet_analysis/Manager.h" diff --git a/testing/btest/plugins/protocol-plugin/src/Foo.cc b/testing/btest/plugins/protocol-plugin/src/Foo.cc index 5c27f3a3a9..be788e119c 100644 --- a/testing/btest/plugins/protocol-plugin/src/Foo.cc +++ b/testing/btest/plugins/protocol-plugin/src/Foo.cc @@ -2,6 +2,7 @@ #include "Foo.h" #include "zeek/EventRegistry.h" +#include "zeek/Func.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "events.bif.h" From 79301c469108f78555b20e82b98492015b63dfed Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 8 Apr 2025 16:07:22 -0700 Subject: [PATCH 3/8] Remove unnecessary #includes in analyzer/packet analyzer/file analyzer source files --- src/analyzer/Analyzer.cc | 4 ++-- src/analyzer/Manager.cc | 7 +------ src/analyzer/protocol/conn-size/ConnSize.cc | 1 - src/analyzer/protocol/dce-rpc/DCE_RPC.cc | 4 ---- src/analyzer/protocol/dhcp/DHCP.cc | 3 --- src/analyzer/protocol/dnp3/DNP3.cc | 1 - src/analyzer/protocol/dns/DNS.cc | 2 -- src/analyzer/protocol/file/File.cc | 1 - src/analyzer/protocol/finger/legacy/Finger.cc | 4 ---- src/analyzer/protocol/ftp/FTP.cc | 4 ---- src/analyzer/protocol/gnutella/Gnutella.cc | 4 ---- src/analyzer/protocol/gssapi/GSSAPI.cc | 1 - src/analyzer/protocol/ident/Ident.cc | 4 ---- src/analyzer/protocol/irc/IRC.cc | 3 --- src/analyzer/protocol/krb/KRB.cc | 3 --- src/analyzer/protocol/krb/KRB_TCP.cc | 2 -- src/analyzer/protocol/login/Login.cc | 4 ---- src/analyzer/protocol/login/NVT.cc | 4 ---- src/analyzer/protocol/login/Plugin.cc | 1 - src/analyzer/protocol/login/RSH.cc | 4 ---- src/analyzer/protocol/login/Rlogin.cc | 4 ---- src/analyzer/protocol/login/Telnet.cc | 3 --- src/analyzer/protocol/mime/MIME.cc | 2 -- src/analyzer/protocol/modbus/Modbus.cc | 1 - src/analyzer/protocol/mysql/MySQL.cc | 1 - src/analyzer/protocol/ncp/NCP.cc | 4 ---- src/analyzer/protocol/netbios/NetbiosSSN.cc | 3 --- src/analyzer/protocol/ntlm/NTLM.cc | 1 - src/analyzer/protocol/ntp/NTP.cc | 1 - src/analyzer/protocol/radius/RADIUS.cc | 1 - src/analyzer/protocol/rdp/RDP.cc | 1 - src/analyzer/protocol/rdp/RDPEUDP.cc | 1 - src/analyzer/protocol/rfb/RFB.cc | 1 - src/analyzer/protocol/rpc/MOUNT.cc | 5 ----- src/analyzer/protocol/rpc/NFS.cc | 4 ---- src/analyzer/protocol/rpc/Plugin.cc | 1 - src/analyzer/protocol/rpc/Portmap.cc | 4 ---- src/analyzer/protocol/rpc/RPC.cc | 2 -- src/analyzer/protocol/rpc/XDR.cc | 6 ++---- src/analyzer/protocol/sip/Plugin.cc | 1 - src/analyzer/protocol/sip/SIP.cc | 2 -- src/analyzer/protocol/sip/SIP_TCP.cc | 1 - src/analyzer/protocol/smtp/SMTP.cc | 4 ---- src/analyzer/protocol/snmp/SNMP.cc | 5 ----- src/analyzer/protocol/socks/SOCKS.cc | 1 - src/analyzer/protocol/ssh/SSH.cc | 1 - src/analyzer/protocol/ssl/DTLS.cc | 1 - src/analyzer/protocol/ssl/Plugin.cc | 2 -- src/analyzer/protocol/ssl/SSL.cc | 1 - src/analyzer/protocol/ssl/spicy/support.cc | 1 - src/analyzer/protocol/tcp/ContentLine.cc | 1 - src/analyzer/protocol/tcp/TCP.cc | 5 ----- src/analyzer/protocol/tcp/TCP_Endpoint.cc | 3 --- src/analyzer/protocol/tcp/TCP_Reassembler.cc | 2 -- src/analyzer/protocol/zip/Plugin.cc | 1 - src/file_analysis/AnalyzerSet.cc | 1 - src/file_analysis/Manager.cc | 2 -- src/file_analysis/analyzer/hash/Hash.cc | 2 -- src/file_analysis/analyzer/x509/OCSP.cc | 1 - src/file_analysis/analyzer/x509/X509Common.cc | 1 - src/packet_analysis/Manager.cc | 2 +- src/packet_analysis/protocol/gre/GRE.cc | 1 - src/packet_analysis/protocol/icmp/ICMP.cc | 1 - src/packet_analysis/protocol/icmp/Plugin.cc | 1 - src/packet_analysis/protocol/tcp/Stats.cc | 1 - src/packet_analysis/protocol/tcp/TCP.cc | 2 -- src/packet_analysis/protocol/udp/Plugin.cc | 1 - 67 files changed, 6 insertions(+), 149 deletions(-) diff --git a/src/analyzer/Analyzer.cc b/src/analyzer/Analyzer.cc index 2bdea344f2..406d4440d3 100644 --- a/src/analyzer/Analyzer.cc +++ b/src/analyzer/Analyzer.cc @@ -5,10 +5,10 @@ #include #include +#include "zeek/Conn.h" #include "zeek/Event.h" -#include "zeek/ZeekString.h" #include "zeek/analyzer/Manager.h" -#include "zeek/analyzer/protocol/pia/PIA.h" +#include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h" #include "zeek/3rdparty/doctest.h" diff --git a/src/analyzer/Manager.cc b/src/analyzer/Manager.cc index cf63c18717..4cd42420a7 100644 --- a/src/analyzer/Manager.cc +++ b/src/analyzer/Manager.cc @@ -2,17 +2,12 @@ #include "zeek/analyzer/Manager.h" -#include "zeek/Hash.h" +#include "zeek/Conn.h" #include "zeek/IntrusivePtr.h" #include "zeek/RunState.h" #include "zeek/Val.h" -#include "zeek/analyzer/protocol/conn-size/ConnSize.h" -#include "zeek/analyzer/protocol/pia/PIA.h" -#include "zeek/analyzer/protocol/tcp/TCP.h" -#include "zeek/analyzer/protocol/tcp/events.bif.h" #include "zeek/packet_analysis/protocol/ip/IPBasedAnalyzer.h" #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h" -#include "zeek/plugin/Manager.h" namespace zeek::analyzer { diff --git a/src/analyzer/protocol/conn-size/ConnSize.cc b/src/analyzer/protocol/conn-size/ConnSize.cc index 4a03f1bb6d..f80d16a6d1 100644 --- a/src/analyzer/protocol/conn-size/ConnSize.cc +++ b/src/analyzer/protocol/conn-size/ConnSize.cc @@ -8,7 +8,6 @@ #include "zeek/Reporter.h" #include "zeek/RunState.h" #include "zeek/analyzer/protocol/conn-size/events.bif.h" -#include "zeek/analyzer/protocol/tcp/TCP.h" namespace zeek::analyzer::conn_size { diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.cc b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc index 33950d845a..8894797d0a 100644 --- a/src/analyzer/protocol/dce-rpc/DCE_RPC.cc +++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc @@ -2,11 +2,7 @@ #include "zeek/analyzer/protocol/dce-rpc/DCE_RPC.h" -#include "zeek/zeek-config.h" - #include -#include -#include using namespace std; diff --git a/src/analyzer/protocol/dhcp/DHCP.cc b/src/analyzer/protocol/dhcp/DHCP.cc index 0b49486dea..2464adc10d 100644 --- a/src/analyzer/protocol/dhcp/DHCP.cc +++ b/src/analyzer/protocol/dhcp/DHCP.cc @@ -2,9 +2,6 @@ #include "zeek/analyzer/protocol/dhcp/DHCP.h" -#include "zeek/analyzer/protocol/dhcp/events.bif.h" -#include "zeek/analyzer/protocol/dhcp/types.bif.h" - namespace zeek::analyzer::dhcp { DHCP_Analyzer::DHCP_Analyzer(Connection* conn) : Analyzer("DHCP", conn) { interp = new binpac::DHCP::DHCP_Conn(this); } diff --git a/src/analyzer/protocol/dnp3/DNP3.cc b/src/analyzer/protocol/dnp3/DNP3.cc index 5da3719b26..25442e4342 100644 --- a/src/analyzer/protocol/dnp3/DNP3.cc +++ b/src/analyzer/protocol/dnp3/DNP3.cc @@ -106,7 +106,6 @@ #include "zeek/analyzer/protocol/dnp3/DNP3.h" #include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/dnp3/events.bif.h" constexpr unsigned int PSEUDO_LENGTH_INDEX = 2; // index of len field of DNP3 Pseudo Link Layer constexpr unsigned int PSEUDO_CONTROL_FIELD_INDEX = 3; // index of ctrl field of DNP3 Pseudo Link Layer diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index 4930c2dcfd..87b3f7fbd4 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -2,8 +2,6 @@ #include "zeek/analyzer/protocol/dns/DNS.h" -#include "zeek/zeek-config.h" - #include #include #include diff --git a/src/analyzer/protocol/file/File.cc b/src/analyzer/protocol/file/File.cc index f3af1e2afd..4caadd7d00 100644 --- a/src/analyzer/protocol/file/File.cc +++ b/src/analyzer/protocol/file/File.cc @@ -8,7 +8,6 @@ #include "zeek/RuleMatcher.h" #include "zeek/analyzer/protocol/file/events.bif.h" #include "zeek/file_analysis/Manager.h" -#include "zeek/util.h" namespace zeek::analyzer::file { diff --git a/src/analyzer/protocol/finger/legacy/Finger.cc b/src/analyzer/protocol/finger/legacy/Finger.cc index 351d62a68b..8c4eda9101 100644 --- a/src/analyzer/protocol/finger/legacy/Finger.cc +++ b/src/analyzer/protocol/finger/legacy/Finger.cc @@ -2,12 +2,8 @@ #include "zeek/analyzer/protocol/finger/legacy/Finger.h" -#include "zeek/zeek-config.h" - #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/analyzer/protocol/finger/legacy/events.bif.h" #include "zeek/analyzer/protocol/tcp/ContentLine.h" diff --git a/src/analyzer/protocol/ftp/FTP.cc b/src/analyzer/protocol/ftp/FTP.cc index 30a90ca15e..eda45c2148 100644 --- a/src/analyzer/protocol/ftp/FTP.cc +++ b/src/analyzer/protocol/ftp/FTP.cc @@ -2,13 +2,9 @@ #include "zeek/analyzer/protocol/ftp/FTP.h" -#include "zeek/zeek-config.h" - #include #include "zeek/Base64.h" -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/RuleMatcher.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/Manager.h" diff --git a/src/analyzer/protocol/gnutella/Gnutella.cc b/src/analyzer/protocol/gnutella/Gnutella.cc index 3d7e2ea38f..9c68376300 100644 --- a/src/analyzer/protocol/gnutella/Gnutella.cc +++ b/src/analyzer/protocol/gnutella/Gnutella.cc @@ -2,13 +2,9 @@ #include "zeek/analyzer/protocol/gnutella/Gnutella.h" -#include "zeek/zeek-config.h" - #include #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/gnutella/events.bif.h" #include "zeek/analyzer/protocol/pia/PIA.h" diff --git a/src/analyzer/protocol/gssapi/GSSAPI.cc b/src/analyzer/protocol/gssapi/GSSAPI.cc index 5647b64fef..32698c5c9d 100644 --- a/src/analyzer/protocol/gssapi/GSSAPI.cc +++ b/src/analyzer/protocol/gssapi/GSSAPI.cc @@ -3,7 +3,6 @@ #include "zeek/analyzer/protocol/gssapi/GSSAPI.h" #include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/gssapi/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::gssapi { diff --git a/src/analyzer/protocol/ident/Ident.cc b/src/analyzer/protocol/ident/Ident.cc index fd17ded442..378f9dafb7 100644 --- a/src/analyzer/protocol/ident/Ident.cc +++ b/src/analyzer/protocol/ident/Ident.cc @@ -2,12 +2,8 @@ #include "zeek/analyzer/protocol/ident/Ident.h" -#include "zeek/zeek-config.h" - #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/ident/events.bif.h" diff --git a/src/analyzer/protocol/irc/IRC.cc b/src/analyzer/protocol/irc/IRC.cc index f692696da9..9981895cc1 100644 --- a/src/analyzer/protocol/irc/IRC.cc +++ b/src/analyzer/protocol/irc/IRC.cc @@ -4,11 +4,8 @@ #include "zeek/analyzer/protocol/irc/IRC.h" -#include #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/irc/events.bif.h" #include "zeek/analyzer/protocol/zip/ZIP.h" diff --git a/src/analyzer/protocol/krb/KRB.cc b/src/analyzer/protocol/krb/KRB.cc index 84a933dd02..18b430b2a9 100644 --- a/src/analyzer/protocol/krb/KRB.cc +++ b/src/analyzer/protocol/krb/KRB.cc @@ -4,9 +4,6 @@ #include -#include "zeek/analyzer/protocol/krb/events.bif.h" -#include "zeek/analyzer/protocol/krb/types.bif.h" - namespace zeek::analyzer::krb { bool KRB_Analyzer::krb_available = false; diff --git a/src/analyzer/protocol/krb/KRB_TCP.cc b/src/analyzer/protocol/krb/KRB_TCP.cc index b04abc2c23..97e944842b 100644 --- a/src/analyzer/protocol/krb/KRB_TCP.cc +++ b/src/analyzer/protocol/krb/KRB_TCP.cc @@ -2,8 +2,6 @@ #include "zeek/analyzer/protocol/krb/KRB_TCP.h" -#include "zeek/analyzer/protocol/krb/events.bif.h" -#include "zeek/analyzer/protocol/krb/types.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::krb_tcp { diff --git a/src/analyzer/protocol/login/Login.cc b/src/analyzer/protocol/login/Login.cc index 19dd1d42c2..6fb360bb25 100644 --- a/src/analyzer/protocol/login/Login.cc +++ b/src/analyzer/protocol/login/Login.cc @@ -2,13 +2,9 @@ #include "zeek/analyzer/protocol/login/Login.h" -#include "zeek/zeek-config.h" - #include #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/RE.h" #include "zeek/Reporter.h" #include "zeek/Var.h" diff --git a/src/analyzer/protocol/login/NVT.cc b/src/analyzer/protocol/login/NVT.cc index e77e54073a..23eb513972 100644 --- a/src/analyzer/protocol/login/NVT.cc +++ b/src/analyzer/protocol/login/NVT.cc @@ -2,12 +2,8 @@ #include "zeek/analyzer/protocol/login/NVT.h" -#include "zeek/zeek-config.h" - #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/login/events.bif.h" diff --git a/src/analyzer/protocol/login/Plugin.cc b/src/analyzer/protocol/login/Plugin.cc index c61ffaffba..3a7edace81 100644 --- a/src/analyzer/protocol/login/Plugin.cc +++ b/src/analyzer/protocol/login/Plugin.cc @@ -3,7 +3,6 @@ #include "zeek/plugin/Plugin.h" #include "zeek/analyzer/Component.h" -#include "zeek/analyzer/protocol/login/Login.h" #include "zeek/analyzer/protocol/login/RSH.h" #include "zeek/analyzer/protocol/login/Rlogin.h" #include "zeek/analyzer/protocol/login/Telnet.h" diff --git a/src/analyzer/protocol/login/RSH.cc b/src/analyzer/protocol/login/RSH.cc index c49597eebe..7eda04ecfa 100644 --- a/src/analyzer/protocol/login/RSH.cc +++ b/src/analyzer/protocol/login/RSH.cc @@ -2,10 +2,6 @@ #include "zeek/analyzer/protocol/login/RSH.h" -#include "zeek/zeek-config.h" - -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/login/events.bif.h" diff --git a/src/analyzer/protocol/login/Rlogin.cc b/src/analyzer/protocol/login/Rlogin.cc index 7eb07673ee..41cb4aa3df 100644 --- a/src/analyzer/protocol/login/Rlogin.cc +++ b/src/analyzer/protocol/login/Rlogin.cc @@ -2,10 +2,6 @@ #include "zeek/analyzer/protocol/login/Rlogin.h" -#include "zeek/zeek-config.h" - -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/login/events.bif.h" diff --git a/src/analyzer/protocol/login/Telnet.cc b/src/analyzer/protocol/login/Telnet.cc index 5ae883613f..1730f68b02 100644 --- a/src/analyzer/protocol/login/Telnet.cc +++ b/src/analyzer/protocol/login/Telnet.cc @@ -2,10 +2,7 @@ #include "zeek/analyzer/protocol/login/Telnet.h" -#include "zeek/zeek-config.h" - #include "zeek/analyzer/protocol/login/NVT.h" -#include "zeek/analyzer/protocol/login/events.bif.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/mime/MIME.cc b/src/analyzer/protocol/mime/MIME.cc index 7a1180c5d8..71a36e9d8f 100644 --- a/src/analyzer/protocol/mime/MIME.cc +++ b/src/analyzer/protocol/mime/MIME.cc @@ -2,8 +2,6 @@ #include "zeek/analyzer/protocol/mime/MIME.h" -#include "zeek/zeek-config.h" - #include #include "zeek/Base64.h" diff --git a/src/analyzer/protocol/modbus/Modbus.cc b/src/analyzer/protocol/modbus/Modbus.cc index 0dad53ad62..aaeb78b8b4 100644 --- a/src/analyzer/protocol/modbus/Modbus.cc +++ b/src/analyzer/protocol/modbus/Modbus.cc @@ -2,7 +2,6 @@ #include "zeek/analyzer/protocol/modbus/Modbus.h" -#include "zeek/analyzer/protocol/modbus/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::modbus { diff --git a/src/analyzer/protocol/mysql/MySQL.cc b/src/analyzer/protocol/mysql/MySQL.cc index 1a6706144c..d15f1a92c4 100644 --- a/src/analyzer/protocol/mysql/MySQL.cc +++ b/src/analyzer/protocol/mysql/MySQL.cc @@ -4,7 +4,6 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/Manager.h" -#include "zeek/analyzer/protocol/mysql/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::mysql { diff --git a/src/analyzer/protocol/ncp/NCP.cc b/src/analyzer/protocol/ncp/NCP.cc index 64832b93cd..03c5a4486d 100644 --- a/src/analyzer/protocol/ncp/NCP.cc +++ b/src/analyzer/protocol/ncp/NCP.cc @@ -2,11 +2,7 @@ #include "zeek/analyzer/protocol/ncp/NCP.h" -#include "zeek/zeek-config.h" - #include -#include -#include #include "zeek/analyzer/protocol/ncp/consts.bif.h" #include "zeek/analyzer/protocol/ncp/events.bif.h" diff --git a/src/analyzer/protocol/netbios/NetbiosSSN.cc b/src/analyzer/protocol/netbios/NetbiosSSN.cc index 99ec046d96..9218a7c2cb 100644 --- a/src/analyzer/protocol/netbios/NetbiosSSN.cc +++ b/src/analyzer/protocol/netbios/NetbiosSSN.cc @@ -2,12 +2,9 @@ #include "zeek/analyzer/protocol/netbios/NetbiosSSN.h" -#include "zeek/zeek-config.h" - #include #include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/RunState.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/netbios/events.bif.h" diff --git a/src/analyzer/protocol/ntlm/NTLM.cc b/src/analyzer/protocol/ntlm/NTLM.cc index e1ce4bba78..3b8835c191 100644 --- a/src/analyzer/protocol/ntlm/NTLM.cc +++ b/src/analyzer/protocol/ntlm/NTLM.cc @@ -3,7 +3,6 @@ #include "zeek/analyzer/protocol/ntlm/NTLM.h" #include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/ntlm/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::ntlm { diff --git a/src/analyzer/protocol/ntp/NTP.cc b/src/analyzer/protocol/ntp/NTP.cc index 39e764ba36..6a8a7ada60 100644 --- a/src/analyzer/protocol/ntp/NTP.cc +++ b/src/analyzer/protocol/ntp/NTP.cc @@ -3,7 +3,6 @@ #include "zeek/analyzer/protocol/ntp/NTP.h" #include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/ntp/events.bif.h" namespace zeek::analyzer::ntp { diff --git a/src/analyzer/protocol/radius/RADIUS.cc b/src/analyzer/protocol/radius/RADIUS.cc index 4820cda73e..4e27049cd0 100644 --- a/src/analyzer/protocol/radius/RADIUS.cc +++ b/src/analyzer/protocol/radius/RADIUS.cc @@ -3,7 +3,6 @@ #include "zeek/analyzer/protocol/radius/RADIUS.h" #include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/radius/events.bif.h" namespace zeek::analyzer::radius { diff --git a/src/analyzer/protocol/rdp/RDP.cc b/src/analyzer/protocol/rdp/RDP.cc index f1bce538b4..9616196634 100644 --- a/src/analyzer/protocol/rdp/RDP.cc +++ b/src/analyzer/protocol/rdp/RDP.cc @@ -5,7 +5,6 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/rdp/events.bif.h" -#include "zeek/analyzer/protocol/rdp/types.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::rdp { diff --git a/src/analyzer/protocol/rdp/RDPEUDP.cc b/src/analyzer/protocol/rdp/RDPEUDP.cc index 4d93a1b982..c05147e721 100644 --- a/src/analyzer/protocol/rdp/RDPEUDP.cc +++ b/src/analyzer/protocol/rdp/RDPEUDP.cc @@ -3,7 +3,6 @@ #include "zeek/analyzer/protocol/rdp/RDPEUDP.h" #include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/rdp/events.bif.h" #include "zeek/analyzer/protocol/rdp/rdpeudp_pac.h" namespace zeek::analyzer::rdpeudp { diff --git a/src/analyzer/protocol/rfb/RFB.cc b/src/analyzer/protocol/rfb/RFB.cc index ee5e36722d..7db60c25d8 100644 --- a/src/analyzer/protocol/rfb/RFB.cc +++ b/src/analyzer/protocol/rfb/RFB.cc @@ -3,7 +3,6 @@ #include "zeek/analyzer/protocol/rfb/RFB.h" #include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/rfb/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::rfb { diff --git a/src/analyzer/protocol/rpc/MOUNT.cc b/src/analyzer/protocol/rpc/MOUNT.cc index e1ebee9b46..c4b391fbad 100644 --- a/src/analyzer/protocol/rpc/MOUNT.cc +++ b/src/analyzer/protocol/rpc/MOUNT.cc @@ -2,13 +2,8 @@ #include "zeek/analyzer/protocol/rpc/MOUNT.h" -#include "zeek/zeek-config.h" - -#include #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/analyzer/protocol/rpc/events.bif.h" diff --git a/src/analyzer/protocol/rpc/NFS.cc b/src/analyzer/protocol/rpc/NFS.cc index 6ff28bb715..de9feefe5c 100644 --- a/src/analyzer/protocol/rpc/NFS.cc +++ b/src/analyzer/protocol/rpc/NFS.cc @@ -2,13 +2,9 @@ #include "zeek/analyzer/protocol/rpc/NFS.h" -#include "zeek/zeek-config.h" - #include #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/analyzer/protocol/rpc/events.bif.h" diff --git a/src/analyzer/protocol/rpc/Plugin.cc b/src/analyzer/protocol/rpc/Plugin.cc index 8b939d4e06..db7fe3c310 100644 --- a/src/analyzer/protocol/rpc/Plugin.cc +++ b/src/analyzer/protocol/rpc/Plugin.cc @@ -6,7 +6,6 @@ #include "zeek/analyzer/protocol/rpc/MOUNT.h" #include "zeek/analyzer/protocol/rpc/NFS.h" #include "zeek/analyzer/protocol/rpc/Portmap.h" -#include "zeek/analyzer/protocol/rpc/RPC.h" namespace zeek::plugin::detail::Zeek_RPC { diff --git a/src/analyzer/protocol/rpc/Portmap.cc b/src/analyzer/protocol/rpc/Portmap.cc index 01bc95fe18..d3ccf6fa5f 100644 --- a/src/analyzer/protocol/rpc/Portmap.cc +++ b/src/analyzer/protocol/rpc/Portmap.cc @@ -2,10 +2,6 @@ #include "zeek/analyzer/protocol/rpc/Portmap.h" -#include "zeek/zeek-config.h" - -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/analyzer/protocol/rpc/events.bif.h" diff --git a/src/analyzer/protocol/rpc/RPC.cc b/src/analyzer/protocol/rpc/RPC.cc index 8bc9c733cf..8ca5e37271 100644 --- a/src/analyzer/protocol/rpc/RPC.cc +++ b/src/analyzer/protocol/rpc/RPC.cc @@ -2,8 +2,6 @@ #include "zeek/analyzer/protocol/rpc/RPC.h" -#include "zeek/zeek-config.h" - #include #include diff --git a/src/analyzer/protocol/rpc/XDR.cc b/src/analyzer/protocol/rpc/XDR.cc index ff7c5c92b2..d1ad4126b9 100644 --- a/src/analyzer/protocol/rpc/XDR.cc +++ b/src/analyzer/protocol/rpc/XDR.cc @@ -2,13 +2,11 @@ #include "zeek/analyzer/protocol/rpc/XDR.h" -#include "zeek/zeek-config.h" - +// Needed for ntohl() +#include #include #include -#include "zeek/analyzer/protocol/rpc/events.bif.h" - uint32_t zeek::analyzer::rpc::extract_XDR_uint32(const u_char*& buf, int& len) { if ( ! buf ) return 0; diff --git a/src/analyzer/protocol/sip/Plugin.cc b/src/analyzer/protocol/sip/Plugin.cc index ec6fcd10ac..a7e6358182 100644 --- a/src/analyzer/protocol/sip/Plugin.cc +++ b/src/analyzer/protocol/sip/Plugin.cc @@ -4,7 +4,6 @@ #include "zeek/analyzer/Component.h" #include "zeek/analyzer/protocol/sip/SIP.h" -#include "zeek/analyzer/protocol/sip/SIP_TCP.h" namespace zeek::plugin::detail::Zeek_SIP { diff --git a/src/analyzer/protocol/sip/SIP.cc b/src/analyzer/protocol/sip/SIP.cc index 7409d0d635..46cad57f9e 100644 --- a/src/analyzer/protocol/sip/SIP.cc +++ b/src/analyzer/protocol/sip/SIP.cc @@ -2,8 +2,6 @@ #include "zeek/analyzer/protocol/sip/SIP.h" -#include "zeek/analyzer/protocol/sip/events.bif.h" - namespace zeek::analyzer::sip { SIP_Analyzer::SIP_Analyzer(Connection* c) : analyzer::Analyzer("SIP", c) { interp = new binpac::SIP::SIP_Conn(this); } diff --git a/src/analyzer/protocol/sip/SIP_TCP.cc b/src/analyzer/protocol/sip/SIP_TCP.cc index 33408470ce..2d2aefaee0 100644 --- a/src/analyzer/protocol/sip/SIP_TCP.cc +++ b/src/analyzer/protocol/sip/SIP_TCP.cc @@ -5,7 +5,6 @@ #include "zeek/analyzer/protocol/sip/SIP_TCP.h" -#include "zeek/analyzer/protocol/sip/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::sip_tcp { diff --git a/src/analyzer/protocol/smtp/SMTP.cc b/src/analyzer/protocol/smtp/SMTP.cc index e717742cdc..616ebecd8b 100644 --- a/src/analyzer/protocol/smtp/SMTP.cc +++ b/src/analyzer/protocol/smtp/SMTP.cc @@ -2,13 +2,9 @@ #include "zeek/analyzer/protocol/smtp/SMTP.h" -#include "zeek/zeek-config.h" - #include #include -#include "zeek/Event.h" -#include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/smtp/BDAT.h" diff --git a/src/analyzer/protocol/snmp/SNMP.cc b/src/analyzer/protocol/snmp/SNMP.cc index ea30332fc2..c52a96ed70 100644 --- a/src/analyzer/protocol/snmp/SNMP.cc +++ b/src/analyzer/protocol/snmp/SNMP.cc @@ -2,11 +2,6 @@ #include "zeek/analyzer/protocol/snmp/SNMP.h" -#include "zeek/Func.h" -#include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/snmp/events.bif.h" -#include "zeek/analyzer/protocol/snmp/types.bif.h" - namespace zeek::analyzer::snmp { SNMP_Analyzer::SNMP_Analyzer(Connection* conn) : Analyzer("SNMP", conn) { interp = new binpac::SNMP::SNMP_Conn(this); } diff --git a/src/analyzer/protocol/socks/SOCKS.cc b/src/analyzer/protocol/socks/SOCKS.cc index 097bde61be..a5e3ffad45 100644 --- a/src/analyzer/protocol/socks/SOCKS.cc +++ b/src/analyzer/protocol/socks/SOCKS.cc @@ -2,7 +2,6 @@ #include "zeek/analyzer/protocol/socks/SOCKS.h" -#include "zeek/analyzer/protocol/socks/events.bif.h" #include "zeek/analyzer/protocol/socks/socks_pac.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" diff --git a/src/analyzer/protocol/ssh/SSH.cc b/src/analyzer/protocol/ssh/SSH.cc index a079e2fae4..c90c328187 100644 --- a/src/analyzer/protocol/ssh/SSH.cc +++ b/src/analyzer/protocol/ssh/SSH.cc @@ -4,7 +4,6 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/ssh/events.bif.h" -#include "zeek/analyzer/protocol/ssh/types.bif.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" namespace zeek::analyzer::ssh { diff --git a/src/analyzer/protocol/ssl/DTLS.cc b/src/analyzer/protocol/ssl/DTLS.cc index 582b1272d3..8a633ee8f0 100644 --- a/src/analyzer/protocol/ssl/DTLS.cc +++ b/src/analyzer/protocol/ssl/DTLS.cc @@ -4,7 +4,6 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/ssl/dtls_pac.h" -#include "zeek/analyzer/protocol/ssl/events.bif.h" #include "zeek/analyzer/protocol/ssl/tls-handshake_pac.h" #include "zeek/util.h" diff --git a/src/analyzer/protocol/ssl/Plugin.cc b/src/analyzer/protocol/ssl/Plugin.cc index c42d189fd6..cce899205e 100644 --- a/src/analyzer/protocol/ssl/Plugin.cc +++ b/src/analyzer/protocol/ssl/Plugin.cc @@ -2,8 +2,6 @@ #include "zeek/plugin/Plugin.h" -#include "zeek/zeek-config.h" - #ifndef ENABLE_SPICY_SSL #include "zeek/analyzer/Component.h" #include "zeek/analyzer/protocol/ssl/DTLS.h" diff --git a/src/analyzer/protocol/ssl/SSL.cc b/src/analyzer/protocol/ssl/SSL.cc index f94abc0db7..bad6840c0e 100644 --- a/src/analyzer/protocol/ssl/SSL.cc +++ b/src/analyzer/protocol/ssl/SSL.cc @@ -8,7 +8,6 @@ #include #include "zeek/Reporter.h" -#include "zeek/analyzer/protocol/ssl/events.bif.h" #include "zeek/analyzer/protocol/ssl/ssl_pac.h" #include "zeek/analyzer/protocol/ssl/tls-handshake_pac.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" diff --git a/src/analyzer/protocol/ssl/spicy/support.cc b/src/analyzer/protocol/ssl/spicy/support.cc index f922b82be1..4aa248c626 100644 --- a/src/analyzer/protocol/ssl/spicy/support.cc +++ b/src/analyzer/protocol/ssl/spicy/support.cc @@ -3,7 +3,6 @@ #include #include -#include "zeek/Conn.h" #include "zeek/Desc.h" #include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/file_analysis/Manager.h" diff --git a/src/analyzer/protocol/tcp/ContentLine.cc b/src/analyzer/protocol/tcp/ContentLine.cc index 018ab5ecf0..db8a1b12bb 100644 --- a/src/analyzer/protocol/tcp/ContentLine.cc +++ b/src/analyzer/protocol/tcp/ContentLine.cc @@ -4,7 +4,6 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "zeek/analyzer/protocol/tcp/events.bif.h" namespace zeek::analyzer::tcp { diff --git a/src/analyzer/protocol/tcp/TCP.cc b/src/analyzer/protocol/tcp/TCP.cc index b9f41f5d0f..15275ae8fb 100644 --- a/src/analyzer/protocol/tcp/TCP.cc +++ b/src/analyzer/protocol/tcp/TCP.cc @@ -2,19 +2,14 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" -#include - #include "zeek/DebugLogger.h" #include "zeek/Event.h" #include "zeek/File.h" #include "zeek/IP.h" -#include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/RunState.h" -#include "zeek/analyzer/protocol/pia/PIA.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/analyzer/protocol/tcp/events.bif.h" -#include "zeek/analyzer/protocol/tcp/types.bif.h" #include "zeek/session/Manager.h" namespace zeek::analyzer::tcp { diff --git a/src/analyzer/protocol/tcp/TCP_Endpoint.cc b/src/analyzer/protocol/tcp/TCP_Endpoint.cc index 4521a47ab1..343880ba6a 100644 --- a/src/analyzer/protocol/tcp/TCP_Endpoint.cc +++ b/src/analyzer/protocol/tcp/TCP_Endpoint.cc @@ -4,16 +4,13 @@ #include -#include "zeek/Event.h" #include "zeek/File.h" #include "zeek/NetVar.h" #include "zeek/Reporter.h" -#include "zeek/RunState.h" #include "zeek/Val.h" #include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/analyzer/protocol/tcp/events.bif.h" -#include "zeek/packet_analysis/Analyzer.h" #include "zeek/packet_analysis/protocol/tcp/TCP.h" #include "zeek/session/Manager.h" diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.cc b/src/analyzer/protocol/tcp/TCP_Reassembler.cc index ab206f8ccf..bdfd655359 100644 --- a/src/analyzer/protocol/tcp/TCP_Reassembler.cc +++ b/src/analyzer/protocol/tcp/TCP_Reassembler.cc @@ -2,8 +2,6 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include - #include "zeek/File.h" #include "zeek/Reporter.h" #include "zeek/RuleMatcher.h" diff --git a/src/analyzer/protocol/zip/Plugin.cc b/src/analyzer/protocol/zip/Plugin.cc index 1fffee9fe1..d22637afd7 100644 --- a/src/analyzer/protocol/zip/Plugin.cc +++ b/src/analyzer/protocol/zip/Plugin.cc @@ -3,7 +3,6 @@ #include "zeek/plugin/Plugin.h" #include "zeek/analyzer/Component.h" -#include "zeek/analyzer/protocol/zip/ZIP.h" namespace zeek::plugin::detail::Zeek_ZIP { diff --git a/src/file_analysis/AnalyzerSet.cc b/src/file_analysis/AnalyzerSet.cc index e9bc1547f8..87f2b1c8b1 100644 --- a/src/file_analysis/AnalyzerSet.cc +++ b/src/file_analysis/AnalyzerSet.cc @@ -7,7 +7,6 @@ #include "zeek/file_analysis/Analyzer.h" #include "zeek/file_analysis/File.h" #include "zeek/file_analysis/Manager.h" -#include "zeek/file_analysis/file_analysis.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc index 42d35e96bb..85a3e83ba4 100644 --- a/src/file_analysis/Manager.cc +++ b/src/file_analysis/Manager.cc @@ -8,11 +8,9 @@ #include "zeek/Event.h" #include "zeek/UID.h" #include "zeek/analyzer/Manager.h" -#include "zeek/digest.h" #include "zeek/file_analysis/Analyzer.h" #include "zeek/file_analysis/File.h" #include "zeek/file_analysis/file_analysis.bif.h" -#include "zeek/plugin/Manager.h" using namespace std; diff --git a/src/file_analysis/analyzer/hash/Hash.cc b/src/file_analysis/analyzer/hash/Hash.cc index 9370656f78..5452448d00 100644 --- a/src/file_analysis/analyzer/hash/Hash.cc +++ b/src/file_analysis/analyzer/hash/Hash.cc @@ -2,8 +2,6 @@ #include "zeek/file_analysis/analyzer/hash/Hash.h" -#include - #include "zeek/Event.h" #include "zeek/file_analysis/Manager.h" #include "zeek/util.h" diff --git a/src/file_analysis/analyzer/x509/OCSP.cc b/src/file_analysis/analyzer/x509/OCSP.cc index 1d0815812e..9728732243 100644 --- a/src/file_analysis/analyzer/x509/OCSP.cc +++ b/src/file_analysis/analyzer/x509/OCSP.cc @@ -15,7 +15,6 @@ #include "zeek/file_analysis/Manager.h" #include "zeek/file_analysis/analyzer/x509/X509.h" #include "zeek/file_analysis/analyzer/x509/ocsp_events.bif.h" -#include "zeek/file_analysis/analyzer/x509/types.bif.h" // helper function of sk_X509_value to avoid namespace problem // sk_X509_value(X,Y) = > SKM_sk_value(X509,X,Y) diff --git a/src/file_analysis/analyzer/x509/X509Common.cc b/src/file_analysis/analyzer/x509/X509Common.cc index d660c4460e..2e916cff60 100644 --- a/src/file_analysis/analyzer/x509/X509Common.cc +++ b/src/file_analysis/analyzer/x509/X509Common.cc @@ -9,7 +9,6 @@ #include #include "zeek/Reporter.h" -#include "zeek/file_analysis/analyzer/x509/events.bif.h" #include "zeek/file_analysis/analyzer/x509/ocsp_events.bif.h" #include "zeek/file_analysis/analyzer/x509/types.bif.h" #include "zeek/file_analysis/analyzer/x509/x509-extension_pac.h" diff --git a/src/packet_analysis/Manager.cc b/src/packet_analysis/Manager.cc index 3c4c3437b1..956d9b42d1 100644 --- a/src/packet_analysis/Manager.cc +++ b/src/packet_analysis/Manager.cc @@ -2,6 +2,7 @@ #include "zeek/packet_analysis/Manager.h" +#include "zeek/Event.h" #include "zeek/RunState.h" #include "zeek/Stats.h" #include "zeek/iosource/Manager.h" @@ -9,7 +10,6 @@ #include "zeek/packet_analysis/Analyzer.h" #include "zeek/packet_analysis/Dispatcher.h" #include "zeek/plugin/Manager.h" -#include "zeek/zeek-bif.h" using namespace zeek::packet_analysis; diff --git a/src/packet_analysis/protocol/gre/GRE.cc b/src/packet_analysis/protocol/gre/GRE.cc index b94d6903b5..d4ecee1fd9 100644 --- a/src/packet_analysis/protocol/gre/GRE.cc +++ b/src/packet_analysis/protocol/gre/GRE.cc @@ -4,7 +4,6 @@ #include // For DLT_ constants -#include "zeek/IP.h" #include "zeek/Reporter.h" #include "zeek/RunState.h" #include "zeek/session/Manager.h" diff --git a/src/packet_analysis/protocol/icmp/ICMP.cc b/src/packet_analysis/protocol/icmp/ICMP.cc index cb717a9be7..d53361652b 100644 --- a/src/packet_analysis/protocol/icmp/ICMP.cc +++ b/src/packet_analysis/protocol/icmp/ICMP.cc @@ -11,7 +11,6 @@ #include "zeek/Val.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/Manager.h" -#include "zeek/analyzer/protocol/conn-size/ConnSize.h" #include "zeek/packet_analysis/protocol/icmp/ICMPSessionAdapter.h" #include "zeek/packet_analysis/protocol/icmp/events.bif.h" #include "zeek/session/Manager.h" diff --git a/src/packet_analysis/protocol/icmp/Plugin.cc b/src/packet_analysis/protocol/icmp/Plugin.cc index be4d696cfc..b8627c6ce4 100644 --- a/src/packet_analysis/protocol/icmp/Plugin.cc +++ b/src/packet_analysis/protocol/icmp/Plugin.cc @@ -5,7 +5,6 @@ #include "zeek/analyzer/Component.h" #include "zeek/packet_analysis/Component.h" #include "zeek/packet_analysis/protocol/icmp/ICMP.h" -#include "zeek/packet_analysis/protocol/icmp/ICMPSessionAdapter.h" namespace zeek::plugin::Zeek_ICMP { diff --git a/src/packet_analysis/protocol/tcp/Stats.cc b/src/packet_analysis/protocol/tcp/Stats.cc index 87794ad7f6..3599313852 100644 --- a/src/packet_analysis/protocol/tcp/Stats.cc +++ b/src/packet_analysis/protocol/tcp/Stats.cc @@ -3,7 +3,6 @@ #include "zeek/packet_analysis/protocol/tcp/Stats.h" #include "zeek/File.h" -#include "zeek/analyzer/protocol/tcp/events.bif.h" namespace zeek::packet_analysis::TCP { diff --git a/src/packet_analysis/protocol/tcp/TCP.cc b/src/packet_analysis/protocol/tcp/TCP.cc index 7f2beb8fc3..0b78967a89 100644 --- a/src/packet_analysis/protocol/tcp/TCP.cc +++ b/src/packet_analysis/protocol/tcp/TCP.cc @@ -4,8 +4,6 @@ #include "zeek/RunState.h" #include "zeek/analyzer/protocol/pia/PIA.h" -#include "zeek/analyzer/protocol/tcp/events.bif.h" -#include "zeek/analyzer/protocol/tcp/types.bif.h" #include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h" using namespace zeek; diff --git a/src/packet_analysis/protocol/udp/Plugin.cc b/src/packet_analysis/protocol/udp/Plugin.cc index 3149f96979..3a2bd7654b 100644 --- a/src/packet_analysis/protocol/udp/Plugin.cc +++ b/src/packet_analysis/protocol/udp/Plugin.cc @@ -5,7 +5,6 @@ #include "zeek/analyzer/Component.h" #include "zeek/packet_analysis/Component.h" #include "zeek/packet_analysis/protocol/udp/UDP.h" -#include "zeek/packet_analysis/protocol/udp/UDPSessionAdapter.h" namespace zeek::plugin::Zeek_UDP { From e3c4b1fd58068c7b6aa1057a3bc258e408a4e818 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 8 Apr 2025 15:14:24 -0700 Subject: [PATCH 4/8] Remove unnecessary #includes in input/logging/threading --- src/input/Component.h | 1 - src/input/Manager.cc | 2 -- src/input/ReaderBackend.cc | 1 - src/input/ReaderBackend.h | 2 -- src/input/readers/ascii/Ascii.cc | 1 + src/input/readers/ascii/Ascii.h | 4 ++-- src/input/readers/benchmark/Benchmark.cc | 1 - src/input/readers/config/Config.cc | 2 +- src/input/readers/config/Config.h | 5 +---- src/input/readers/raw/Plugin.cc | 3 +++ src/input/readers/raw/Plugin.h | 1 - src/input/readers/raw/Raw.cc | 1 + src/input/readers/raw/Raw.h | 1 - src/input/readers/sqlite/SQLite.cc | 4 ---- src/input/readers/sqlite/SQLite.h | 5 +---- src/logging/Component.h | 1 - src/logging/Manager.cc | 1 - src/logging/writers/ascii/Ascii.cc | 2 ++ src/logging/writers/ascii/Ascii.h | 4 ++-- src/logging/writers/sqlite/SQLite.cc | 4 +--- src/logging/writers/sqlite/SQLite.h | 3 --- src/threading/BasicThread.cc | 2 -- src/threading/BasicThread.h | 1 - src/threading/Formatter.cc | 2 -- src/threading/Manager.cc | 1 - src/threading/MsgThread.cc | 1 - src/threading/Queue.h | 1 - src/threading/formatters/Ascii.cc | 2 -- src/threading/formatters/JSON.cc | 3 --- src/threading/formatters/JSON.h | 2 +- 30 files changed, 16 insertions(+), 48 deletions(-) diff --git a/src/input/Component.h b/src/input/Component.h index c730fa152d..64e5c28e9e 100644 --- a/src/input/Component.h +++ b/src/input/Component.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/Tag.h" #include "zeek/plugin/Component.h" namespace zeek::input { diff --git a/src/input/Manager.cc b/src/input/Manager.cc index 71788cb2ce..19e074eeab 100644 --- a/src/input/Manager.cc +++ b/src/input/Manager.cc @@ -12,8 +12,6 @@ #include "zeek/EventHandler.h" #include "zeek/Expr.h" #include "zeek/Func.h" -#include "zeek/NetVar.h" -#include "zeek/RunState.h" #include "zeek/file_analysis/Manager.h" #include "zeek/input/ReaderBackend.h" #include "zeek/input/ReaderFrontend.h" diff --git a/src/input/ReaderBackend.cc b/src/input/ReaderBackend.cc index 140e85c55d..664ffb10ab 100644 --- a/src/input/ReaderBackend.cc +++ b/src/input/ReaderBackend.cc @@ -2,7 +2,6 @@ #include "zeek/input/ReaderBackend.h" -#include "zeek/Desc.h" #include "zeek/input/Manager.h" #include "zeek/input/ReaderFrontend.h" diff --git a/src/input/ReaderBackend.h b/src/input/ReaderBackend.h index afc5f7de5c..740b0db8ba 100644 --- a/src/input/ReaderBackend.h +++ b/src/input/ReaderBackend.h @@ -2,10 +2,8 @@ #pragma once -#include "zeek/ZeekString.h" #include "zeek/input/Component.h" #include "zeek/threading/MsgThread.h" -#include "zeek/threading/SerialTypes.h" namespace zeek::detail { class Location; diff --git a/src/input/readers/ascii/Ascii.cc b/src/input/readers/ascii/Ascii.cc index 0601af5b4a..0468e166e7 100644 --- a/src/input/readers/ascii/Ascii.cc +++ b/src/input/readers/ascii/Ascii.cc @@ -9,6 +9,7 @@ #include "zeek/input/readers/ascii/ascii.bif.h" #include "zeek/threading/SerialTypes.h" +#include "zeek/threading/formatters/Ascii.h" using namespace std; using zeek::threading::Field; diff --git a/src/input/readers/ascii/Ascii.h b/src/input/readers/ascii/Ascii.h index 4e4726b94d..73aa3f84e8 100644 --- a/src/input/readers/ascii/Ascii.h +++ b/src/input/readers/ascii/Ascii.h @@ -4,13 +4,13 @@ #include #include -#include #include +#include #include #include "zeek/Obj.h" #include "zeek/input/ReaderBackend.h" -#include "zeek/threading/formatters/Ascii.h" +#include "zeek/threading/Formatter.h" namespace zeek::input::reader::detail { diff --git a/src/input/readers/benchmark/Benchmark.cc b/src/input/readers/benchmark/Benchmark.cc index 80b6182e1d..48010bb5b6 100644 --- a/src/input/readers/benchmark/Benchmark.cc +++ b/src/input/readers/benchmark/Benchmark.cc @@ -8,7 +8,6 @@ #include #include "zeek/input/readers/benchmark/benchmark.bif.h" -#include "zeek/threading/Manager.h" #include "zeek/threading/SerialTypes.h" using zeek::threading::Field; diff --git a/src/input/readers/config/Config.cc b/src/input/readers/config/Config.cc index 405af70d8d..d234fe334d 100644 --- a/src/input/readers/config/Config.cc +++ b/src/input/readers/config/Config.cc @@ -7,13 +7,13 @@ #include #include #include -#include #include #include "zeek/Desc.h" #include "zeek/input/Manager.h" #include "zeek/input/readers/config/config.bif.h" #include "zeek/threading/SerialTypes.h" +#include "zeek/threading/formatters/Ascii.h" using zeek::threading::Field; using zeek::threading::Value; diff --git a/src/input/readers/config/Config.h b/src/input/readers/config/Config.h index 8d74e9dde1..3994743f32 100644 --- a/src/input/readers/config/Config.h +++ b/src/input/readers/config/Config.h @@ -4,14 +4,11 @@ #include #include -#include -#include #include -#include #include "zeek/ID.h" #include "zeek/input/ReaderBackend.h" -#include "zeek/threading/formatters/Ascii.h" +#include "zeek/threading/Formatter.h" namespace zeek::input::reader::detail { diff --git a/src/input/readers/raw/Plugin.cc b/src/input/readers/raw/Plugin.cc index 757e989836..f42f4a9ff2 100644 --- a/src/input/readers/raw/Plugin.cc +++ b/src/input/readers/raw/Plugin.cc @@ -2,6 +2,9 @@ #include "zeek/input/readers/raw/Plugin.h" +#include "zeek/input/Component.h" +#include "zeek/input/readers/raw/Raw.h" + namespace zeek::plugin::detail::Zeek_RawReader { Plugin plugin; diff --git a/src/input/readers/raw/Plugin.h b/src/input/readers/raw/Plugin.h index d15ecdbe33..c3ba069e06 100644 --- a/src/input/readers/raw/Plugin.h +++ b/src/input/readers/raw/Plugin.h @@ -4,7 +4,6 @@ #include -#include "zeek/input/readers/raw/Raw.h" #include "zeek/plugin/Plugin.h" namespace zeek::plugin::detail::Zeek_RawReader { diff --git a/src/input/readers/raw/Raw.cc b/src/input/readers/raw/Raw.cc index af8c434bbf..2660cc8912 100644 --- a/src/input/readers/raw/Raw.cc +++ b/src/input/readers/raw/Raw.cc @@ -17,6 +17,7 @@ extern char** environ; +#include "zeek/input/Component.h" #include "zeek/input/readers/raw/Plugin.h" #include "zeek/input/readers/raw/raw.bif.h" #include "zeek/threading/SerialTypes.h" diff --git a/src/input/readers/raw/Raw.h b/src/input/readers/raw/Raw.h index 1fc1b52097..74e694d064 100644 --- a/src/input/readers/raw/Raw.h +++ b/src/input/readers/raw/Raw.h @@ -5,7 +5,6 @@ #include #include #include -#include #include "zeek/input/ReaderBackend.h" diff --git a/src/input/readers/sqlite/SQLite.cc b/src/input/readers/sqlite/SQLite.cc index 963aca3736..3d22189a66 100644 --- a/src/input/readers/sqlite/SQLite.cc +++ b/src/input/readers/sqlite/SQLite.cc @@ -2,13 +2,9 @@ #include "zeek/input/readers/sqlite/SQLite.h" -#include "zeek/zeek-config.h" - #include #include #include -#include -#include #include "zeek/input/readers/sqlite/sqlite.bif.h" #include "zeek/logging/writers/ascii/ascii.bif.h" diff --git a/src/input/readers/sqlite/SQLite.h b/src/input/readers/sqlite/SQLite.h index 83891cc502..6bd1a3c85a 100644 --- a/src/input/readers/sqlite/SQLite.h +++ b/src/input/readers/sqlite/SQLite.h @@ -2,10 +2,7 @@ #pragma once -#include "zeek/zeek-config.h" - -#include -#include +#include #include "zeek/3rdparty/sqlite3.h" #include "zeek/input/ReaderBackend.h" diff --git a/src/logging/Component.h b/src/logging/Component.h index 67e859898c..a2078af019 100644 --- a/src/logging/Component.h +++ b/src/logging/Component.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/Tag.h" #include "zeek/plugin/Component.h" namespace zeek::logging { diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc index c8c7098dd8..fbb9c2183a 100644 --- a/src/logging/Manager.cc +++ b/src/logging/Manager.cc @@ -14,7 +14,6 @@ #include "zeek/File.h" #include "zeek/Func.h" #include "zeek/IntrusivePtr.h" -#include "zeek/NetVar.h" #include "zeek/OpaqueVal.h" #include "zeek/RunState.h" #include "zeek/Timer.h" diff --git a/src/logging/writers/ascii/Ascii.cc b/src/logging/writers/ascii/Ascii.cc index 2bb356f3ab..2f9fc861a4 100644 --- a/src/logging/writers/ascii/Ascii.cc +++ b/src/logging/writers/ascii/Ascii.cc @@ -20,6 +20,8 @@ #include "zeek/logging/Manager.h" #include "zeek/logging/writers/ascii/ascii.bif.h" #include "zeek/threading/SerialTypes.h" +#include "zeek/threading/formatters/Ascii.h" +#include "zeek/threading/formatters/JSON.h" #include "zeek/util.h" #include "zeek/3rdparty/doctest.h" diff --git a/src/logging/writers/ascii/Ascii.h b/src/logging/writers/ascii/Ascii.h index f5c962ca8e..6ae5ba0cb9 100644 --- a/src/logging/writers/ascii/Ascii.h +++ b/src/logging/writers/ascii/Ascii.h @@ -5,11 +5,11 @@ #pragma once #include +#include #include "zeek/Desc.h" #include "zeek/logging/WriterBackend.h" -#include "zeek/threading/formatters/Ascii.h" -#include "zeek/threading/formatters/JSON.h" +#include "zeek/threading/Formatter.h" namespace zeek::plugin::detail::Zeek_AsciiWriter { class Plugin; diff --git a/src/logging/writers/sqlite/SQLite.cc b/src/logging/writers/sqlite/SQLite.cc index 5186c14a5c..67de679e6d 100644 --- a/src/logging/writers/sqlite/SQLite.cc +++ b/src/logging/writers/sqlite/SQLite.cc @@ -2,12 +2,10 @@ #include "zeek/logging/writers/sqlite/SQLite.h" -#include "zeek/zeek-config.h" - #include #include -#include +#include "zeek/Desc.h" #include "zeek/logging/writers/sqlite/sqlite.bif.h" #include "zeek/threading/SerialTypes.h" #include "zeek/util.h" diff --git a/src/logging/writers/sqlite/SQLite.h b/src/logging/writers/sqlite/SQLite.h index 5fd20bf45f..619a3f3d9a 100644 --- a/src/logging/writers/sqlite/SQLite.h +++ b/src/logging/writers/sqlite/SQLite.h @@ -4,10 +4,7 @@ #pragma once -#include "zeek/zeek-config.h" - #include "zeek/3rdparty/sqlite3.h" -#include "zeek/Desc.h" #include "zeek/logging/WriterBackend.h" #include "zeek/threading/formatters/Ascii.h" diff --git a/src/threading/BasicThread.cc b/src/threading/BasicThread.cc index 4c606b5cb2..94f3232a51 100644 --- a/src/threading/BasicThread.cc +++ b/src/threading/BasicThread.cc @@ -2,8 +2,6 @@ #include "zeek/threading/BasicThread.h" -#include "zeek/zeek-config.h" - #include #include #include diff --git a/src/threading/BasicThread.h b/src/threading/BasicThread.h index 9d94a2df89..8b11e1c2c0 100644 --- a/src/threading/BasicThread.h +++ b/src/threading/BasicThread.h @@ -7,7 +7,6 @@ #include #include #include -#include #include namespace zeek::threading { diff --git a/src/threading/Formatter.cc b/src/threading/Formatter.cc index b5c90be3bf..2f6fed583e 100644 --- a/src/threading/Formatter.cc +++ b/src/threading/Formatter.cc @@ -2,8 +2,6 @@ #include "zeek/threading/Formatter.h" -#include "zeek/zeek-config.h" - #include #include "zeek/3rdparty/zeek_inet_ntop.h" diff --git a/src/threading/Manager.cc b/src/threading/Manager.cc index e34cb92a6a..8fcf6605ac 100644 --- a/src/threading/Manager.cc +++ b/src/threading/Manager.cc @@ -9,7 +9,6 @@ #include "zeek/Event.h" #include "zeek/IPAddr.h" -#include "zeek/NetVar.h" #include "zeek/RunState.h" #include "zeek/telemetry/Manager.h" diff --git a/src/threading/MsgThread.cc b/src/threading/MsgThread.cc index b5621de96e..81764bbda8 100644 --- a/src/threading/MsgThread.cc +++ b/src/threading/MsgThread.cc @@ -11,7 +11,6 @@ #include "zeek/Obj.h" #include "zeek/RunState.h" #include "zeek/iosource/Manager.h" -#include "zeek/telemetry/Manager.h" #include "zeek/threading/Manager.h" // Set by Zeek's main signal handler. diff --git a/src/threading/Queue.h b/src/threading/Queue.h index b3f949f8eb..850c5f7bcd 100644 --- a/src/threading/Queue.h +++ b/src/threading/Queue.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/src/threading/formatters/Ascii.cc b/src/threading/formatters/Ascii.cc index 22ef1e8efb..8548547d36 100644 --- a/src/threading/formatters/Ascii.cc +++ b/src/threading/formatters/Ascii.cc @@ -2,8 +2,6 @@ #include "zeek/threading/formatters/Ascii.h" -#include "zeek/zeek-config.h" - #include #include diff --git a/src/threading/formatters/JSON.cc b/src/threading/formatters/JSON.cc index 08a2c2a703..6070fd1955 100644 --- a/src/threading/formatters/JSON.cc +++ b/src/threading/formatters/JSON.cc @@ -2,8 +2,6 @@ #include "zeek/threading/formatters/JSON.h" -#include "zeek/zeek-config.h" - #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS #endif @@ -14,7 +12,6 @@ #include #include #include -#include #include "zeek/Desc.h" #include "zeek/threading/MsgThread.h" diff --git a/src/threading/formatters/JSON.h b/src/threading/formatters/JSON.h index 44dd78d198..68e2bb2918 100644 --- a/src/threading/formatters/JSON.h +++ b/src/threading/formatters/JSON.h @@ -2,7 +2,7 @@ #pragma once -#include +#include #include "zeek/threading/Formatter.h" From 17101da6b39e5d9341abcd7298dcc56135743c86 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 10 Apr 2025 16:38:06 -0700 Subject: [PATCH 5/8] Remove unnecessary #includes in zeekygen and base plugin files --- src/logging/Manager.cc | 1 + src/plugin/ComponentManager.h | 2 -- src/plugin/Manager.cc | 1 - src/plugin/Manager.h | 1 - src/spicy/manager.cc | 1 + src/zeekygen/IdentifierInfo.h | 2 -- src/zeekygen/Manager.h | 1 - src/zeekygen/ScriptInfo.h | 2 -- src/zeekygen/SpicyModuleInfo.h | 1 - src/zeekygen/Target.h | 2 -- src/zeekygen/utils.h | 2 -- 11 files changed, 2 insertions(+), 14 deletions(-) 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 #include -#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 #include -#include // for PATH_MAX #include #include #include 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 #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 // for time_t #include #include 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 // for time_t #include #include -#include #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 #include #include 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 // for time_t #include #include From 8b992320cb9ecfe6d56c17519be463510daa3430 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 24 Apr 2025 12:00:54 -0700 Subject: [PATCH 6/8] Remove unnecessary #includes in cluster/broker/iosource/probabilistic/session --- src/broker/Data.h | 1 - src/broker/Manager.cc | 1 - .../serializer/binary-serialization-format/Serializer.cc | 1 - src/cluster/websocket/WebSocket.cc | 1 - src/iosource/BPF_Program.cc | 2 -- src/iosource/Manager.cc | 1 - src/iosource/Manager.h | 2 -- src/iosource/Packet.cc | 4 ---- src/iosource/Packet.h | 2 -- src/iosource/PktDumper.cc | 2 -- src/iosource/PktDumper.h | 2 -- src/iosource/pcap/Source.cc | 2 -- src/probabilistic/BloomFilter.h | 3 --- src/probabilistic/CounterVector.cc | 1 - src/probabilistic/CounterVector.h | 2 -- src/probabilistic/Hasher.cc | 1 - src/session/Manager.cc | 1 - src/session/Manager.h | 3 --- src/session/Session.cc | 1 - src/session/Session.h | 1 - 20 files changed, 34 deletions(-) diff --git a/src/broker/Data.h b/src/broker/Data.h index 6b20fd4aeb..4114aac27b 100644 --- a/src/broker/Data.h +++ b/src/broker/Data.h @@ -11,7 +11,6 @@ #include "zeek/OpaqueVal.h" #include "zeek/Reporter.h" -#include "broker/config.hh" #include "broker/data.hh" namespace zeek { diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index 544544b207..6885a1c3f0 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -31,7 +31,6 @@ #include "zeek/broker/Data.h" #include "zeek/broker/Store.h" #include "zeek/broker/comm.bif.h" -#include "zeek/broker/data.bif.h" #include "zeek/broker/messaging.bif.h" #include "zeek/broker/store.bif.h" #include "zeek/cluster/serializer/broker/Serializer.h" diff --git a/src/cluster/serializer/binary-serialization-format/Serializer.cc b/src/cluster/serializer/binary-serialization-format/Serializer.cc index b26087e34c..888b4bdf22 100644 --- a/src/cluster/serializer/binary-serialization-format/Serializer.cc +++ b/src/cluster/serializer/binary-serialization-format/Serializer.cc @@ -10,7 +10,6 @@ #include "zeek/SerializationFormat.h" #include "zeek/Type.h" #include "zeek/Val.h" -#include "zeek/cluster/Serializer.h" #include "zeek/cluster/serializer/binary-serialization-format/Plugin.h" #include "zeek/logging/Types.h" #include "zeek/threading/SerialTypes.h" diff --git a/src/cluster/websocket/WebSocket.cc b/src/cluster/websocket/WebSocket.cc index a49ce30049..2d602180c4 100644 --- a/src/cluster/websocket/WebSocket.cc +++ b/src/cluster/websocket/WebSocket.cc @@ -20,7 +20,6 @@ #include "zeek/net_util.h" #include "zeek/threading/MsgThread.h" -#include "broker/data.bif.h" #include "broker/data_envelope.hh" #include "broker/error.hh" #include "broker/format/json.hh" diff --git a/src/iosource/BPF_Program.cc b/src/iosource/BPF_Program.cc index 75e8cb8410..99a327e972 100644 --- a/src/iosource/BPF_Program.cc +++ b/src/iosource/BPF_Program.cc @@ -2,8 +2,6 @@ #include "zeek/iosource/BPF_Program.h" -#include "zeek/zeek-config.h" - // clang-format off // Include order is required here for a working build on Windows. #include diff --git a/src/iosource/Manager.cc b/src/iosource/Manager.cc index dbce85423c..5b649f667c 100644 --- a/src/iosource/Manager.cc +++ b/src/iosource/Manager.cc @@ -12,7 +12,6 @@ #include #include -#include "zeek/NetVar.h" #include "zeek/RunState.h" #include "zeek/iosource/Component.h" #include "zeek/iosource/IOSource.h" diff --git a/src/iosource/Manager.h b/src/iosource/Manager.h index 48f8814b2b..aac2144eb2 100644 --- a/src/iosource/Manager.h +++ b/src/iosource/Manager.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include #include #include diff --git a/src/iosource/Packet.cc b/src/iosource/Packet.cc index d8428ba00f..c9d697334b 100644 --- a/src/iosource/Packet.cc +++ b/src/iosource/Packet.cc @@ -16,12 +16,8 @@ extern "C" { #endif } -#include "zeek/Desc.h" #include "zeek/IP.h" -#include "zeek/TunnelEncapsulation.h" #include "zeek/Var.h" -#include "zeek/iosource/Manager.h" -#include "zeek/packet_analysis/Manager.h" namespace zeek { diff --git a/src/iosource/Packet.h b/src/iosource/Packet.h index 3a7f57b2cd..7b9dce4e1b 100644 --- a/src/iosource/Packet.h +++ b/src/iosource/Packet.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include // for u_char #include #include diff --git a/src/iosource/PktDumper.cc b/src/iosource/PktDumper.cc index 7d08cde45e..c5a957fce6 100644 --- a/src/iosource/PktDumper.cc +++ b/src/iosource/PktDumper.cc @@ -3,8 +3,6 @@ #include "zeek/iosource/PktDumper.h" -#include "zeek/zeek-config.h" - #include "zeek/DebugLogger.h" namespace zeek::iosource { diff --git a/src/iosource/PktDumper.h b/src/iosource/PktDumper.h index 2adf83957e..eeda60597b 100644 --- a/src/iosource/PktDumper.h +++ b/src/iosource/PktDumper.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include namespace zeek { diff --git a/src/iosource/pcap/Source.cc b/src/iosource/pcap/Source.cc index b1270d9fc6..b1f8b36172 100644 --- a/src/iosource/pcap/Source.cc +++ b/src/iosource/pcap/Source.cc @@ -2,8 +2,6 @@ #include "zeek/iosource/pcap/Source.h" -#include "zeek/zeek-config.h" - #include "zeek/3rdparty/doctest.h" #ifdef HAVE_PCAP_INT_H diff --git a/src/probabilistic/BloomFilter.h b/src/probabilistic/BloomFilter.h index f79b81a60e..eed5d4e436 100644 --- a/src/probabilistic/BloomFilter.h +++ b/src/probabilistic/BloomFilter.h @@ -2,11 +2,8 @@ #pragma once -#include "zeek/zeek-config.h" - #include #include -#include #include "zeek/probabilistic/BitVector.h" #include "zeek/probabilistic/Hasher.h" diff --git a/src/probabilistic/CounterVector.cc b/src/probabilistic/CounterVector.cc index 21239146ee..ef830ddc28 100644 --- a/src/probabilistic/CounterVector.cc +++ b/src/probabilistic/CounterVector.cc @@ -8,7 +8,6 @@ #include "zeek/broker/Data.h" #include "zeek/probabilistic/BitVector.h" -#include "zeek/util.h" namespace zeek::probabilistic::detail { diff --git a/src/probabilistic/CounterVector.h b/src/probabilistic/CounterVector.h index 33b4886332..a63285a7ba 100644 --- a/src/probabilistic/CounterVector.h +++ b/src/probabilistic/CounterVector.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include #include #include diff --git a/src/probabilistic/Hasher.cc b/src/probabilistic/Hasher.cc index 4eefd7c3ba..4805cc8f48 100644 --- a/src/probabilistic/Hasher.cc +++ b/src/probabilistic/Hasher.cc @@ -6,7 +6,6 @@ #include #include -#include "zeek/NetVar.h" #include "zeek/Var.h" #include "zeek/broker/Data.h" #include "zeek/digest.h" diff --git a/src/session/Manager.cc b/src/session/Manager.cc index b15b9383f4..32dfa4f226 100644 --- a/src/session/Manager.cc +++ b/src/session/Manager.cc @@ -11,7 +11,6 @@ #include "zeek/Conn.h" #include "zeek/Func.h" #include "zeek/IP.h" -#include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/RuleMatcher.h" #include "zeek/RunState.h" diff --git a/src/session/Manager.h b/src/session/Manager.h index 007cd5d31c..5803673cdf 100644 --- a/src/session/Manager.h +++ b/src/session/Manager.h @@ -4,11 +4,8 @@ #include // for u_char #include -#include #include "zeek/Frag.h" -#include "zeek/Hash.h" -#include "zeek/NetVar.h" #include "zeek/session/Session.h" namespace zeek { diff --git a/src/session/Session.cc b/src/session/Session.cc index ae46122213..5e5538c3b6 100644 --- a/src/session/Session.cc +++ b/src/session/Session.cc @@ -4,7 +4,6 @@ #include "zeek/Desc.h" #include "zeek/Event.h" -#include "zeek/IP.h" #include "zeek/Reporter.h" #include "zeek/Stats.h" #include "zeek/Val.h" diff --git a/src/session/Session.h b/src/session/Session.h index 467dd9c9af..747a1c78e4 100644 --- a/src/session/Session.h +++ b/src/session/Session.h @@ -3,7 +3,6 @@ #pragma once #include -#include #include "zeek/EventHandler.h" #include "zeek/Hash.h" From 0e47fa10c6fa9f5fe408f7695381754ab83caae5 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 24 Apr 2025 12:13:07 -0700 Subject: [PATCH 7/8] Remove unnecessary #includes in telemetry and supervisor --- src/main.cc | 1 + src/supervisor/Supervisor.cc | 1 + src/supervisor/Supervisor.h | 5 ----- src/telemetry/Counter.h | 2 +- src/telemetry/Gauge.h | 2 +- src/telemetry/Histogram.h | 3 +-- src/telemetry/Opaques.cc | 2 +- src/telemetry/ProcessStats.cc | 11 ++++++++--- src/telemetry/ProcessStats.h | 2 +- src/telemetry/Utils.cc | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main.cc b/src/main.cc index 877d3786a2..5c0da86cff 100644 --- a/src/main.cc +++ b/src/main.cc @@ -3,6 +3,7 @@ #include #include +#include "zeek/NetVar.h" #include "zeek/RunState.h" #include "zeek/Stats.h" #include "zeek/iosource/Manager.h" diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc index 5734a2c968..f9c8ccc23b 100644 --- a/src/supervisor/Supervisor.cc +++ b/src/supervisor/Supervisor.cc @@ -29,6 +29,7 @@ extern "C" { #include "zeek/Dict.h" #include "zeek/Event.h" #include "zeek/EventHandler.h" +#include "zeek/EventRegistry.h" #include "zeek/ID.h" #include "zeek/NetVar.h" #include "zeek/RE.h" diff --git a/src/supervisor/Supervisor.h b/src/supervisor/Supervisor.h index 0224fb3d7b..64d492fb22 100644 --- a/src/supervisor/Supervisor.h +++ b/src/supervisor/Supervisor.h @@ -2,11 +2,8 @@ #pragma once -#include "zeek/zeek-config.h" - #include #include -#include #include #include #include @@ -17,8 +14,6 @@ #include "zeek/Flare.h" #include "zeek/Func.h" -#include "zeek/IntrusivePtr.h" -#include "zeek/NetVar.h" #include "zeek/Options.h" #include "zeek/Pipe.h" #include "zeek/Timer.h" diff --git a/src/telemetry/Counter.h b/src/telemetry/Counter.h index 3e84a910ce..6252e4e8f8 100644 --- a/src/telemetry/Counter.h +++ b/src/telemetry/Counter.h @@ -7,7 +7,7 @@ #include #include -#include "zeek/NetVar.h" +#include "zeek/NetVar.h" // For BifEnum::Telemetry value #include "zeek/Span.h" #include "zeek/telemetry/MetricFamily.h" #include "zeek/telemetry/Utils.h" diff --git a/src/telemetry/Gauge.h b/src/telemetry/Gauge.h index 0800f20e83..2f5b8962b4 100644 --- a/src/telemetry/Gauge.h +++ b/src/telemetry/Gauge.h @@ -8,7 +8,7 @@ #include #include -#include "zeek/NetVar.h" +#include "zeek/NetVar.h" // For BifEnum::Telemetry value #include "zeek/Span.h" #include "zeek/telemetry/MetricFamily.h" #include "zeek/telemetry/Utils.h" diff --git a/src/telemetry/Histogram.h b/src/telemetry/Histogram.h index 51a887c78d..8a13803e26 100644 --- a/src/telemetry/Histogram.h +++ b/src/telemetry/Histogram.h @@ -4,11 +4,10 @@ #include #include -#include #include #include -#include "zeek/NetVar.h" +#include "zeek/NetVar.h" // For BifEnum::Telemetry values #include "zeek/Span.h" #include "zeek/telemetry/MetricFamily.h" #include "zeek/telemetry/Utils.h" diff --git a/src/telemetry/Opaques.cc b/src/telemetry/Opaques.cc index 3f1fa6c2a3..bf45cb33ae 100644 --- a/src/telemetry/Opaques.cc +++ b/src/telemetry/Opaques.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "Opaques.h" +#include "zeek/telemetry/Opaques.h" #include "zeek/telemetry/Counter.h" #include "zeek/telemetry/Gauge.h" diff --git a/src/telemetry/ProcessStats.cc b/src/telemetry/ProcessStats.cc index feaee81224..f84aac73e6 100644 --- a/src/telemetry/ProcessStats.cc +++ b/src/telemetry/ProcessStats.cc @@ -2,8 +2,6 @@ #include "zeek/telemetry/ProcessStats.h" -#include "zeek/util.h" - #ifdef __APPLE__ #include @@ -63,7 +61,13 @@ process_stats get_process_stats() { #elif defined(HAVE_LINUX) +#include +#include +#include #include +#include +#include + std::atomic global_ticks_per_second; std::atomic global_page_size; @@ -172,9 +176,10 @@ process_stats get_process_stats() { // Force these includes into a specific order so that the libraries can find // all of the required types. // clang-format off +#include +#include #include #include -#include #include #include #include diff --git a/src/telemetry/ProcessStats.h b/src/telemetry/ProcessStats.h index 7d4f78c33f..5848976fae 100644 --- a/src/telemetry/ProcessStats.h +++ b/src/telemetry/ProcessStats.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek/zeek-config.h" +#include "zeek/zeek-config.h" // Needed for HAVE_LINUX #include diff --git a/src/telemetry/Utils.cc b/src/telemetry/Utils.cc index d2c7741e18..f099252500 100644 --- a/src/telemetry/Utils.cc +++ b/src/telemetry/Utils.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "Utils.h" +#include "zeek/telemetry/Utils.h" #include "zeek/ID.h" #include "zeek/Reporter.h" From 12356a639382bf00cc0c9bdbc26fc1a2c8fc17c6 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 24 Apr 2025 12:52:06 -0700 Subject: [PATCH 8/8] Remove unnecessary #includes in script_opt --- src/script_opt/CPP/Compile.h | 1 + src/script_opt/CPP/Exprs.cc | 2 -- src/script_opt/CPP/RuntimeInitSupport.h | 1 - src/script_opt/CPP/RuntimeInits.cc | 2 ++ src/script_opt/CPP/RuntimeInits.h | 1 - src/script_opt/CPP/Vars.cc | 1 - src/script_opt/FuncInfo.cc | 2 +- src/script_opt/FuncInfo.h | 2 +- src/script_opt/IDOptInfo.cc | 1 - src/script_opt/Inline.cc | 1 - src/script_opt/ScriptOpt.cc | 1 - src/script_opt/ScriptOpt.h | 3 ++- src/script_opt/UsageAnalyzer.cc | 1 - src/script_opt/ZAM/Branches.cc | 1 - src/script_opt/ZAM/BuiltInSupport.h | 6 +++++- src/script_opt/ZAM/Compile.h | 1 - src/script_opt/ZAM/Driver.cc | 3 --- src/script_opt/ZAM/Frame.h | 6 ++++++ src/script_opt/ZAM/Low-Level.cc | 1 - src/script_opt/ZAM/Profile.cc | 4 ---- src/script_opt/ZAM/Vars.cc | 1 - src/script_opt/ZAM/ZBody.cc | 4 +--- src/script_opt/ZAM/ZInst.h | 1 - src/script_opt/ZAM/ZInstAux.h | 1 + 24 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/script_opt/CPP/Compile.h b/src/script_opt/CPP/Compile.h index c15a54a598..0014081476 100644 --- a/src/script_opt/CPP/Compile.h +++ b/src/script_opt/CPP/Compile.h @@ -2,6 +2,7 @@ #pragma once +// Most of these headers are needed for the block of #includes later #include "zeek/Desc.h" #include "zeek/script_opt/CPP/Func.h" #include "zeek/script_opt/CPP/InitsInfo.h" diff --git a/src/script_opt/CPP/Exprs.cc b/src/script_opt/CPP/Exprs.cc index 6d6946fe49..c9ad33122c 100644 --- a/src/script_opt/CPP/Exprs.cc +++ b/src/script_opt/CPP/Exprs.cc @@ -1,8 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek/RE.h" #include "zeek/script_opt/CPP/Compile.h" -#include "zeek/script_opt/ProfileFunc.h" namespace zeek::detail { diff --git a/src/script_opt/CPP/RuntimeInitSupport.h b/src/script_opt/CPP/RuntimeInitSupport.h index 3f50e9f7e9..fb016eb338 100644 --- a/src/script_opt/CPP/RuntimeInitSupport.h +++ b/src/script_opt/CPP/RuntimeInitSupport.h @@ -5,7 +5,6 @@ #pragma once #include "zeek/Val.h" -#include "zeek/script_opt/CPP/AttrExprType.h" #include "zeek/script_opt/CPP/Func.h" namespace zeek { diff --git a/src/script_opt/CPP/RuntimeInits.cc b/src/script_opt/CPP/RuntimeInits.cc index a24a3a6cdb..946d332d0f 100644 --- a/src/script_opt/CPP/RuntimeInits.cc +++ b/src/script_opt/CPP/RuntimeInits.cc @@ -6,6 +6,8 @@ #include "zeek/File.h" #include "zeek/RE.h" #include "zeek/ZeekString.h" +#include "zeek/module_util.h" +#include "zeek/script_opt/CPP/AttrExprType.h" #include "zeek/script_opt/CPP/RuntimeInitSupport.h" using namespace std; diff --git a/src/script_opt/CPP/RuntimeInits.h b/src/script_opt/CPP/RuntimeInits.h index d20f4b7bb5..b547097cb4 100644 --- a/src/script_opt/CPP/RuntimeInits.h +++ b/src/script_opt/CPP/RuntimeInits.h @@ -7,7 +7,6 @@ // associated strategies for dealing with them. #include "zeek/Expr.h" -#include "zeek/module_util.h" #include "zeek/script_opt/CPP/RuntimeInitSupport.h" #pragma once diff --git a/src/script_opt/CPP/Vars.cc b/src/script_opt/CPP/Vars.cc index 69a4248a4c..893a1231a0 100644 --- a/src/script_opt/CPP/Vars.cc +++ b/src/script_opt/CPP/Vars.cc @@ -2,7 +2,6 @@ #include "zeek/script_opt/CPP/Compile.h" #include "zeek/script_opt/IDOptInfo.h" -#include "zeek/script_opt/ProfileFunc.h" namespace zeek::detail { diff --git a/src/script_opt/FuncInfo.cc b/src/script_opt/FuncInfo.cc index 92f382db8f..49bce2d028 100644 --- a/src/script_opt/FuncInfo.cc +++ b/src/script_opt/FuncInfo.cc @@ -2,7 +2,7 @@ #include "zeek/script_opt/FuncInfo.h" -#include +#include namespace zeek::detail { diff --git a/src/script_opt/FuncInfo.h b/src/script_opt/FuncInfo.h index f36601c8b2..f5045f2a19 100644 --- a/src/script_opt/FuncInfo.h +++ b/src/script_opt/FuncInfo.h @@ -4,7 +4,7 @@ #pragma once -#include "zeek/Func.h" +#include namespace zeek::detail { diff --git a/src/script_opt/IDOptInfo.cc b/src/script_opt/IDOptInfo.cc index 9e170a2191..fbec619bf7 100644 --- a/src/script_opt/IDOptInfo.cc +++ b/src/script_opt/IDOptInfo.cc @@ -4,7 +4,6 @@ #include "zeek/Desc.h" #include "zeek/Expr.h" -#include "zeek/Stmt.h" #include "zeek/script_opt/StmtOptInfo.h" namespace zeek::detail { diff --git a/src/script_opt/Inline.cc b/src/script_opt/Inline.cc index d3a932bced..410ceec678 100644 --- a/src/script_opt/Inline.cc +++ b/src/script_opt/Inline.cc @@ -2,7 +2,6 @@ #include "zeek/script_opt/Inline.h" -#include "zeek/Desc.h" #include "zeek/EventRegistry.h" #include "zeek/module_util.h" #include "zeek/script_opt/Expr.h" diff --git a/src/script_opt/ScriptOpt.cc b/src/script_opt/ScriptOpt.cc index 9daf28cbc9..2a3148bb5a 100644 --- a/src/script_opt/ScriptOpt.cc +++ b/src/script_opt/ScriptOpt.cc @@ -5,7 +5,6 @@ #include "zeek/Desc.h" #include "zeek/EventHandler.h" #include "zeek/EventRegistry.h" -#include "zeek/Options.h" #include "zeek/Reporter.h" #include "zeek/module_util.h" #include "zeek/script_opt/CPP/Compile.h" diff --git a/src/script_opt/ScriptOpt.h b/src/script_opt/ScriptOpt.h index f36888272e..ac188cd979 100644 --- a/src/script_opt/ScriptOpt.h +++ b/src/script_opt/ScriptOpt.h @@ -4,9 +4,10 @@ #pragma once -#include #include #include +#include +#include #include "zeek/Expr.h" #include "zeek/Func.h" diff --git a/src/script_opt/UsageAnalyzer.cc b/src/script_opt/UsageAnalyzer.cc index 34360751e2..4ebc11f387 100644 --- a/src/script_opt/UsageAnalyzer.cc +++ b/src/script_opt/UsageAnalyzer.cc @@ -3,7 +3,6 @@ #include "zeek/script_opt/UsageAnalyzer.h" #include "zeek/EventRegistry.h" -#include "zeek/module_util.h" #include "zeek/script_opt/IDOptInfo.h" namespace zeek::detail { diff --git a/src/script_opt/ZAM/Branches.cc b/src/script_opt/ZAM/Branches.cc index bbe1ecf957..1c2ff19247 100644 --- a/src/script_opt/ZAM/Branches.cc +++ b/src/script_opt/ZAM/Branches.cc @@ -2,7 +2,6 @@ // Methods for dealing with ZAM branches. -#include "zeek/Desc.h" #include "zeek/Reporter.h" #include "zeek/script_opt/ZAM/Compile.h" diff --git a/src/script_opt/ZAM/BuiltInSupport.h b/src/script_opt/ZAM/BuiltInSupport.h index f609992b73..340db9f8ab 100644 --- a/src/script_opt/ZAM/BuiltInSupport.h +++ b/src/script_opt/ZAM/BuiltInSupport.h @@ -2,8 +2,12 @@ #pragma once +#include +#include + #include "zeek/Desc.h" -#include "zeek/Expr.h" +#include "zeek/Val.h" +#include "zeek/ZVal.h" namespace zeek::detail { diff --git a/src/script_opt/ZAM/Compile.h b/src/script_opt/ZAM/Compile.h index c7c1f15286..f7ce1eab9c 100644 --- a/src/script_opt/ZAM/Compile.h +++ b/src/script_opt/ZAM/Compile.h @@ -4,7 +4,6 @@ #pragma once -#include "zeek/Event.h" #include "zeek/script_opt/Expr.h" #include "zeek/script_opt/ProfileFunc.h" #include "zeek/script_opt/UseDefs.h" diff --git a/src/script_opt/ZAM/Driver.cc b/src/script_opt/ZAM/Driver.cc index 8a2151a0f1..43b3b1a1c6 100644 --- a/src/script_opt/ZAM/Driver.cc +++ b/src/script_opt/ZAM/Driver.cc @@ -2,12 +2,9 @@ // Driver (and other high-level) methods for ZAM compilation. -#include "zeek/CompHash.h" #include "zeek/Frame.h" -#include "zeek/RE.h" #include "zeek/Reporter.h" #include "zeek/Scope.h" -#include "zeek/module_util.h" #include "zeek/script_opt/ScriptOpt.h" #include "zeek/script_opt/ZAM/Compile.h" diff --git a/src/script_opt/ZAM/Frame.h b/src/script_opt/ZAM/Frame.h index 2be75d48ad..a2ea9e0a7b 100644 --- a/src/script_opt/ZAM/Frame.h +++ b/src/script_opt/ZAM/Frame.h @@ -4,6 +4,12 @@ #pragma once +#include + +#include "zeek/Attr.h" +#include "zeek/ID.h" +#include "zeek/util.h" + namespace zeek::detail { using AttributesPtr = IntrusivePtr; diff --git a/src/script_opt/ZAM/Low-Level.cc b/src/script_opt/ZAM/Low-Level.cc index f064f66ce8..87d3de2057 100644 --- a/src/script_opt/ZAM/Low-Level.cc +++ b/src/script_opt/ZAM/Low-Level.cc @@ -4,7 +4,6 @@ #include "zeek/Desc.h" #include "zeek/Reporter.h" -#include "zeek/script_opt/ScriptOpt.h" #include "zeek/script_opt/ZAM/Compile.h" namespace zeek::detail { diff --git a/src/script_opt/ZAM/Profile.cc b/src/script_opt/ZAM/Profile.cc index 65b8f608b2..abea346517 100644 --- a/src/script_opt/ZAM/Profile.cc +++ b/src/script_opt/ZAM/Profile.cc @@ -2,12 +2,8 @@ #include "zeek/script_opt/ZAM/Profile.h" -#include -#include - #include "zeek/Obj.h" #include "zeek/script_opt/ProfileFunc.h" -#include "zeek/script_opt/ZAM/ZBody.h" namespace zeek::detail { diff --git a/src/script_opt/ZAM/Vars.cc b/src/script_opt/ZAM/Vars.cc index 722da4e158..3d1ef0c781 100644 --- a/src/script_opt/ZAM/Vars.cc +++ b/src/script_opt/ZAM/Vars.cc @@ -4,7 +4,6 @@ #include "zeek/Desc.h" #include "zeek/Reporter.h" -#include "zeek/script_opt/Reduce.h" #include "zeek/script_opt/ZAM/Compile.h" namespace zeek::detail { diff --git a/src/script_opt/ZAM/ZBody.cc b/src/script_opt/ZAM/ZBody.cc index 320bb7c3cf..689f269730 100644 --- a/src/script_opt/ZAM/ZBody.cc +++ b/src/script_opt/ZAM/ZBody.cc @@ -4,11 +4,9 @@ #include "zeek/Conn.h" #include "zeek/Desc.h" -#include "zeek/Dict.h" -#include "zeek/EventHandler.h" +#include "zeek/Event.h" #include "zeek/File.h" #include "zeek/Frame.h" -#include "zeek/IPAddr.h" #include "zeek/OpaqueVal.h" #include "zeek/Overflow.h" #include "zeek/RE.h" diff --git a/src/script_opt/ZAM/ZInst.h b/src/script_opt/ZAM/ZInst.h index cb9c14f584..8f6c43b839 100644 --- a/src/script_opt/ZAM/ZInst.h +++ b/src/script_opt/ZAM/ZInst.h @@ -4,7 +4,6 @@ #pragma once -#include "zeek/script_opt/ZAM/BuiltInSupport.h" #include "zeek/script_opt/ZAM/Support.h" #include "zeek/script_opt/ZAM/ZInstAux.h" #include "zeek/script_opt/ZAM/ZOp.h" diff --git a/src/script_opt/ZAM/ZInstAux.h b/src/script_opt/ZAM/ZInstAux.h index ac7da677f6..262261df4f 100644 --- a/src/script_opt/ZAM/ZInstAux.h +++ b/src/script_opt/ZAM/ZInstAux.h @@ -4,6 +4,7 @@ #pragma once +#include "zeek/Expr.h" #include "zeek/Func.h" #include "zeek/TraverseTypes.h" #include "zeek/script_opt/ZAM/BuiltInSupport.h"