Base: Only include required util namespaces

src/Config.cpp

@@ -2,7 +2,8 @@
 
 #include "Config.h"
 #include "plugin-macros.generated.h"
-#include "utils/Utils.h"
+#include "utils/Crypto.h"
+#include "utils/Platform.h"
 
 #define CONFIG_SECTION_NAME "OBSWebSocket"
 

src/WebSocketProtocol.cpp

@@ -7,7 +7,9 @@
 #include "obs-websocket.h"
 #include "Config.h"
 #include "plugin-macros.generated.h"
-#include "utils/Utils.h"
+#include "utils/Crypto.h"
+#include "utils/Json.h"
+#include "utils/Platform.h"
 
 bool IsSupportedRpcVersion(uint8_t requestedVersion)
 {

src/WebSocketServer.cpp

@@ -10,6 +10,8 @@
 #include "eventhandler/types/EventSubscription.h"
 #include "obs-websocket.h"
 #include "Config.h"
+#include "utils/Crypto.h"
+#include "utils/Platform.h"
 #include "plugin-macros.generated.h"
 
 WebSocketServer::WebSocketServer() :

src/WebSocketServer.h

@@ -7,7 +7,7 @@
 #include <websocketpp/config/asio_no_tls.hpp>
 #include <websocketpp/server.hpp>
 
-#include "utils/Utils.h"
+#include "utils/Json.h"
 #include "WebSocketSession.h"
 
 class WebSocketServer : QObject

src/eventhandler/EventHandler.h

@@ -7,6 +7,7 @@
 #include "types/EventSubscription.h"
 #include "../obs-websocket.h"
 #include "../WebSocketServer.h"
+#include "../utils/Obs.h"
 
 template <typename T> T* GetCalldataPointer(const calldata_t *data, const char* name) {
 	void *ptr = nullptr;

src/forms/ConnectInfo.cpp

@@ -6,7 +6,7 @@
 #include "../../deps/qr/cpp/QrCode.hpp"
 #include "../obs-websocket.h"
 #include "../Config.h"
-#include "../utils/Utils.h"
+#include "../utils/Platform.h"
 #include "../plugin-macros.generated.h"
 
 ConnectInfo::ConnectInfo(QWidget* parent) :

src/forms/SettingsDialog.cpp

@@ -8,6 +8,7 @@
 #include "../obs-websocket.h"
 #include "../Config.h"
 #include "../WebSocketServer.h"
+#include "../utils/Crypto.h"
 #include "../plugin-macros.generated.h"
 
 QString GetToolTipIconHtml()

src/requesthandler/RequestHandler.h

@@ -7,7 +7,7 @@
 #include "rpc/Request.h"
 #include "rpc/RequestResult.h"
 #include "../obs-websocket.h"
-#include "../utils/Utils.h"
+#include "../utils/Obs.h"
 
 class RequestHandler;
 typedef RequestResult(RequestHandler::*RequestMethodHandler)(const Request&);

src/requesthandler/RequestHandler_Sources.cpp

@@ -1,6 +1,7 @@
 #include <QBuffer>
 #include <QImageWriter>
 #include <QFileInfo>
+#include <QImage>
 #include <QDir>
 
 #include "RequestHandler.h"

src/requesthandler/rpc/Request.h

@@ -2,7 +2,7 @@
 
 #include "RequestStatus.h"
 #include "../../WebSocketSession.h"
-#include "../../utils/Utils.h"
+#include "../../utils/Json.h"
 
 struct Request
 {

src/requesthandler/rpc/RequestResult.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "RequestStatus.h"
-#include "../../utils/Utils.h"
+#include "../../utils/Json.h"
 
 struct RequestResult
 {