diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp
index 43269532b..339942583 100644
--- a/src/lib/arch/unix/ArchMultithreadPosix.cpp
+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp
@@ -424,7 +424,7 @@ bool ArchMultithreadPosix::wait(ArchThread target, double timeout)
       const double start = Arch::time();
       do {
         // wait a little
-        ARCH->sleep(0.05);
+        Arch::sleep(0.05);
 
         // repeat test
         testCancelThreadImpl(self);
diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp
index d5e9654fd..f4b879503 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.cpp
+++ b/src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -63,7 +63,7 @@ static in_addr_t inet_aton(const char *cp, struct in_addr *inp)
 
 void ArchNetworkBSD::Deps::sleep(double seconds)
 {
-  ARCH->sleep(seconds);
+  Arch::sleep(seconds);
 }
 
 int ArchNetworkBSD::Deps::poll(struct pollfd *fds, nfds_t nfds, int timeout)
diff --git a/src/lib/arch/win32/ArchDaemonWindows.cpp b/src/lib/arch/win32/ArchDaemonWindows.cpp
index 5d2d437a5..090d8f4fe 100644
--- a/src/lib/arch/win32/ArchDaemonWindows.cpp
+++ b/src/lib/arch/win32/ArchDaemonWindows.cpp
@@ -169,7 +169,7 @@ void ArchDaemonWindows::uninstallDaemon(const char *name)
   // give windows a chance to remove the service before we check if it still exists.
   // 100ms should be plenty of time.
   LOG_DEBUG("waiting for service to be removed");
-  ARCH->sleep(0.1);
+  Arch::sleep(0.1);
 
   // handle failure.  ignore error if service isn't installed anymore.
   if (!okay && isDaemonInstalled(name)) {
diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp
index 9976f9e0f..e7e79bf8c 100644
--- a/src/lib/deskflow/App.cpp
+++ b/src/lib/deskflow/App.cpp
@@ -101,7 +101,7 @@ int App::run(int argc, char **argv)
     // display invalid exceptions can occur when going to sleep. When this
     // process exits, the UI will restart us instantly. We don't really want
     // that behevior, so we quies for a bit
-    ARCH->sleep(10);
+    Arch::sleep(10);
   } catch (std::runtime_error &re) {
     LOG((CLOG_CRIT "a runtime error occurred: %s\n", re.what()));
   } catch (std::exception &e) {
diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index ba85423bd..49ba0b4a2 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -436,7 +436,7 @@ int SecureSocket::secureAccept(int socket)
     LOG((CLOG_ERR "failed to accept secure socket"));
     LOG((CLOG_WARN "client connection may not be secure"));
     m_secureReady = false;
-    ARCH->sleep(1);
+    Arch::sleep(1);
     retry = 0;
     return -1; // Failed, error out
   }
@@ -459,7 +459,7 @@ int SecureSocket::secureAccept(int socket)
   if (retry > 0) {
     LOG((CLOG_DEBUG2 "retry accepting secure socket"));
     m_secureReady = false;
-    ARCH->sleep(s_retryDelay);
+    Arch::sleep(s_retryDelay);
     return 0;
   }
 
@@ -507,7 +507,7 @@ int SecureSocket::secureConnect(int socket)
   if (retry > 0) {
     LOG((CLOG_DEBUG2 "retry connect secure socket"));
     m_secureReady = false;
-    ARCH->sleep(s_retryDelay);
+    Arch::sleep(s_retryDelay);
     return 0;
   }
 
diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp
index 5b5f56385..85eedc988 100644
--- a/src/lib/platform/MSWindowsScreen.cpp
+++ b/src/lib/platform/MSWindowsScreen.cpp
@@ -1387,7 +1387,7 @@ void MSWindowsScreen::warpCursorNoFlush(int32_t x, int32_t y)
   // chance of undesired behavior.  we'll also check for very
   // large motions that look suspiciously like about half width
   // or height of the screen.
-  ARCH->sleep(0.0);
+  Arch::sleep(0.0);
 
   // send an event that we can recognize after the mouse warp
   PostThreadMessage(GetCurrentThreadId(), DESKFLOW_MSG_POST_WARP, 0, 0);
diff --git a/src/lib/platform/MSWindowsScreenSaver.cpp b/src/lib/platform/MSWindowsScreenSaver.cpp
index 050e102b3..0d2b11b7b 100644
--- a/src/lib/platform/MSWindowsScreenSaver.cpp
+++ b/src/lib/platform/MSWindowsScreenSaver.cpp
@@ -213,7 +213,7 @@ void MSWindowsScreenSaver::watchDesktopThread(void *)
 
   for (;;) {
     // wait a bit
-    ARCH->sleep(0.2);
+    Arch::sleep(0.2);
 
     BOOL running;
     SystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, &running, 0);
diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp
index d9d1132e0..857c2e169 100644
--- a/src/lib/platform/MSWindowsWatchdog.cpp
+++ b/src/lib/platform/MSWindowsWatchdog.cpp
@@ -241,7 +241,7 @@ void MSWindowsWatchdog::mainLoop(void *)
 
     // Sleep for only 100ms rather than 1 second so that the service can shut down faster.
     LOG_DEBUG3("watchdog main loop sleeping");
-    ARCH->sleep(0.1);
+    Arch::sleep(0.1);
   }
 
   LOG_DEBUG("watchdog main loop finished");
