Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove unnecessary #includes in base files in repo

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-05-06 16:48:49 -07:00
parent 224be5a951
commit 896e41c794
80 changed files with 33 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Attr.cc
View file

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

2
src/Base64.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Base64.h"
#include "zeek/zeek-config.h"
#include <cmath>
#include "zeek/Conn.h"

2
src/Base64.h
View file

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

4
src/CCL.cc
View file

@ -2,11 +2,9 @@
#include "zeek/CCL.h"
#include "zeek/zeek-config.h"
#include <algorithm>
#include "zeek/DFA.h"
#include "zeek/NFA.h" // for SYM_BOL and SYM_EOL
#include "zeek/RE.h"
namespace zeek::detail {

2
src/CompHash.cc
View file

@ -2,8 +2,6 @@
#include "zeek/CompHash.h"
#include "zeek/zeek-config.h"
#include <cstring>
#include <map>
#include <vector>

4
src/Conn.cc
View file

@ -2,13 +2,10 @@
#include "zeek/Conn.h"
#include "zeek/zeek-config.h"
#include <binpac.h>
#include <cctype>
#include "zeek/Desc.h"
#include "zeek/Event.h"
#include "zeek/NetVar.h"
#include "zeek/Reporter.h"
#include "zeek/RunState.h"
@ -17,7 +14,6 @@
#include "zeek/analyzer/Analyzer.h"
#include "zeek/analyzer/Manager.h"
#include "zeek/analyzer/protocol/pia/PIA.h"
#include "zeek/iosource/IOSource.h"
#include "zeek/packet_analysis/protocol/ip/SessionAdapter.h"
#include "zeek/packet_analysis/protocol/tcp/TCP.h"
#include "zeek/session/Manager.h"

2
src/Conn.h
View file

@ -4,8 +4,6 @@
#include <sys/types.h>
#include <string>
#include <tuple>
#include <type_traits>
#include "zeek/IPAddr.h"
#include "zeek/IntrusivePtr.h"

1
src/DNS_Mgr.cc
View file

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

2
src/DNS_Mgr.h
View file

@ -5,13 +5,11 @@
#include <netdb.h>
#include <list>
#include <map>
#include <queue>
#include <utility>
#include <variant>
#include "zeek/EventHandler.h"
#include "zeek/IPAddr.h"
#include "zeek/List.h"
#include "zeek/iosource/IOSource.h"
#include "zeek/util.h"

3
src/DbgBreakpoint.cc
View file

@ -4,8 +4,6 @@
#include "zeek/DbgBreakpoint.h"
#include "zeek/zeek-config.h"
#include <cassert>
#include "zeek/Debug.h"
@ -15,7 +13,6 @@
#include "zeek/ID.h"
#include "zeek/Reporter.h"
#include "zeek/Scope.h"
#include "zeek/Stmt.h"
#include "zeek/Timer.h"
#include "zeek/Val.h"
#include "zeek/module_util.h"

3
src/DbgBreakpoint.h
View file

@ -4,10 +4,9 @@
#pragma once
#include <cstdint>
#include <string>
#include "zeek/util.h"
namespace zeek::detail {
class Stmt;

2
src/DbgWatch.cc
View file

@ -4,8 +4,6 @@
#include "zeek/DbgWatch.h"
#include "zeek/zeek-config.h"
#include "zeek/Debug.h"
#include "zeek/Reporter.h"

2
src/DbgWatch.h
View file

@ -4,8 +4,6 @@
#pragma once
#include "zeek/util.h"
namespace zeek {
class Obj;
}

2
src/Debug.cc
View file

@ -4,8 +4,6 @@
#include "zeek/Debug.h"
#include "zeek/zeek-config.h"
#include <cctype>
#include <csignal>
#include <cstdarg>

6
src/Debug.h
View file

@ -4,6 +4,7 @@
#pragma once
#include <cstdint>
#include <deque>
#include <map>
#include <string>
@ -11,7 +12,10 @@
#include "zeek/Obj.h"
#include "zeek/StmtEnums.h"
#include "zeek/util.h"
#ifdef _MSC_VER
#include <unistd.h> // Needed to ignore __attribute__((format(printf))) on MSVC
#endif
namespace zeek {

3
src/DebugCmds.cc
View file

@ -5,8 +5,6 @@
#include "zeek/DebugCmds.h"
#include "zeek/zeek-config.h"
#include <regex.h>
#include <sys/types.h>
#include <cassert>
@ -22,7 +20,6 @@
#include "zeek/PolicyFile.h"
#include "zeek/Reporter.h"
#include "zeek/Scope.h"
#include "zeek/Stmt.h"
#include "zeek/Val.h"
#include "zeek/util.h"

6
src/DebugLogger.h
View file

@ -7,13 +7,13 @@
#ifdef DEBUG
#include "zeek/zeek-config.h"
#include <cstdio>
#include <set>
#include <string>
#include "zeek/util.h"
#ifdef _MSC_VER
#include <unistd.h> // Needed to ignore __attribute__((format(printf))) on MSVC
#endif
#define DBG_LOG(stream, ...) \
if ( ::zeek::detail::debug_logger.IsEnabled(stream) ) \

3
src/Desc.cc
View file

@ -2,14 +2,11 @@
#include "zeek/Desc.h"
#include "zeek/zeek-config.h"
#include <cerrno>
#include <cmath>
#include <cstdlib>
#include <cstring>
#include "zeek/3rdparty/ConvertUTF.h"
#include "zeek/File.h"
#include "zeek/IPAddr.h"
#include "zeek/Reporter.h"

3
src/Discard.cc
View file

@ -2,14 +2,11 @@
#include "zeek/Discard.h"
#include "zeek/zeek-config.h"
#include <algorithm>
#include "zeek/Func.h"
#include "zeek/IP.h"
#include "zeek/Reporter.h" // for InterpreterException
#include "zeek/RunState.h"
#include "zeek/Val.h"
#include "zeek/Var.h"
#include "zeek/ZeekString.h"

2
src/EquivClass.cc
View file

@ -2,8 +2,6 @@
#include "zeek/EquivClass.h"
#include "zeek/zeek-config.h"
#include "zeek/CCL.h"
#include "zeek/util.h"

2
src/EventRegistry.h
View file

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

3
src/Expr.cc
View file

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

5
src/File.cc
View file

@ -18,18 +18,15 @@
#include <sys/resource.h>
#include <sys/stat.h>
#include <unistd.h>
#include <algorithm>
#include <cerrno>
#include "zeek/Attr.h"
#include "zeek/Desc.h"
#include "zeek/Event.h"
#include "zeek/Expr.h"
#include "zeek/NetVar.h"
#include "zeek/Reporter.h"
#include "zeek/RunState.h"
#include "zeek/Type.h"
#include "zeek/Var.h"
#include "zeek/event.bif.netvar_h"
namespace zeek {

3
src/Frag.cc
View file

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

1
src/Frame.h
View file

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

1
src/Func.cc
View file

@ -16,6 +16,7 @@
#include <csignal>
#include <cstdlib>
// Most of these includes are needed for code included from bif files.
#include "zeek/Base64.h"
#include "zeek/Debug.h"
#include "zeek/Desc.h"

2
src/ID.cc
View file

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

1
src/IP.cc
View file

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

2
src/IntSet.cc
View file

@ -2,8 +2,6 @@
#include "zeek/IntSet.h"
#include "zeek/zeek-config.h"
#include <cstring>
namespace zeek::detail {

1
src/MMDB.cc
View file

@ -6,7 +6,6 @@
#include <netinet/ip.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <chrono>
#include "zeek/Func.h"
#include "zeek/IPAddr.h"

2
src/NFA.cc
View file

@ -2,8 +2,6 @@
#include "zeek/NFA.h"
#include "zeek/zeek-config.h"
#include <algorithm>
#include "zeek/Desc.h"

3
src/NetVar.cc
View file

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

2
src/NetVar.h
View file

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

2
src/Notifier.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Notifier.h"
#include <set>
#include "zeek/DebugLogger.h"
zeek::notifier::detail::Registry zeek::notifier::detail::registry;

2
src/Obj.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Obj.h"
#include "zeek/zeek-config.h"
#include <cstdlib>
#include "zeek/Desc.h"

2
src/Obj.h
View file

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

1
src/OpaqueVal.cc
View file

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

2
src/PolicyFile.cc
View file

@ -2,8 +2,6 @@
#include "zeek/PolicyFile.h"
#include "zeek/zeek-config.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <cassert>

4
src/PriorityQueue.cc
View file

@ -2,13 +2,9 @@
#include "zeek/PriorityQueue.h"
#include "zeek/zeek-config.h"
#include <cstdio>
#include <cstdlib>
#include "zeek/Reporter.h"
#include "zeek/util.h"
namespace zeek::detail {

2
src/PriorityQueue.h
View file

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

2
src/RE.cc
View file

@ -2,8 +2,6 @@
#include "zeek/RE.h"
#include "zeek/zeek-config.h"
#include <cstdlib>
#include <utility>

2
src/RandTest.h
View file

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

2
src/Reassem.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Reassem.h"
#include "zeek/zeek-config.h"
#include <algorithm>
#include <cinttypes>
#include <limits>

3
src/Reporter.cc
View file

@ -4,8 +4,6 @@
#include "zeek/Reporter.h"
#include "zeek/zeek-config.h"
#include <syslog.h>
#include <unistd.h>
@ -16,7 +14,6 @@
#include "zeek/Expr.h"
#include "zeek/Frame.h"
#include "zeek/ID.h"
#include "zeek/NetVar.h"
#include "zeek/RunState.h"
#include "zeek/Timer.h"
#include "zeek/file_analysis/File.h"

2
src/Rule.cc
View file

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

3
src/RuleAction.cc
View file

@ -2,8 +2,6 @@
#include "zeek/RuleAction.h"
#include "zeek/zeek-config.h"
#include <algorithm>
#include <string>
@ -12,7 +10,6 @@
#include "zeek/Event.h"
#include "zeek/Func.h"
#include "zeek/ID.h"
#include "zeek/NetVar.h"
#include "zeek/RuleMatcher.h"
#include "zeek/Type.h"
#include "zeek/analyzer/Manager.h"

2
src/RuleCondition.cc
View file

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

2
src/RuleCondition.h
View file

@ -5,8 +5,6 @@
#include <sys/types.h> // for u_char
#include <cstdint> // for u_char
#include "zeek/util.h"
namespace zeek::detail {
class RuleEndpointState;

1
src/RuleMatcher.h
View file

@ -3,7 +3,6 @@
#pragma once
#include <sys/types.h> // for u_char
#include <climits>
#include <functional>
#include <map>
#include <set>

2
src/RunState.h
View file

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

1
src/ScannedFile.cc
View file

@ -3,7 +3,6 @@
#include "zeek/ScannedFile.h"
#include <cerrno>
#include <climits> // for PATH_MAX
#include "zeek/DebugLogger.h"
#include "zeek/Reporter.h"

3
src/ScannedFile.h
View file

@ -2,12 +2,13 @@
#pragma once
#include <zeek/Obj.h>
#include <list>
#include <optional>
#include <string>
#include <vector>
#include "zeek/Obj.h"
namespace zeek::detail {
// Script file we have already scanned (or are in the process of scanning).

4
src/Scope.cc
View file

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

1
src/ScriptCoverageManager.h
View file

@ -9,7 +9,6 @@
#include "zeek/ID.h"
#include "zeek/StmtBase.h"
#include "zeek/util.h"
namespace zeek::detail {

2
src/ScriptProfile.cc
View file

@ -2,6 +2,8 @@
#include "zeek/ScriptProfile.h"
#include <cinttypes>
namespace zeek {
namespace detail {

1
src/ScriptProfile.h
View file

@ -7,7 +7,6 @@
#include <string>
#include "zeek/Func.h"
#include "zeek/Stmt.h"
namespace zeek {

2
src/ScriptValidation.cc
View file

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

2
src/SerializationFormat.h
View file

@ -4,8 +4,6 @@
#pragma once
#include "zeek/zeek-config.h"
#include <cstdint>
#include <string>

2
src/SmithWaterman.cc
View file

@ -2,8 +2,6 @@
#include "zeek/SmithWaterman.h"
#include "zeek/zeek-config.h"
#include <algorithm>
#include <cctype>

1
src/SmithWaterman.h
View file

@ -3,6 +3,7 @@
#pragma once
#include <map>
#include <string>
#include <vector>
#include "zeek/ZeekString.h"

2
src/Stats.h
View file

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

3
src/Stmt.cc
View file

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

3
src/Tag.h
View file

@ -2,13 +2,10 @@
#pragma once
#include "zeek/zeek-config.h"
#include <cstdint>
#include <string>
#include "zeek/IntrusivePtr.h"
#include "zeek/util.h"
namespace zeek {

2
src/Timer.cc
View file

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

2
src/TraverseTypes.h
View file

@ -2,8 +2,6 @@
#pragma once
#include "zeek/zeek-config.h"
namespace zeek::detail {
class TraversalCallback;

1
src/TunnelEncapsulation.h
View file

@ -4,7 +4,6 @@
#include <vector>
#include "zeek/ID.h"
#include "zeek/IP.h"
#include "zeek/IPAddr.h"
#include "zeek/NetVar.h"

3
src/Type.cc
View file

@ -2,10 +2,7 @@
#include "zeek/Type.h"
#include "zeek/zeek-config.h"
#include <cinttypes>
#include <list>
#include <map>
#include <string>
#include <unordered_set>

2
src/UID.cc
View file

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

3
src/Var.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Var.h"
#include "zeek/zeek-config.h"
#include <memory>
#include "zeek/Desc.h"
@ -18,7 +16,6 @@
#include "zeek/Stmt.h"
#include "zeek/Traverse.h"
#include "zeek/Val.h"
#include "zeek/module_util.h"
#include "zeek/script_opt/IDOptInfo.h"
#include "zeek/script_opt/ScriptOpt.h"
#include "zeek/script_opt/StmtOptInfo.h"

1
src/WeirdState.cc
View file

@ -3,7 +3,6 @@
#include "zeek/WeirdState.h"
#include "zeek/RunState.h"
#include "zeek/util.h"
namespace zeek::detail {

1
src/ZVal.cc
View file

@ -4,7 +4,6 @@
#include "zeek/Func.h"
#include "zeek/OpaqueVal.h"
#include "zeek/Reporter.h"
#include "zeek/ZeekString.h"
using namespace zeek;

4
src/ZVal.h
View file

@ -4,7 +4,7 @@
#pragma once
#include "zeek/zeek-config.h"
#include "zeek/IntrusivePtr.h"
namespace zeek {
@ -19,6 +19,7 @@ class RecordVal;
class StringVal;
class SubNetVal;
class TableVal;
class Type;
class TypeVal;
class Val;
class VectorVal;
@ -32,6 +33,7 @@ using RecordValPtr = IntrusivePtr<RecordVal>;
using StringValPtr = IntrusivePtr<StringVal>;
using SubNetValPtr = IntrusivePtr<SubNetVal>;
using TableValPtr = IntrusivePtr<TableVal>;
using TypePtr = IntrusivePtr<Type>;
using TypeValPtr = IntrusivePtr<TypeVal>;
using ValPtr = IntrusivePtr<Val>;
using VectorValPtr = IntrusivePtr<VectorVal>;

2
src/ZeekString.cc
View file

@ -2,8 +2,6 @@
#include "zeek/ZeekString.h"
#include "zeek/zeek-config.h"
#include <algorithm>
#include <cctype>
#include <iostream>

4
src/ZeekString.h
View file

@ -2,11 +2,9 @@
#pragma once
#include "zeek/zeek-config.h"
#include <sys/types.h>
#include <iosfwd>
#include <string>
#include <string_view>
#include <vector>
namespace zeek {

3
src/binpac_zeek.h
View file

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

4
src/main.cc
View file

@ -1,7 +1,5 @@
// See the file "COPYING" in the main distribution directory for copyright.
#include "zeek/zeek-config.h"
#include <unistd.h>
#include <cinttypes>
@ -11,6 +9,8 @@
#include "zeek/supervisor/Supervisor.h"
#include "zeek/zeek-setup.h"
#include "const.bif.netvar_h"
#ifdef _MSC_VER
#include <fcntl.h> // For _O_BINARY.

1
src/module_util.cc
View file

@ -4,7 +4,6 @@
#include "zeek/module_util.h"
#include <cstring>
#include <iostream>
#include <string>
#include "zeek/3rdparty/doctest.h"

2
src/net_util.cc
View file

@ -2,8 +2,6 @@
#include "zeek/net_util.h"
#include "zeek/zeek-config.h"
#include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/socket.h>

7
src/util.cc
View file

@ -41,24 +41,25 @@
#include <algorithm>
#include <array>
#include <iostream>
#include <random>
#include <string>
#include <vector>
#include "zeek/3rdparty/ConvertUTF.h"
#include "zeek/Desc.h"
#include "zeek/Hash.h"
#include "zeek/NetVar.h"
#include "zeek/Obj.h"
#include "zeek/Reporter.h"
#include "zeek/RunState.h"
#include "zeek/ScannedFile.h"
#include "zeek/Val.h"
#include "zeek/digest.h"
#include "zeek/input.h"
#include "zeek/iosource/Manager.h"
#include "zeek/iosource/PktSrc.h"
#ifdef _MSC_VER
#include "zeek/ScannedFile.h"
#endif
#include "zeek/3rdparty/doctest.h"
using namespace std;

3
src/zeek-setup.cc
View file

@ -23,6 +23,8 @@
#include "zeek/3rdparty/sqlite3.h"
#endif
#include <binpac.h>
#include "zeek/DNS_Mgr.h"
#include "zeek/Debug.h"
#include "zeek/Desc.h"
@ -49,7 +51,6 @@
#include "zeek/Trigger.h"
#include "zeek/Var.h"
#include "zeek/analyzer/Manager.h"
#include "zeek/binpac_zeek.h"
#include "zeek/broker/Manager.h"
#include "zeek/cluster/Backend.h"
#include "zeek/cluster/Manager.h"