Remove unnecessary #includes in cluster/broker/iosource/probabilistic/session

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 {

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"

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"

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"

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 <unistd.h>

src/iosource/Manager.cc

@@ -12,7 +12,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "zeek/NetVar.h"
 #include "zeek/RunState.h"
 #include "zeek/iosource/Component.h"
 #include "zeek/iosource/IOSource.h"

src/iosource/Manager.h

@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <map>
 #include <string>
 #include <vector>

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 {
 

src/iosource/Packet.h

@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <sys/types.h> // for u_char
 #include <cstdint>
 #include <string>

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 {

src/iosource/PktDumper.h

@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <string>
 
 namespace zeek {

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

src/probabilistic/BloomFilter.h

@@ -2,11 +2,8 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <memory>
 #include <string>
-#include <vector>
 
 #include "zeek/probabilistic/BitVector.h"
 #include "zeek/probabilistic/Hasher.h"

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 {
 

src/probabilistic/CounterVector.h

@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <cstddef>
 #include <cstdint>
 #include <memory>

src/probabilistic/Hasher.cc

@@ -6,7 +6,6 @@
 #include <openssl/evp.h>
 #include <typeinfo>
 
-#include "zeek/NetVar.h"
 #include "zeek/Var.h"
 #include "zeek/broker/Data.h"
 #include "zeek/digest.h"

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"

src/session/Manager.h

@@ -4,11 +4,8 @@
 
 #include <sys/types.h> // for u_char
 #include <unordered_map>
-#include <utility>
 
 #include "zeek/Frag.h"
-#include "zeek/Hash.h"
-#include "zeek/NetVar.h"
 #include "zeek/session/Session.h"
 
 namespace zeek {

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"

src/session/Session.h

@@ -3,7 +3,6 @@
 #pragma once
 
 #include <map>
-#include <memory>
 
 #include "zeek/EventHandler.h"
 #include "zeek/Hash.h"