Remove unnecessary #includes in input/logging/threading

src/input/Component.h

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "zeek/Tag.h"
 #include "zeek/plugin/Component.h"
 
 namespace zeek::input {

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"

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"
 

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;

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;

src/input/readers/ascii/Ascii.h

@@ -4,13 +4,13 @@
 
 #include <sys/types.h>
 #include <fstream>
-#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
 #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 {
 

src/input/readers/benchmark/Benchmark.cc

@@ -8,7 +8,6 @@
 #include <cerrno>
 
 #include "zeek/input/readers/benchmark/benchmark.bif.h"
-#include "zeek/threading/Manager.h"
 #include "zeek/threading/SerialTypes.h"
 
 using zeek::threading::Field;

src/input/readers/config/Config.cc

@@ -7,13 +7,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <cerrno>
-#include <sstream>
 #include <unordered_set>
 
 #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;

src/input/readers/config/Config.h

@@ -4,14 +4,11 @@
 
 #include <sys/types.h>
 #include <fstream>
-#include <iostream>
-#include <memory>
 #include <unordered_map>
-#include <vector>
 
 #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 {
 

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;

src/input/readers/raw/Plugin.h

@@ -4,7 +4,6 @@
 
 #include <mutex>
 
-#include "zeek/input/readers/raw/Raw.h"
 #include "zeek/plugin/Plugin.h"
 
 namespace zeek::plugin::detail::Zeek_RawReader {

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"

src/input/readers/raw/Raw.h

@@ -5,7 +5,6 @@
 #include <sys/types.h>
 #include <memory>
 #include <mutex>
-#include <vector>
 
 #include "zeek/input/ReaderBackend.h"
 

src/input/readers/sqlite/SQLite.cc

@@ -2,13 +2,9 @@
 
 #include "zeek/input/readers/sqlite/SQLite.h"
 
-#include "zeek/zeek-config.h"
-
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <fstream>
-#include <sstream>
 
 #include "zeek/input/readers/sqlite/sqlite.bif.h"
 #include "zeek/logging/writers/ascii/ascii.bif.h"

src/input/readers/sqlite/SQLite.h

@@ -2,10 +2,7 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
+#include <string>
-
-#include <iostream>
-#include <vector>
 
 #include "zeek/3rdparty/sqlite3.h"
 #include "zeek/input/ReaderBackend.h"

src/logging/Component.h

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "zeek/Tag.h"
 #include "zeek/plugin/Component.h"
 
 namespace zeek::logging {

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"

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"

src/logging/writers/ascii/Ascii.h

@@ -5,11 +5,11 @@
 #pragma once
 
 #include <zlib.h>
+#include <string>
 
 #include "zeek/Desc.h"
 #include "zeek/logging/WriterBackend.h"
-#include "zeek/threading/formatters/Ascii.h"
+#include "zeek/threading/Formatter.h"
-#include "zeek/threading/formatters/JSON.h"
 
 namespace zeek::plugin::detail::Zeek_AsciiWriter {
 class Plugin;

src/logging/writers/sqlite/SQLite.cc

@@ -2,12 +2,10 @@
 
 #include "zeek/logging/writers/sqlite/SQLite.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cerrno>
 #include <string>
-#include <vector>
 
+#include "zeek/Desc.h"
 #include "zeek/logging/writers/sqlite/sqlite.bif.h"
 #include "zeek/threading/SerialTypes.h"
 #include "zeek/util.h"

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"
 

src/threading/BasicThread.cc

@@ -2,8 +2,6 @@
 
 #include "zeek/threading/BasicThread.h"
 
-#include "zeek/zeek-config.h"
-
 #include <pthread.h>
 #include <cinttypes>
 #include <csignal>

src/threading/BasicThread.h

@@ -7,7 +7,6 @@
 #include <unistd.h>
 #include <atomic>
 #include <cstdint>
-#include <iosfwd>
 #include <thread>
 
 namespace zeek::threading {

src/threading/Formatter.cc

@@ -2,8 +2,6 @@
 
 #include "zeek/threading/Formatter.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cerrno>
 
 #include "zeek/3rdparty/zeek_inet_ntop.h"

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"
 

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.

src/threading/Queue.h

@@ -5,7 +5,6 @@
 #include <sys/time.h>
 #include <condition_variable>
 #include <cstdint>
-#include <deque>
 #include <mutex>
 #include <queue>
 

src/threading/formatters/Ascii.cc

@@ -2,8 +2,6 @@
 
 #include "zeek/threading/formatters/Ascii.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cerrno>
 #include <sstream>
 

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 <cerrno>
 #include <cmath>
 #include <cstdint>
-#include <sstream>
 
 #include "zeek/Desc.h"
 #include "zeek/threading/MsgThread.h"

src/threading/formatters/JSON.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <memory>
+#include <string>
 
 #include "zeek/threading/Formatter.h"