diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp
index c737e3109..663cfddfb 100644
--- a/src/lib/deskflow/ClientApp.cpp
+++ b/src/lib/deskflow/ClientApp.cpp
@@ -22,10 +22,6 @@
 #include "net/SocketMultiplexer.h"
 #include "net/TCPSocketFactory.h"
 
-#if SYSAPI_WIN32
-#include "arch/win32/ArchDaemonWindows.h"
-#endif
-
 #if WINAPI_MSWINDOWS
 #include "platform/MSWindowsScreen.h"
 #endif
@@ -299,9 +295,6 @@ int ClientApp::mainLoop()
   // run event loop.  if startClient() failed we're supposed to retry
   // later.  the timer installed by startClient() will take care of
   // that.
-#if SYSAPI_WIN32
-  ArchDaemonWindows::daemonRunning(true);
-#endif
 
 #if WINAPI_CARBON
 
@@ -316,10 +309,6 @@ int ClientApp::mainLoop()
   getEvents()->loop();
 #endif
 
-#if SYSAPI_WIN32
-  ArchDaemonWindows::daemonRunning(false);
-#endif
-
   // close down
   LOG_DEBUG1("stopping client");
   stopClient();
diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp
index 1ed2be89b..437a0749f 100644
--- a/src/lib/deskflow/ServerApp.cpp
+++ b/src/lib/deskflow/ServerApp.cpp
@@ -30,10 +30,6 @@
 // must be before screen header includes
 #include <QFileInfo>
 
-#if SYSAPI_WIN32
-#include "arch/win32/ArchDaemonWindows.h"
-#endif
-
 #if WINAPI_MSWINDOWS
 #include "platform/MSWindowsScreen.h"
 #endif
@@ -556,9 +552,6 @@ int ServerApp::mainLoop()
   // run event loop.  if startServer() failed we're supposed to retry
   // later.  the timer installed by startServer() will take care of
   // that.
-#if SYSAPI_WIN32
-  ArchDaemonWindows::daemonRunning(true);
-#endif
 
 #if WINAPI_CARBON
 
@@ -573,10 +566,6 @@ int ServerApp::mainLoop()
   getEvents()->loop();
 #endif
 
-#if SYSAPI_WIN32
-  ArchDaemonWindows::daemonRunning(false);
-#endif
-
   // close down
   LOG_DEBUG1("stopping server");
   getEvents()->removeHandler(EventTypes::ServerAppForceReconnect, getEvents()->getSystemTarget());