@@ -309,7 +309,7 @@ void MSWindowsWatchdog::startProcess()
   } else {
     // Wait for program to fail. This needs to be 1 second, as the process may take some time to fail.
     LOG_DEBUG("watchdog waiting for process start result");
-    ARCH->sleep(1);
+    Arch::sleep(1);
 
     if (!isProcessRunning()) {
       m_process.reset();
@@ -357,7 +357,7 @@ void MSWindowsWatchdog::outputLoop(void *)
 
     if (!success || bytesRead == 0) {
       // Sleep for only 100ms rather than 1 second so that the service can shut down faster.
-      ARCH->sleep(0.1);
+      Arch::sleep(0.1);
     } else {
       buffer[bytesRead] = '\0';
 
@@ -524,7 +524,7 @@ void MSWindowsWatchdog::sasLoop(void *) // NOSONAR - Thread entry point signatur
   while (m_running) {
     if (m_processState != ProcessState::Running) {
       LOG_DEBUG2("watchdog not running, skipping SendSAS");
-      ARCH->sleep(1);
+      Arch::sleep(1);
       continue;
     }
 
@@ -532,7 +532,7 @@ void MSWindowsWatchdog::sasLoop(void *) // NOSONAR - Thread entry point signatur
     MSWindowsHandle sendSasEvent(CreateEvent(nullptr, FALSE, FALSE, kSendSasEventName));
     if (sendSasEvent.get() == nullptr) {
       LOG_ERR("could not create SAS event, error: %s", windowsErrorToString(GetLastError()).c_str());
-      ARCH->sleep(1);
+      Arch::sleep(1);
       continue;
     }
 
diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
index 4ca624014..ba6ebc853 100644
--- a/src/lib/platform/OSXKeyState.cpp
+++ b/src/lib/platform/OSXKeyState.cpp
@@ -889,7 +889,7 @@ void OSXKeyState::setGroup(int32_t group)
   // event queue and without a delay the subsequent key press
   // event could be applied before the keyboard layout would
   // actually be changed.
-  ARCH->sleep(.01);
+  Arch::sleep(.01);
 }
 
 void OSXKeyState::adjustAltGrModifier(const KeyIDs &ids, KeyModifierMask *mask, bool isCommand) const
diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp
index 0bef566ed..7dde8bfa0 100644
--- a/src/lib/platform/XWindowsClipboard.cpp
+++ b/src/lib/platform/XWindowsClipboard.cpp
@@ -1232,7 +1232,7 @@ bool XWindowsClipboard::CICCCMGetClipboard::readClipboard(
         }
       }
     } else {
-      ARCH->sleep(0.01);
+      Arch::sleep(0.01);
     }
   }
 
diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp
index 8d59e6040..f84a8c3e8 100644
--- a/src/lib/platform/XWindowsScreen.cpp
+++ b/src/lib/platform/XWindowsScreen.cpp
@@ -1887,7 +1887,7 @@ bool XWindowsScreen::grabMouseAndKeyboard()
       assert(result != GrabNotViewable);
       if (result != GrabSuccess) {
         LOG((CLOG_DEBUG2 "waiting to grab keyboard"));
-        ARCH->sleep(0.05);
+        Arch::sleep(0.05);
         if (timer.getTime() >= s_timeout) {
           LOG((CLOG_DEBUG2 "grab keyboard timed out"));
           return false;
@@ -1904,7 +1904,7 @@ bool XWindowsScreen::grabMouseAndKeyboard()
       // back off to avoid grab deadlock
       XUngrabKeyboard(m_display, CurrentTime);
       LOG((CLOG_DEBUG2 "ungrabbed keyboard, waiting to grab pointer"));
-      ARCH->sleep(0.05);
+      Arch::sleep(0.05);
       if (timer.getTime() >= s_timeout) {
         LOG((CLOG_DEBUG2 "grab pointer timed out"));
         return false;
diff --git a/src/unittests/platform/OSXKeyStateTests.cpp b/src/unittests/platform/OSXKeyStateTests.cpp
index d1b6759a6..62a74f274 100644
--- a/src/unittests/platform/OSXKeyStateTests.cpp
+++ b/src/unittests/platform/OSXKeyStateTests.cpp
@@ -116,7 +116,7 @@ void OSXKeyStateTests::fakePollCharWithModifier()
 bool OSXKeyStateTests::isKeyPressed(const OSXKeyState &keyState, KeyButton button)
 {
   // HACK: allow os to realize key state changes.
-  ARCH->sleep(.2);
+  Arch::sleep(.2);
 
   IKeyState::KeyButtonSet pressed;
   keyState.pollPressedKeys(pressed);