diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec454660..1c90d990 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,6 @@ include (CheckIncludeFile)
 include (cmake/cpu.cmake)
 
 set(SOURCES
-    src/api/Api.cpp
-    src/api/ApiState.cpp
     src/api/NetworkState.cpp
     src/App.cpp
     src/net/Client.cpp
@@ -59,6 +57,8 @@ set(SOURCES_COMMON
 if (WIN32)
     set(SOURCES_OS
         res/app.rc
+        src/api/Api.cpp
+        src/api/ApiState.cpp
         src/App_win.cpp
         src/Cpu_win.cpp
         src/Mem_win.cpp
@@ -76,6 +76,8 @@ elseif (APPLE)
         )
 else()
     set(SOURCES_OS
+        src/api/Api.cpp
+        src/api/ApiState.cpp
         src/App_unix.cpp
         src/Cpu_unix.cpp
         src/Mem_unix.cpp
diff --git a/src/Cpu_mac.cpp b/src/Cpu_mac.cpp
index 94c97032..f82a8924 100644
--- a/src/Cpu_mac.cpp
+++ b/src/Cpu_mac.cpp
@@ -28,7 +28,7 @@
 
 
 #include "Cpu.h"
-
+#include "CpuImpl.h"
 
 void CpuImpl::init()
 {
diff --git a/src/Cpu_unix.cpp b/src/Cpu_unix.cpp
index 8ae7f567..191bc38e 100644
--- a/src/Cpu_unix.cpp
+++ b/src/Cpu_unix.cpp
@@ -59,7 +59,7 @@ void CpuImpl::setAffinity(int id, uint64_t mask)
     cpu_set_t set;
     CPU_ZERO(&set);
 
-    for (int i = 0; i < threads(); i++) {
+    for (size_t i = 0; i < threads(); i++) {
         if (mask & (1UL << i)) {
             CPU_SET(i, &set);
         }
diff --git a/src/Mem_unix.cpp b/src/Mem_unix.cpp
index 5c94932b..ad405967 100644
--- a/src/Mem_unix.cpp
+++ b/src/Mem_unix.cpp
@@ -47,7 +47,7 @@ bool Mem::allocate(const Options* options)
     m_memorySize = 0;
 
     size_t scratchPadSize = m_algo == Options::ALGO_CRYPTONIGHT ? MEMORY : MEMORY_LITE;
-    for (int i=0; i < m_threads; i++) {
+    for (size_t i=0; i < m_threads; i++) {
         m_memorySize += sizeof(cryptonight_ctx);
         m_memorySize += scratchPadSize * getThreadHashFactor(i);
     }
diff --git a/src/Summary.cpp b/src/Summary.cpp
index f729c556..d7083417 100644
--- a/src/Summary.cpp
+++ b/src/Summary.cpp
@@ -104,7 +104,7 @@ static void print_threads()
             threads.append(std::to_string(id));
         };
 
-        for (int i=0; i < Options::i()->threads(); i++) {
+        for (size_t i=0; i < Options::i()->threads(); i++) {
             if (Mem::getThreadHashFactor(i) > 1) {
                 addThread(multiThreads, i);
             }
diff --git a/src/cc/XMRigd.cpp b/src/cc/XMRigd.cpp
index d53101ec..34494148 100644
--- a/src/cc/XMRigd.cpp
+++ b/src/cc/XMRigd.cpp
@@ -33,6 +33,7 @@
 	#include <thread>
 #else
     #include <sys/wait.h>
+    #include <errno.h>
 #endif
 
 int main(int argc, char **argv) {
diff --git a/src/version.h b/src/version.h
index a935c724..67b129a2 100644
--- a/src/version.h
+++ b/src/version.h
@@ -68,7 +68,7 @@
 #   endif
 #include <string>
 #else
-    #if defined(__FreeBSD__)
+    #if defined(__FreeBSD__) || defined(__APPLE__)
         #include <string>
     #else
         #include <string.h>