diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index 0cc6baac..86183ad6 100644
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -6,10 +6,12 @@ project(${PROJECT})
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+if(NOT IOS AND NOT ANDROID)
+    #include(common.cmake)
 #if (qtservice-uselib)
-    include(common.cmake)
 #    add_subdirectory(buildlib)
-    add_subdirectory(server)
 #endif()
+    add_subdirectory(server)
+endif()
 
 add_subdirectory(wireguard-service)
diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt
index 1ccea5e8..6f1e16d2 100644
--- a/service/server/CMakeLists.txt
+++ b/service/server/CMakeLists.txt
@@ -56,8 +56,28 @@ if(WIN32)
 
     add_compile_definitions(_WINSOCKAPI_)
 endif()
-#TODO migrate macx
-#TODO migrate linux
+
+if(APPLE)
+    set(HEADERS ${HEADERS}
+        ${CMAKE_CURRENT_LIST_DIR}/helper_route_mac.h
+        ${CMAKE_CURRENT_LIST_DIR}/router_mac.h
+    )
+
+    set(SOURCES ${SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/helper_route_mac.c
+        ${CMAKE_CURRENT_LIST_DIR}/router_mac.cpp
+    )
+endif()
+
+if(LINUX)
+    set(HEADERS ${HEADERS}
+        ${CMAKE_CURRENT_LIST_DIR}/router_linux.h
+    )
+
+    set(SOURCES ${SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/router_linux.cpp
+    )
+endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/../src/qtservice.cmake)
 
diff --git a/service/src/qtservice.cmake b/service/src/qtservice.cmake
index 95559481..4a429fab 100644
--- a/service/src/qtservice.cmake
+++ b/service/src/qtservice.cmake
@@ -1,6 +1,6 @@
 include_directories(${CMAKE_CURRENT_LIST_DIR})
 
-include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
+#include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
 
 if(NOT WIN32)
     set(LIBS ${LIBS} Qt6::Network)
@@ -17,6 +17,19 @@ set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/qtservice.cpp
 )
 
+if(UNIX)
+    set(HEADERS ${HEADERS} 
+        ${CMAKE_CURRENT_LIST_DIR}/qtunixsocket.h
+        ${CMAKE_CURRENT_LIST_DIR}/qtunixserversocket.h
+    )
+
+    set(SOURCES ${SOURCES} 
+        ${CMAKE_CURRENT_LIST_DIR}/qtservice_unix.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/qtunixsocket.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/qtunixserversocket.cpp
+    )
+endif()
+
 if(WIN32)
     set(SOURCES ${SOURCES} 
         ${CMAKE_CURRENT_LIST_DIR}/qtservice_win.cpp