diff --git a/src/am2315/am2315.cpp b/src/am2315/am2315.cpp
index 55220fc5..3ff165ba 100644
--- a/src/am2315/am2315.cpp
+++ b/src/am2315/am2315.cpp
@@ -26,7 +26,6 @@
 #include <stdexcept>
 #include <unistd.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <sched.h>
 #include <time.h>
 
diff --git a/src/curieimu/CMakeLists.txt b/src/curieimu/CMakeLists.txt
index 8f208c31..2a4d66d8 100644
--- a/src/curieimu/CMakeLists.txt
+++ b/src/curieimu/CMakeLists.txt
@@ -3,5 +3,5 @@ if (MRAA_FIRMATA_FOUND)
   set (libdescription "Curie IMU Sensor using Firmata")
   set (module_src ${libname}.cpp)
   set (module_hpp ${libname}.hpp)
-  upm_module_init (mraa)
+  upm_module_init(mraa ${CMAKE_THREAD_LIBS_INIT})
 endif ()
diff --git a/src/lol/CMakeLists.txt b/src/lol/CMakeLists.txt
index 44210d78..fabecd6c 100644
--- a/src/lol/CMakeLists.txt
+++ b/src/lol/CMakeLists.txt
@@ -2,4 +2,4 @@ set (libname "lol")
 set (libdescription "Lots of LEDs (LoL) Array Rev A")
 set (module_src ${libname}.cxx)
 set (module_hpp ${libname}.hpp)
-upm_module_init(mraa)
+upm_module_init(mraa ${CMAKE_THREAD_LIBS_INIT})
diff --git a/src/mma7455/mma7455.cxx b/src/mma7455/mma7455.cxx
index b8bf3140..2e7672a8 100644
--- a/src/mma7455/mma7455.cxx
+++ b/src/mma7455/mma7455.cxx
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 #include <math.h>
 
 #include "mma7455.hpp"
diff --git a/src/ozw/CMakeLists.txt b/src/ozw/CMakeLists.txt
index 7c9b8d12..353c7c03 100644
--- a/src/ozw/CMakeLists.txt
+++ b/src/ozw/CMakeLists.txt
@@ -5,7 +5,7 @@ if (OPENZWAVE_FOUND)
   set (module_hpp ${libname}.hpp ozwinterface.hpp ozwdump.hpp aeotecss6.hpp aeotecsdg2.hpp aeotecdw2e.hpp aeotecdsb09104.hpp tzemt400.hpp)
 
   set (reqlibname "libopenzwave")
-  upm_module_init(${OPENZWAVE_LIBRARIES})
+  upm_module_init(${OPENZWAVE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
   target_include_directories(${libname} PUBLIC ${OPENZWAVE_INCLUDE_DIRS})
 
   # openzwave/aes/aes.h has unknown pragmas, disable warning -Wunknown-pragmas
diff --git a/src/pulsensor/CMakeLists.txt b/src/pulsensor/CMakeLists.txt
index 10e11dbd..ff7b9773 100644
--- a/src/pulsensor/CMakeLists.txt
+++ b/src/pulsensor/CMakeLists.txt
@@ -2,4 +2,4 @@ set (libname "pulsensor")
 set (libdescription "3-wire Pulse Sensor")
 set (module_src ${libname}.cxx)
 set (module_hpp ${libname}.hpp)
-upm_module_init(mraa)
+upm_module_init(mraa ${CMAKE_THREAD_LIBS_INIT})
diff --git a/src/sx1276/CMakeLists.txt b/src/sx1276/CMakeLists.txt
index 72a2907f..01b9930a 100644
--- a/src/sx1276/CMakeLists.txt
+++ b/src/sx1276/CMakeLists.txt
@@ -2,4 +2,4 @@ set (libname "sx1276")
 set (libdescription "SZ1276 LoRa/FSK/OOK Radio")
 set (module_src ${libname}.cxx)
 set (module_hpp ${libname}.hpp)
-upm_module_init(mraa)
+upm_module_init(mraa ${CMAKE_THREAD_LIBS_INIT})
diff --git a/src/t3311/t3311.cxx b/src/t3311/t3311.cxx
index 97c04b94..e660815d 100644
--- a/src/t3311/t3311.cxx
+++ b/src/t3311/t3311.cxx
@@ -27,7 +27,6 @@
 #include <stdexcept>
 #include <string>
 #include <sstream>
-#include <pthread.h>
 
 #include "t3311.hpp"