diff --git a/CMakeLists.txt b/CMakeLists.txt
index eab0798..ff9290e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@ project(jbus)
 
 if(WIN32)
 set(JBUS_PLAT_LIBS Ws2_32)
+elseif(UNIX AND NOT APPLE)
+set(JBUS_PLAT_LIBS pthread)
 endif()
 
 include_directories(include)
diff --git a/include/jbus/Endpoint.hpp b/include/jbus/Endpoint.hpp
index e1d2031..db37c4c 100644
--- a/include/jbus/Endpoint.hpp
+++ b/include/jbus/Endpoint.hpp
@@ -6,6 +6,7 @@
 #include "optional.hpp"
 #include <thread>
 #include <mutex>
+#include <condition_variable>
 
 namespace jbus
 {
diff --git a/include/jbus/Socket.hpp b/include/jbus/Socket.hpp
index 884c2bc..6bfe237 100644
--- a/include/jbus/Socket.hpp
+++ b/include/jbus/Socket.hpp
@@ -17,6 +17,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <string>
+#include <memory.h>
 
 #include "Common.hpp"