diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp
index 3f012a5d4..09d256b13 100644
--- a/src/lib/deskflow/App.cpp
+++ b/src/lib/deskflow/App.cpp
@@ -195,7 +195,7 @@ void App::runEventsLoop(void *)
 {
   m_events->loop();
 
-#if defined(MAC_OS_X_VERSION_10_7)
+#if WINAPI_CARBON
 
   stopCocoaLoop();
 
diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp
index 93c54f83b..23f4f6193 100644
--- a/src/lib/deskflow/ClientApp.cpp
+++ b/src/lib/deskflow/ClientApp.cpp
@@ -44,6 +44,8 @@
 #endif
 
 #if WINAPI_CARBON
+#include "base/TMethodJob.h"
+#include "mt/Thread.h"
 #include "platform/OSXDragSimulator.h"
 #include "platform/OSXScreen.h"
 #endif
@@ -52,11 +54,6 @@
 #include "platform/Wayland.h"
 #endif
 
-#if defined(MAC_OS_X_VERSION_10_7)
-#include "base/TMethodJob.h"
-#include "mt/Thread.h"
-#endif
-
 #include <memory>
 #include <sstream>
 #include <stdio.h>
@@ -455,7 +452,7 @@ int ClientApp::mainLoop()
   // that.
   DAEMON_RUNNING(true);
 
-#if defined(MAC_OS_X_VERSION_10_7)
+#if WINAPI_CARBON
 
   Thread thread(new TMethodJob<ClientApp>(this, &ClientApp::runEventsLoop, NULL));
 
diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp
index 69f794bc4..20049debc 100644
--- a/src/lib/deskflow/ServerApp.cpp
+++ b/src/lib/deskflow/ServerApp.cpp
@@ -47,6 +47,8 @@
 #endif
 
 #if WINAPI_CARBON
+#include "base/TMethodJob.h"
+#include "mt/Thread.h"
 #include "platform/OSXDragSimulator.h"
 #include "platform/OSXScreen.h"
 #endif
@@ -55,11 +57,6 @@
 #include "platform/Wayland.h"
 #endif
 
-#if defined(MAC_OS_X_VERSION_10_7)
-#include "base/TMethodJob.h"
-#include "mt/Thread.h"
-#endif
-
 #include <fstream>
 #include <iostream>
 #include <sstream>
@@ -683,7 +680,7 @@ int ServerApp::mainLoop()
   // that.
   DAEMON_RUNNING(true);
 
-#if defined(MAC_OS_X_VERSION_10_7)
+#if WINAPI_CARBON
 
   Thread thread(new TMethodJob<ServerApp>(this, &ServerApp::runEventsLoop, NULL));