SNodeC · VolkerChristian · Sep 1, 2026 · Sep 1, 2026
diff --git a/src/apps/echo/model/EchoSocketContext.cpp b/src/apps/echo/model/EchoSocketContext.cpp
@@ -41,6 +41,9 @@
 
 #include "EchoSocketContext.h"
 
+#include "core/socket/stream/SocketContext.h"
+#include "log/SemanticLogger.h"
+
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
 #include <string>

diff --git a/src/apps/tlslegacy/TlsLegacySocketContext.cpp b/src/apps/tlslegacy/TlsLegacySocketContext.cpp
@@ -8,6 +8,7 @@
 
 #include "Log.h"
 #include "core/socket/stream/SocketConnection.h"
+#include "log/SemanticLogger.h"
 
 #include <functional>
 

diff --git a/src/core/DescriptorEventReceiver.h b/src/core/DescriptorEventReceiver.h
@@ -45,7 +45,6 @@
 #include "core/EventReceiver.h" // IWYU pragma: export
 #include "core/Shutdown.h"      // IWYU pragma: export
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
 
 namespace core {
     class DescriptorEventPublisher;

diff --git a/src/core/EventLoop.h b/src/core/EventLoop.h
@@ -45,7 +45,6 @@
 #include "core/State.h" // IWYU pragma: export
 #include "core/TickStatus.h"
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
 
 namespace core {
     class EventMultiplexer;
@@ -57,6 +56,8 @@ namespace utils {
     class Timeval;
 }
 
+#include <optional>
+
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 namespace core {

diff --git a/src/core/TimerEventReceiver.cpp b/src/core/TimerEventReceiver.cpp
@@ -50,6 +50,7 @@
 
 #include "log/Logger.h"
 
+#include <optional>
 #include <utility>
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */

diff --git a/src/core/multiplexer/epoll/DescriptorEventPublisher.cpp b/src/core/multiplexer/epoll/DescriptorEventPublisher.cpp
@@ -50,6 +50,7 @@
 #include "utils/PreserveErrno.h"
 
 #include <cerrno>
+#include <optional>
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 

diff --git a/src/core/multiplexer/epoll/EventMultiplexer.cpp b/src/core/multiplexer/epoll/EventMultiplexer.cpp
@@ -51,6 +51,7 @@
 
 #include <array>
 #include <cerrno>
+#include <optional>
 #include <string>
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */

diff --git a/src/core/multiplexer/poll/EventMultiplexer.cpp b/src/core/multiplexer/poll/EventMultiplexer.cpp
@@ -56,6 +56,7 @@
 #include <cstdint>
 #include <ctime>
 #include <fcntl.h>
+#include <optional>
 #include <string>
 #include <utility>
 

diff --git a/src/core/multiplexer/select/EventMultiplexer.cpp b/src/core/multiplexer/select/EventMultiplexer.cpp
@@ -50,6 +50,7 @@
 
 #include <array>
 #include <ctime>
+#include <optional>
 #include <string>
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */

diff --git a/src/core/pipe/Pipe.cpp b/src/core/pipe/Pipe.cpp
@@ -48,7 +48,6 @@
 
 #include "core/system/unistd.h"
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
 #include "utils/Timeval.h"
 
 #include <atomic>

diff --git a/src/core/socket/stream/ClientFlowController.h b/src/core/socket/stream/ClientFlowController.h
@@ -58,6 +58,7 @@ namespace core {
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <set>

diff --git a/src/core/socket/stream/SocketAcceptor.h b/src/core/socket/stream/SocketAcceptor.h
@@ -46,7 +46,8 @@
 #include "core/socket/State.h"
 #include "log/LogScopeOwner.h"
 #include "log/Logger.h"
-#include "log/SemanticLogger.h"
+
+// IWYU pragma: no_include "log/SemanticLogger.h"
 
 namespace core::socket::stream {
     class SocketContextFactory;

diff --git a/src/core/socket/stream/SocketClient.h b/src/core/socket/stream/SocketClient.h
@@ -49,7 +49,8 @@
 #include "core/socket/stream/ClientFlowController.h" // IWYU pragma: export
 #include "core/timer/Timer.h"
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
+
+// IWYU pragma: no_include "log/SemanticLogger.h"
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 

diff --git a/src/core/socket/stream/SocketConnection.h b/src/core/socket/stream/SocketConnection.h
@@ -44,7 +44,6 @@
 
 #include "core/socket/stream/QueueResult.h"
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
 
 namespace core {
     struct ShutdownContext;

diff --git a/src/core/socket/stream/SocketConnector.h b/src/core/socket/stream/SocketConnector.h
@@ -46,7 +46,8 @@
 #include "core/socket/State.h"
 #include "log/LogScopeOwner.h"
 #include "log/Logger.h"
-#include "log/SemanticLogger.h"
+
+// IWYU pragma: no_include "log/SemanticLogger.h"
 
 namespace core::socket::stream {
     class SocketContextFactory;

diff --git a/src/core/socket/stream/SocketContext.h b/src/core/socket/stream/SocketContext.h
@@ -45,7 +45,6 @@
 #include "core/socket/SocketContext.h"
 #include "core/socket/stream/QueueResult.h"
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
 
 namespace core::pipe {
     class Source;

diff --git a/src/core/socket/stream/SocketServer.h b/src/core/socket/stream/SocketServer.h
@@ -49,7 +49,8 @@
 #include "core/socket/stream/ServerFlowController.h" // IWYU pragma: export
 #include "core/timer/Timer.h"
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
+
+// IWYU pragma: no_include "log/SemanticLogger.h"
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 

diff --git a/src/core/socket/stream/tls/TLSHandshake.cpp b/src/core/socket/stream/tls/TLSHandshake.cpp
@@ -43,7 +43,6 @@
 
 #include "core/socket/stream/tls/detail/TLSResult.h"
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
 
 #if defined(SNODEC_BUILD_TESTS)
 #include "core/socket/stream/tls/detail/TLSLifecycleTestAccess.h"

diff --git a/src/core/socket/stream/tls/TLSHandshake.h b/src/core/socket/stream/tls/TLSHandshake.h
@@ -74,9 +74,6 @@ namespace core::socket::stream::tls {
         struct TlsHandshakeResult;
     }
 
-    template <typename PhysicalSocketT, typename ConfigT>
-    class SocketConnection;
-
     class TLSHandshake
         : public core::eventreceiver::ReadEventReceiver
         , public core::eventreceiver::WriteEventReceiver {

diff --git a/src/core/socket/stream/tls/TLSShutdown.cpp b/src/core/socket/stream/tls/TLSShutdown.cpp
@@ -43,7 +43,6 @@
 
 #include "core/socket/stream/tls/detail/TLSResult.h"
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
 
 #if defined(SNODEC_BUILD_TESTS)
 #include "core/socket/stream/tls/detail/TLSLifecycleTestAccess.h"

diff --git a/src/core/socket/stream/tls/TLSShutdown.h b/src/core/socket/stream/tls/TLSShutdown.h
@@ -75,9 +75,6 @@ namespace core::socket::stream::tls {
         struct TlsShutdownResult;
     }
 
-    template <typename PhysicalSocketT, typename ConfigT>
-    class SocketConnection;
-
     class TLSShutdown
         : public core::eventreceiver::ReadEventReceiver
         , public core::eventreceiver::WriteEventReceiver {

diff --git a/src/core/socket/stream/tls/detail/TLSLifecycleTestAccess.h b/src/core/socket/stream/tls/detail/TLSLifecycleTestAccess.h
@@ -3,12 +3,13 @@
 
 #include "core/socket/stream/tls/TLSHandshake.h"
 #include "core/socket/stream/tls/SocketConnection.h"
-#include "core/socket/stream/tls/SocketReader.h"
-#include "core/socket/stream/tls/SocketWriter.h"
 #include "core/socket/stream/tls/TLSShutdown.h"
 #include "core/socket/stream/tls/detail/TLSResult.h"
 #include "log/LogScopeOwner.h"
 
+// IWYU pragma: no_include "core/socket/stream/tls/SocketReader.h"
+// IWYU pragma: no_include "core/socket/stream/tls/SocketWriter.h"
+
 #include <cerrno>
 #include <deque>
 #include <functional>

diff --git a/src/core/socket/stream/tls/ssl_utils.cpp b/src/core/socket/stream/tls/ssl_utils.cpp
@@ -45,7 +45,6 @@
 
 #include "log/LogScopeOwner.h"
 #include "log/Logger.h"
-#include "log/SemanticLogger.h"
 #include "utils/PreserveErrno.h"
 
 #include <cerrno>

diff --git a/src/database/mariadb/MariaDBConnection.h b/src/database/mariadb/MariaDBConnection.h
@@ -48,7 +48,6 @@
 #include "core/eventreceiver/WriteEventReceiver.h"
 #include "database/mariadb/MariaDBCommandSequence.h" // IWYU pragma: export
 #include "log/LogScopeOwner.h"
-#include "log/SemanticLogger.h"
 
 namespace database::mariadb {
     class MariaDBCommand;

diff --git a/src/database/mariadb/MariaDBLibrary.cpp b/src/database/mariadb/MariaDBLibrary.cpp
@@ -48,6 +48,7 @@
 #include <cstdlib>
 #include <mutex>
 #include <mysql.h>
+#include <string>
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 

diff --git a/src/express/middleware/VerboseRequest.cpp b/src/express/middleware/VerboseRequest.cpp
@@ -49,6 +49,7 @@
 
 #include "web/http/http_utils.h"
 
+#include <optional>
 #include <string>
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS

diff --git a/src/iot/mqtt/SubProtocol.hpp b/src/iot/mqtt/SubProtocol.hpp
@@ -43,10 +43,11 @@
 #include "iot/mqtt/SemanticLog.h"
 #include "iot/mqtt/SubProtocol.h"
 #include "log/Logger.h"
-#include "log/SemanticLogger.h"
 #include "utils/system/signal.h"
 #include "web/websocket/SubProtocolContext.h"
 
+// IWYU pragma: no_include "log/SemanticLogger.h"
+
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
 #include "utils/hexdump.h"

diff --git a/src/iot/mqtt/client/Mqtt.cpp b/src/iot/mqtt/client/Mqtt.cpp
@@ -63,7 +63,6 @@
 
 #include "log/LogScopeOwner.h"
 #include "log/Logger.h"
-#include "log/SemanticLogger.h"
 
 #include <cerrno>
 #include <cstdio>

diff --git a/src/iot/mqtt/server/Mqtt.cpp b/src/iot/mqtt/server/Mqtt.cpp
@@ -64,7 +64,6 @@
 
 #include "log/LogScopeOwner.h"
 #include "log/Logger.h"
-#include "log/SemanticLogger.h"
 
 #include <cstdint>
 #include <iomanip>

diff --git a/src/iot/mqtt/server/broker/Broker.cpp b/src/iot/mqtt/server/broker/Broker.cpp
@@ -45,8 +45,6 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-#include "log/Logger.h"
-
 #include <algorithm>
 #include <cerrno>
 #include <cstdio>

diff --git a/src/iot/mqtt/server/broker/RetainTree.cpp b/src/iot/mqtt/server/broker/RetainTree.cpp
@@ -47,8 +47,6 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-#include "log/Logger.h"
-
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <utility>

diff --git a/src/iot/mqtt/server/broker/Session.cpp b/src/iot/mqtt/server/broker/Session.cpp
@@ -46,8 +46,6 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-#include "log/Logger.h"
-
 #include <algorithm>
 #include <iterator>
 #include <map>

diff --git a/src/iot/mqtt/server/broker/SubscriptionTree.cpp b/src/iot/mqtt/server/broker/SubscriptionTree.cpp
@@ -47,8 +47,6 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-#include "log/Logger.h"
-
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <string>

diff --git a/src/net/un/phy/PhysicalSocket.hpp b/src/net/un/phy/PhysicalSocket.hpp
@@ -43,10 +43,11 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-#include "core/system/socket.h"
 #include "core/system/unistd.h"
 #include "log/Logger.h"
 
+// IWYU pragma: no_include "core/system/socket.h"
+
 #include <array>
 #include <cerrno>
 #include <cstring>

diff --git a/src/tools/snodec-control/src/Cli.cpp b/src/tools/snodec-control/src/Cli.cpp
@@ -45,10 +45,10 @@
 #include "CommandBuilder.h"
 #include "ConfigActions.h"
 #include "ConfigEditor.h"
-#include "ConfigModel.h"
 #include "ConfigParser.h"
 #include "JsonWriter.h"
 #include "Materializer.h"
+#include "Metadata.h"
 #include "ProcessRunner.h"
 #include "ui/Ui.h"
 
@@ -63,6 +63,8 @@
 
 namespace snodec::control {
 
+    struct ConfigOption;
+
     namespace {
 
         struct Options {

diff --git a/src/tools/snodec-control/src/ConfigActions.cpp b/src/tools/snodec-control/src/ConfigActions.cpp
@@ -42,18 +42,22 @@
 #include "ConfigActions.h"
 
 #include "CommandBuilder.h"
+#include "ConfigEditor.h"
+#include "ConfigModel.h"
 #include "Materializer.h"
 #include "ProcessRunner.h"
 
+#include <sys/types.h>
+#include <unistd.h>
+
 #include <cerrno>
-#include <cstddef>
+#include <chrono>
 #include <cstdlib>
 #include <cstring>
 #include <filesystem>
 #include <fstream>
 #include <sstream>
 #include <system_error>
-#include <unistd.h>
 
 namespace snodec::control {
 

diff --git a/src/tools/snodec-control/src/ConfigActions.h b/src/tools/snodec-control/src/ConfigActions.h
@@ -42,8 +42,6 @@
 #ifndef SNODECCONTROL_CONFIGACTIONS_H
 #define SNODECCONTROL_CONFIGACTIONS_H
 
-#include "ConfigEditor.h"
-#include "ConfigModel.h"
 #include "ConfigParser.h"
 #include "Metadata.h"
 
@@ -53,6 +51,10 @@
 
 namespace snodec::control {
 
+    class ConfigModel;
+    struct ChangeRecord;
+    struct ConfigOption;
+
     // The shared, presentation-agnostic "business logic" behind every snodec-control action: running
     // discovery, formatting inspection output, and saving/resolving a run configuration through the
     // target. Both the plain CLI (Cli.cpp) and the interactive UI (ui/CursesUi.cpp) call these same

diff --git a/src/tools/snodec-control/src/ConfigEditor.cpp b/src/tools/snodec-control/src/ConfigEditor.cpp
@@ -42,6 +42,7 @@
 #include "ConfigEditor.h"
 
 #include <cstddef>
+#include <optional>
 #include <unordered_map>
 #include <utility>
 

diff --git a/src/tools/snodec-control/src/ConfigModel.cpp b/src/tools/snodec-control/src/ConfigModel.cpp
@@ -41,6 +41,8 @@
 
 #include "ConfigModel.h"
 
+#include "Metadata.h"
+
 #include <algorithm>
 #include <unordered_map>
 #include <unordered_set>