diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13f787f7..a6adda76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,6 @@ set(HEADERS
     "${HEADERS_BACKEND}"
     src/api/interfaces/IApiListener.h
     src/App.h
-    src/common/Platform.h
     src/common/xmrig.h
     src/core/config/Config_default.h
     src/core/config/Config_platform.h
@@ -88,7 +87,6 @@ set(SOURCES
     "${SOURCES_BASE_HTTP}"
     "${SOURCES_BACKEND}"
     src/App.cpp
-    src/common/Platform.cpp
     src/core/config/Config.cpp
     src/core/config/ConfigTransform.cpp
     src/core/Controller.cpp
@@ -123,7 +121,6 @@ if (WIN32)
         "${SOURCES_OS}"
         res/app.rc
         src/App_win.cpp
-        src/common/Platform_win.cpp
         src/Mem_win.cpp
         src/crypto/common/VirtualMemory_win.cpp
         )
@@ -134,7 +131,6 @@ elseif (APPLE)
     set(SOURCES_OS
         "${SOURCES_OS}"
         src/App_unix.cpp
-        src/common/Platform_mac.cpp
         src/Mem_unix.cpp
         src/crypto/common/VirtualMemory_unix.cpp
         )
@@ -142,7 +138,6 @@ else()
     set(SOURCES_OS
         "${SOURCES_OS}"
         src/App_unix.cpp
-        src/common/Platform_unix.cpp
         src/Mem_unix.cpp
         src/crypto/common/VirtualMemory_unix.cpp
         )
diff --git a/src/App.cpp b/src/App.cpp
index 6e42ac30..5b2178ac 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -34,7 +34,6 @@
 #include "base/io/Console.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/Signals.h"
-#include "common/Platform.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
 #include "Mem.h"
diff --git a/src/api/v1/ApiRouter.cpp b/src/api/v1/ApiRouter.cpp
index ff1ef404..18d97fda 100644
--- a/src/api/v1/ApiRouter.cpp
+++ b/src/api/v1/ApiRouter.cpp
@@ -31,7 +31,7 @@
 #include "api/v1/ApiRouter.h"
 #include "backend/cpu/Cpu.h"
 #include "base/kernel/Base.h"
-#include "common/Platform.h"
+#include "base/kernel/Platform.h"
 #include "core/config/Config.h"
 #include "interfaces/IThread.h"
 #include "rapidjson/document.h"
diff --git a/src/base/base.cmake b/src/base/base.cmake
index dcc10495..b25d9743 100644
--- a/src/base/base.cmake
+++ b/src/base/base.cmake
@@ -26,6 +26,7 @@ set(HEADERS_BASE
     src/base/kernel/interfaces/IStrategyListener.h
     src/base/kernel/interfaces/ITimerListener.h
     src/base/kernel/interfaces/IWatcherListener.h
+    src/base/kernel/Platform.h
     src/base/kernel/Process.h
     src/base/kernel/Signals.h
     src/base/net/dns/Dns.h
@@ -63,6 +64,7 @@ set(SOURCES_BASE
     src/base/kernel/config/BaseConfig.cpp
     src/base/kernel/config/BaseTransform.cpp
     src/base/kernel/Entry.cpp
+    src/base/kernel/Platform.cpp
     src/base/kernel/Process.cpp
     src/base/kernel/Signals.cpp
     src/base/net/dns/Dns.cpp
@@ -83,9 +85,20 @@ set(SOURCES_BASE
 
 
 if (WIN32)
-    set(SOURCES_OS src/base/io/json/Json_win.cpp)
+    set(SOURCES_OS
+        src/base/io/json/Json_win.cpp
+        src/base/kernel/Platform_win.cpp
+        )
+elseif (APPLE)
+    set(SOURCES_OS
+        src/base/io/json/Json_unix.cpp
+        src/base/kernel/Platform_mac.cpp
+        )
 else()
-    set(SOURCES_OS src/base/io/json/Json_unix.cpp)
+    set(SOURCES_OS
+        src/base/io/json/Json_unix.cpp
+        src/base/kernel//Platform_unix.cpp
+        )
 endif()
 
 
diff --git a/src/base/kernel/Base.cpp b/src/base/kernel/Base.cpp
index 031daed7..46f32684 100644
--- a/src/base/kernel/Base.cpp
+++ b/src/base/kernel/Base.cpp
@@ -35,8 +35,8 @@
 #include "base/io/Watcher.h"
 #include "base/kernel/Base.h"
 #include "base/kernel/interfaces/IBaseListener.h"
+#include "base/kernel/Platform.h"
 #include "base/kernel/Process.h"
-#include "common/Platform.h"
 #include "core/config/Config.h"
 #include "core/config/ConfigTransform.h"
 
diff --git a/src/common/Platform.cpp b/src/base/kernel/Platform.cpp
similarity index 100%
rename from src/common/Platform.cpp
rename to src/base/kernel/Platform.cpp
diff --git a/src/common/Platform.h b/src/base/kernel/Platform.h
similarity index 90%
rename from src/common/Platform.h
rename to src/base/kernel/Platform.h
index 85f08a2e..f3c2c719 100644
--- a/src/common/Platform.h
+++ b/src/base/kernel/Platform.h
@@ -35,6 +35,15 @@
 class Platform
 {
 public:
+    static inline bool trySetThreadAffinity(int64_t cpu_id)
+    {
+        if (cpu_id < 0) {
+            return false;
+        }
+
+        return setThreadAffinity(static_cast<uint64_t>(cpu_id));
+    }
+
     static bool setThreadAffinity(uint64_t cpu_id);
     static uint32_t setTimerResolution(uint32_t resolution);
     static void init(const char *userAgent);
diff --git a/src/common/Platform_mac.cpp b/src/base/kernel/Platform_mac.cpp
similarity index 100%
rename from src/common/Platform_mac.cpp
rename to src/base/kernel/Platform_mac.cpp
diff --git a/src/common/Platform_unix.cpp b/src/base/kernel/Platform_unix.cpp
similarity index 100%
rename from src/common/Platform_unix.cpp
rename to src/base/kernel/Platform_unix.cpp
diff --git a/src/common/Platform_win.cpp b/src/base/kernel/Platform_win.cpp
similarity index 100%
rename from src/common/Platform_win.cpp
rename to src/base/kernel/Platform_win.cpp
diff --git a/src/base/net/http/HttpClient.cpp b/src/base/net/http/HttpClient.cpp
index 319bb4dd..113e2f13 100644
--- a/src/base/net/http/HttpClient.cpp
+++ b/src/base/net/http/HttpClient.cpp
@@ -29,10 +29,10 @@
 
 #include "3rdparty/http-parser/http_parser.h"
 #include "base/io/log/Log.h"
+#include "base/kernel/Platform.h"
 #include "base/net/dns/Dns.h"
 #include "base/net/http/HttpClient.h"
 #include "base/tools/Baton.h"
-#include "common/Platform.h"
 
 
 namespace xmrig {
diff --git a/src/base/net/stratum/strategies/FailoverStrategy.cpp b/src/base/net/stratum/strategies/FailoverStrategy.cpp
index d5247229..9545e9e1 100644
--- a/src/base/net/stratum/strategies/FailoverStrategy.cpp
+++ b/src/base/net/stratum/strategies/FailoverStrategy.cpp
@@ -24,9 +24,9 @@
 
 
 #include "base/kernel/interfaces/IStrategyListener.h"
+#include "base/kernel/Platform.h"
 #include "base/net/stratum/Client.h"
 #include "base/net/stratum/strategies/FailoverStrategy.h"
-#include "common/Platform.h"
 
 
 #ifdef XMRIG_FEATURE_HTTP
diff --git a/src/base/net/stratum/strategies/SinglePoolStrategy.cpp b/src/base/net/stratum/strategies/SinglePoolStrategy.cpp
index f432514e..6c6a6fc1 100644
--- a/src/base/net/stratum/strategies/SinglePoolStrategy.cpp
+++ b/src/base/net/stratum/strategies/SinglePoolStrategy.cpp
@@ -24,9 +24,9 @@
 
 
 #include "base/kernel/interfaces/IStrategyListener.h"
+#include "base/kernel/Platform.h"
 #include "base/net/stratum/Client.h"
 #include "base/net/stratum/strategies/SinglePoolStrategy.h"
-#include "common/Platform.h"
 
 
 #ifdef XMRIG_FEATURE_HTTP
diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp
index 8e2e03a1..81c67d7c 100644
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -27,7 +27,6 @@
 
 
 #include "backend/cpu/Cpu.h"
-#include "common/Platform.h"
 #include "core/Controller.h"
 #include "net/Network.h"
 
diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp
index 9669db9a..78c7acc5 100644
--- a/src/net/strategies/DonateStrategy.cpp
+++ b/src/net/strategies/DonateStrategy.cpp
@@ -26,13 +26,13 @@
 #include <assert.h>
 
 
+#include "base/kernel/Platform.h"
 #include "base/net/stratum/Client.h"
 #include "base/net/stratum/Job.h"
 #include "base/net/stratum/strategies/FailoverStrategy.h"
 #include "base/net/stratum/strategies/SinglePoolStrategy.h"
 #include "base/tools/Buffer.h"
 #include "base/tools/Timer.h"
-#include "common/Platform.h"
 #include "common/xmrig.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
diff --git a/src/workers/Worker.cpp b/src/workers/Worker.cpp
index 3a9b693d..d85858af 100644
--- a/src/workers/Worker.cpp
+++ b/src/workers/Worker.cpp
@@ -27,7 +27,7 @@
 
 
 #include "backend/cpu/Cpu.h"
-#include "common/Platform.h"
+#include "base/kernel/Platform.h"
 #include "workers/CpuThreadLegacy.h"
 #include "workers/ThreadHandle.h"
 #include "workers/Worker.h"