From f8b299ff6732edcb97332a741284baf47b635d81 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Thu, 6 Nov 2025 17:19:40 -0500
Subject: [PATCH] chore: IStream remove unused includes

---
 src/lib/client/HelloBack.h                     | 1 +
 src/lib/io/IStream.h                           | 4 +---
 src/lib/net/IDataSocket.h                      | 2 ++
 src/lib/net/SecureSocket.cpp                   | 1 +
 src/lib/net/SecureSocket.h                     | 1 +
 src/lib/net/TCPSocket.h                        | 1 +
 src/unittests/legacytests/mock/io/MockStream.h | 9 +++++----
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/lib/client/HelloBack.h b/src/lib/client/HelloBack.h
index 21e1e59b7..5897e14dd 100644
--- a/src/lib/client/HelloBack.h
+++ b/src/lib/client/HelloBack.h
@@ -11,6 +11,7 @@
 
 #include <functional>
 #include <memory>
+#include <string> //IWYU
 
 namespace deskflow::client {
 
diff --git a/src/lib/io/IStream.h b/src/lib/io/IStream.h
index 50f1defd5..46bb9b41a 100644
--- a/src/lib/io/IStream.h
+++ b/src/lib/io/IStream.h
@@ -8,9 +8,7 @@
 
 #pragma once
 
-#include "base/Event.h"
-#include "base/EventTypes.h"
-#include "base/IEventQueue.h"
+#include <cstdint>
 
 class IEventQueue;
 
diff --git a/src/lib/net/IDataSocket.h b/src/lib/net/IDataSocket.h
index f67cc4912..f5741915d 100644
--- a/src/lib/net/IDataSocket.h
+++ b/src/lib/net/IDataSocket.h
@@ -10,6 +10,8 @@
 #include "io/IStream.h"
 #include "net/ISocket.h"
 
+#include <string>
+
 //! Data stream socket interface
 /*!
 This interface defines the methods common to all network sockets that
diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index 844a9416e..53288a968 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -9,6 +9,7 @@
 #include "SecureUtils.h"
 
 #include "arch/ArchException.h"
+#include "base/IEventQueue.h"
 #include "base/Log.h"
 #include "base/Path.h"
 #include "common/Settings.h"
diff --git a/src/lib/net/SecureSocket.h b/src/lib/net/SecureSocket.h
index 877be3da3..6019f1364 100644
--- a/src/lib/net/SecureSocket.h
+++ b/src/lib/net/SecureSocket.h
@@ -13,6 +13,7 @@
 #include <memory>
 #include <mutex>
 
+class Event;
 class IEventQueue;
 class SocketMultiplexer;
 class ISocketMultiplexerJob;
diff --git a/src/lib/net/TCPSocket.h b/src/lib/net/TCPSocket.h
index f007f04f6..b2c8eeac0 100644
--- a/src/lib/net/TCPSocket.h
+++ b/src/lib/net/TCPSocket.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "arch/IArchNetwork.h"
+#include "base/Event.h"
 #include "io/StreamBuffer.h"
 #include "mt/CondVar.h"
 #include "mt/Mutex.h"
diff --git a/src/unittests/legacytests/mock/io/MockStream.h b/src/unittests/legacytests/mock/io/MockStream.h
index 68f05ab46..c0fde6433 100644
--- a/src/unittests/legacytests/mock/io/MockStream.h
+++ b/src/unittests/legacytests/mock/io/MockStream.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "base/EventTypes.h"
 #include "io/IStream.h"
 
 #include <gmock/gmock.h>
@@ -27,10 +28,10 @@ public:
   MOCK_METHOD(void, flush, (), (override));
   MOCK_METHOD(void, shutdownInput, (), (override));
   MOCK_METHOD(void, shutdownOutput, (), (override));
-  MOCK_METHOD(EventTypes, getInputReadyEvent, ());
-  MOCK_METHOD(EventTypes, getOutputErrorEvent, ());
-  MOCK_METHOD(EventTypes, getInputShutdownEvent, ());
-  MOCK_METHOD(EventTypes, getOutputShutdownEvent, ());
+  MOCK_METHOD(deskflow::EventTypes, getInputReadyEvent, ());
+  MOCK_METHOD(deskflow::EventTypes, getOutputErrorEvent, ());
+  MOCK_METHOD(deskflow::EventTypes, getInputShutdownEvent, ());
+  MOCK_METHOD(deskflow::EventTypes, getOutputShutdownEvent, ());
   MOCK_METHOD(void *, getEventTarget, (), (const, override));
   MOCK_METHOD(bool, isReady, (), (const, override));
   MOCK_METHOD(uint32_t, getSize, (), (const, override));