chore: Cleanup windows includes

src/lib/arch/win32/ArchDaemonWindows.cpp

@@ -12,7 +12,9 @@
 #include "arch/win32/ArchMiscWindows.h"
 #include "arch/win32/XArchWindows.h"
 #include "base/Log.h"
+#include "common/Constants.h"
 
+inline static const auto kDefaultDaemonName = _T(kAppName);
 //
 // ArchDaemonWindows
 //
@@ -604,17 +606,17 @@ void ArchDaemonWindows::stop(const char *name)
 void ArchDaemonWindows::installDaemon()
 {
   // install default daemon if not already installed.
-  if (!isDaemonInstalled(DEFAULT_DAEMON_NAME)) {
+  if (!isDaemonInstalled(kDefaultDaemonName)) {
     char binPath[MAX_PATH];
     GetModuleFileName(ArchMiscWindows::instanceWin32(), binPath, MAX_PATH);
 
     // wrap in quotes so a malicious user can't start \Program.exe as admin.
     const auto command = "\"" + std::string(binPath) + "\"";
 
-    installDaemon(DEFAULT_DAEMON_NAME, DEFAULT_DAEMON_INFO, command.c_str(), "", "");
+    installDaemon(kDefaultDaemonName, DEFAULT_DAEMON_INFO, command.c_str(), "", "");
   }
 
-  start(DEFAULT_DAEMON_NAME);
+  start(kDefaultDaemonName);
 }
 
 void ArchDaemonWindows::uninstallDaemon()
@@ -628,7 +630,7 @@ void ArchDaemonWindows::uninstallDaemon()
   }
 
   // remove new service if installed.
-  if (isDaemonInstalled(DEFAULT_DAEMON_NAME)) {
-    uninstallDaemon(DEFAULT_DAEMON_NAME);
+  if (isDaemonInstalled(kDefaultDaemonName)) {
+    uninstallDaemon(kDefaultDaemonName);
   }
 }

src/lib/arch/win32/ArchDaemonWindows.h

@@ -9,7 +9,6 @@
 
 #include "arch/IArchDaemon.h"
 #include "arch/IArchMultithread.h"
-#include "common/Constants.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
@@ -77,7 +76,7 @@ public:
   int daemonize(const char *name, DaemonFunc const &func) override;
   bool canInstallDaemon(const char *name) override;
   bool isDaemonInstalled(const char *name) override;
-  std::string commandLine() const
+  std::string commandLine() const override
   {
     return m_commandLine;
   }
@@ -136,7 +135,6 @@ private:
   std::string m_commandLine;
 };
 
-#define DEFAULT_DAEMON_NAME _T(kAppName)
 #define DEFAULT_DAEMON_INFO _T("Runs the Core process on secure desktops (UAC prompts, login screen, etc).")
 
 #define LEGACY_SERVER_DAEMON_NAME _T("Deskflow Server")

src/lib/arch/win32/ArchLogWindows.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "arch/win32/ArchLogWindows.h"
-#include "arch/win32/ArchMiscWindows.h"
 
 #include <string.h>
 

src/lib/arch/win32/ArchMiscWindows.cpp

@@ -7,11 +7,11 @@
 
 #include "arch/win32/ArchMiscWindows.h"
 
-#include "arch/XArch.h"
 #include "arch/win32/ArchDaemonWindows.h"
 #include "arch/win32/XArchWindows.h"
 #include "base/Log.h"
 #include "base/String.h"
+#include "common/Constants.h"
 
 #include <Psapi.h>
 

src/lib/arch/win32/XArchWindows.cpp

@@ -7,7 +7,6 @@
  */
 
 #include "arch/win32/XArchWindows.h"
-#include "arch/win32/ArchNetworkWinsock.h"
 #include "base/String.h"
 
 std::string windowsErrorToString(DWORD error)

src/lib/platform/MSWindowsKeyState.cpp

@@ -10,6 +10,7 @@
 #include "arch/win32/XArchWindows.h"
 #include "base/IEventQueue.h"
 #include "base/Log.h"
+#include "common/Constants.h"
 #include "platform/MSWindowsDesks.h"
 #include "platform/MSWindowsHandle.h"
 

src/lib/platform/MSWindowsProcess.cpp

@@ -7,15 +7,17 @@
 
 #include "MSWindowsProcess.h"
 
-#include "arch/XArch.h"
 #include "arch/win32/XArchWindows.h"
 #include "base/Log.h"
+#include "common/Common.h"
+#include "common/Constants.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
 #include <UserEnv.h>
 
+#include <stdexcept>
 #include <string>
 
 namespace deskflow::platform {

src/lib/platform/MSWindowsScreen.cpp

@@ -22,7 +22,6 @@
 #include "deskflow/Clipboard.h"
 #include "deskflow/KeyMap.h"
 #include "deskflow/XScreen.h"
-#include "mt/Thread.h"
 #include "platform/MSWindowsClipboard.h"
 #include "platform/MSWindowsDesks.h"
 #include "platform/MSWindowsEventQueueBuffer.h"

src/lib/platform/MSWindowsScreen.h

@@ -9,8 +9,6 @@
 
 #include "deskflow/ClientArgs.h"
 #include "deskflow/PlatformScreen.h"
-#include "mt/CondVar.h"
-#include "mt/Mutex.h"
 #include "platform/MSWindowsHook.h"
 #include "platform/MSWindowsPowerManager.h"
 

src/lib/platform/MSWindowsSession.cpp

@@ -6,12 +6,11 @@
 
 #include "platform/MSWindowsSession.h"
 
-#include "arch/XArch.h"
 #include "arch/win32/XArchWindows.h"
 #include "base/Log.h"
-#include "deskflow/XDeskflow.h"
 
 #include <Wtsapi32.h>
+#include <stdexcept>
 
 MSWindowsSession::MSWindowsSession() : m_activeSessionId(-1)
 {

src/lib/platform/MSWindowsWatchdog.cpp

@@ -7,12 +7,12 @@
 #include "platform/MSWindowsWatchdog.h"
 
 #include "arch/Arch.h"
-#include "arch/XArch.h"
 #include "arch/win32/XArchWindows.h"
 #include "base/ELevel.h"
 #include "base/Log.h"
 #include "base/LogOutputters.h"
 #include "base/TMethodJob.h"
+#include "common/Constants.h"
 #include "deskflow/App.h"
 #include "mt/Thread.h"
 #include "platform/MSWindowsHandle.h"