Remove unnecessary #includes in analyzer/packet analyzer/file analyzer headers

2025-10-17 05:58:20 +00:00 · 2025-04-08 14:57:34 -07:00 · 2025-04-08 14:57:34 -07:00 · 456c1fa42c
commit 456c1fa42c
parent 896e41c794
72 changed files with 41 additions and 91 deletions
--- a/src/packet_analysis/Component.h
+++ b/src/packet_analysis/Component.h
@ -2,8 +2,6 @@

 #pragma once

-#include "zeek/zeek-config.h"
-
 #include <functional>

 #include "zeek/Tag.h"
--- a/src/packet_analysis/Dispatcher.h
+++ b/src/packet_analysis/Dispatcher.h
@ -3,7 +3,6 @@
 #pragma once

 #include <cstdint>
-#include <map>
 #include <memory>
 #include <vector>

--- 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"
--- 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 {

--- 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 {

--- a/src/packet_analysis/protocol/geneve/Geneve.h
+++ b/src/packet_analysis/protocol/geneve/Geneve.h
@ -2,11 +2,12 @@

 #pragma once

+#include <cstdint>
 #include <functional>

 #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 {

--- 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 {

--- 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"

--- 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 {

--- 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 {

--- 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"
--- a/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h
+++ b/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h
@ -5,7 +5,6 @@
 #include <map>
 #include <set>

-#include "zeek/ID.h"
 #include "zeek/Tag.h"
 #include "zeek/packet_analysis/Analyzer.h"

--- 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 <cstdint>
+
+#include "zeek/iosource/Packet.h"
 #include "zeek/packet_analysis/Analyzer.h"
-#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::LinuxSLL2 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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"
--- 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"

--- a/src/packet_analysis/protocol/teredo/Teredo.h
+++ b/src/packet_analysis/protocol/teredo/Teredo.h
@ -5,7 +5,6 @@
 #include <map>

 #include "zeek/Conn.h"
-#include "zeek/NetVar.h"
 #include "zeek/RE.h"
 #include "zeek/Reporter.h"
 #include "zeek/packet_analysis/Analyzer.h"
--- 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 {

--- 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 {