diff --git a/src/input/Component.h b/src/input/Component.h
index c730fa152d..64e5c28e9e 100644
--- a/src/input/Component.h
+++ b/src/input/Component.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "zeek/Tag.h"
 #include "zeek/plugin/Component.h"
 
 namespace zeek::input {
diff --git a/src/input/Manager.cc b/src/input/Manager.cc
index 71788cb2ce..19e074eeab 100644
--- a/src/input/Manager.cc
+++ b/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"
diff --git a/src/input/ReaderBackend.cc b/src/input/ReaderBackend.cc
index 140e85c55d..664ffb10ab 100644
--- a/src/input/ReaderBackend.cc
+++ b/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"
 
diff --git a/src/input/ReaderBackend.h b/src/input/ReaderBackend.h
index afc5f7de5c..740b0db8ba 100644
--- a/src/input/ReaderBackend.h
+++ b/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;
diff --git a/src/input/readers/ascii/Ascii.cc b/src/input/readers/ascii/Ascii.cc
index 0601af5b4a..0468e166e7 100644
--- a/src/input/readers/ascii/Ascii.cc
+++ b/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;
diff --git a/src/input/readers/ascii/Ascii.h b/src/input/readers/ascii/Ascii.h
index 4e4726b94d..73aa3f84e8 100644
--- a/src/input/readers/ascii/Ascii.h
+++ b/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 {
 
diff --git a/src/input/readers/benchmark/Benchmark.cc b/src/input/readers/benchmark/Benchmark.cc
index 80b6182e1d..48010bb5b6 100644
--- a/src/input/readers/benchmark/Benchmark.cc
+++ b/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;
diff --git a/src/input/readers/config/Config.cc b/src/input/readers/config/Config.cc
index 405af70d8d..d234fe334d 100644
--- a/src/input/readers/config/Config.cc
+++ b/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;
diff --git a/src/input/readers/config/Config.h b/src/input/readers/config/Config.h
index 8d74e9dde1..3994743f32 100644
--- a/src/input/readers/config/Config.h
+++ b/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 {
 
diff --git a/src/input/readers/raw/Plugin.cc b/src/input/readers/raw/Plugin.cc
index 757e989836..f42f4a9ff2 100644
--- a/src/input/readers/raw/Plugin.cc
+++ b/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;
diff --git a/src/input/readers/raw/Plugin.h b/src/input/readers/raw/Plugin.h
index d15ecdbe33..c3ba069e06 100644
--- a/src/input/readers/raw/Plugin.h
+++ b/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 {
diff --git a/src/input/readers/raw/Raw.cc b/src/input/readers/raw/Raw.cc
index af8c434bbf..2660cc8912 100644
--- a/src/input/readers/raw/Raw.cc
+++ b/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"
diff --git a/src/input/readers/raw/Raw.h b/src/input/readers/raw/Raw.h
index 1fc1b52097..74e694d064 100644
--- a/src/input/readers/raw/Raw.h
+++ b/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"
 
diff --git a/src/input/readers/sqlite/SQLite.cc b/src/input/readers/sqlite/SQLite.cc
index 963aca3736..3d22189a66 100644
--- a/src/input/readers/sqlite/SQLite.cc
+++ b/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"
diff --git a/src/input/readers/sqlite/SQLite.h b/src/input/readers/sqlite/SQLite.h
index 83891cc502..6bd1a3c85a 100644
--- a/src/input/readers/sqlite/SQLite.h
+++ b/src/input/readers/sqlite/SQLite.h
@@ -2,10 +2,7 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
-#include <iostream>
-#include <vector>
+#include <string>
 
 #include "zeek/3rdparty/sqlite3.h"
 #include "zeek/input/ReaderBackend.h"
diff --git a/src/logging/Component.h b/src/logging/Component.h
index 67e859898c..a2078af019 100644
--- a/src/logging/Component.h
+++ b/src/logging/Component.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "zeek/Tag.h"
 #include "zeek/plugin/Component.h"
 
 namespace zeek::logging {
diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc
index c8c7098dd8..fbb9c2183a 100644
--- a/src/logging/Manager.cc
+++ b/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"
diff --git a/src/logging/writers/ascii/Ascii.cc b/src/logging/writers/ascii/Ascii.cc
index 2bb356f3ab..2f9fc861a4 100644
--- a/src/logging/writers/ascii/Ascii.cc
+++ b/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"
diff --git a/src/logging/writers/ascii/Ascii.h b/src/logging/writers/ascii/Ascii.h
index f5c962ca8e..6ae5ba0cb9 100644
--- a/src/logging/writers/ascii/Ascii.h
+++ b/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/formatters/JSON.h"
+#include "zeek/threading/Formatter.h"
 
 namespace zeek::plugin::detail::Zeek_AsciiWriter {
 class Plugin;
diff --git a/src/logging/writers/sqlite/SQLite.cc b/src/logging/writers/sqlite/SQLite.cc
index 5186c14a5c..67de679e6d 100644
--- a/src/logging/writers/sqlite/SQLite.cc
+++ b/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"
diff --git a/src/logging/writers/sqlite/SQLite.h b/src/logging/writers/sqlite/SQLite.h
index 5fd20bf45f..619a3f3d9a 100644
--- a/src/logging/writers/sqlite/SQLite.h
+++ b/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"
 
diff --git a/src/threading/BasicThread.cc b/src/threading/BasicThread.cc
index 4c606b5cb2..94f3232a51 100644
--- a/src/threading/BasicThread.cc
+++ b/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>
diff --git a/src/threading/BasicThread.h b/src/threading/BasicThread.h
index 9d94a2df89..8b11e1c2c0 100644
--- a/src/threading/BasicThread.h
+++ b/src/threading/BasicThread.h
@@ -7,7 +7,6 @@
 #include <unistd.h>
 #include <atomic>
 #include <cstdint>
-#include <iosfwd>
 #include <thread>
 
 namespace zeek::threading {
diff --git a/src/threading/Formatter.cc b/src/threading/Formatter.cc
index b5c90be3bf..2f6fed583e 100644
--- a/src/threading/Formatter.cc
+++ b/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"
diff --git a/src/threading/Manager.cc b/src/threading/Manager.cc
index e34cb92a6a..8fcf6605ac 100644
--- a/src/threading/Manager.cc
+++ b/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"
 
diff --git a/src/threading/MsgThread.cc b/src/threading/MsgThread.cc
index b5621de96e..81764bbda8 100644
--- a/src/threading/MsgThread.cc
+++ b/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.
diff --git a/src/threading/Queue.h b/src/threading/Queue.h
index b3f949f8eb..850c5f7bcd 100644
--- a/src/threading/Queue.h
+++ b/src/threading/Queue.h
@@ -5,7 +5,6 @@
 #include <sys/time.h>
 #include <condition_variable>
 #include <cstdint>
-#include <deque>
 #include <mutex>
 #include <queue>
 
diff --git a/src/threading/formatters/Ascii.cc b/src/threading/formatters/Ascii.cc
index 22ef1e8efb..8548547d36 100644
--- a/src/threading/formatters/Ascii.cc
+++ b/src/threading/formatters/Ascii.cc
@@ -2,8 +2,6 @@
 
 #include "zeek/threading/formatters/Ascii.h"
 
-#include "zeek/zeek-config.h"
-
 #include <cerrno>
 #include <sstream>
 
diff --git a/src/threading/formatters/JSON.cc b/src/threading/formatters/JSON.cc
index 08a2c2a703..6070fd1955 100644
--- a/src/threading/formatters/JSON.cc
+++ b/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"
diff --git a/src/threading/formatters/JSON.h b/src/threading/formatters/JSON.h
index 44dd78d198..68e2bb2918 100644
--- a/src/threading/formatters/JSON.h
+++ b/src/threading/formatters/JSON.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <memory>
+#include <string>
 
 #include "zeek/threading/Formatter.h"