From 8b992320cb9ecfe6d56c17519be463510daa3430 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 24 Apr 2025 12:00:54 -0700 Subject: [PATCH] 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"