diff --git a/CMakeLists.txt b/CMakeLists.txt
index af1f48d..616c574 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,9 @@ add_library(${PROJECT_NAME} INTERFACE)
 target_include_directories(${PROJECT_NAME} INTERFACE headers)
 target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_17)
 
+find_package(Threads REQUIRED)
+target_link_libraries(${PROJECT_NAME} INTERFACE Threads::Threads)
+
 if(BUILD_AS_STANDALONE)
     option(BUILD_WITH_UNTESTS "Build with unit tests" ON)
     if(BUILD_WITH_UNTESTS)
diff --git a/headers/promise.hpp/jobber.hpp b/headers/promise.hpp/jobber.hpp
index 7bb3e8a..3e81122 100644
--- a/headers/promise.hpp/jobber.hpp
+++ b/headers/promise.hpp/jobber.hpp
@@ -8,6 +8,8 @@
 
 #include "promise.hpp"
 
+#include <algorithm>
+
 namespace jobber_hpp
 {
     using namespace promise_hpp;
diff --git a/headers/promise.hpp/scheduler.hpp b/headers/promise.hpp/scheduler.hpp
index 0c89216..ab1f66c 100644
--- a/headers/promise.hpp/scheduler.hpp
+++ b/headers/promise.hpp/scheduler.hpp
@@ -8,6 +8,8 @@
 
 #include "promise.hpp"
 
+#include <algorithm>
+
 namespace scheduler_hpp
 {
     using namespace promise_hpp;
diff --git a/untests/jobber_tests.cpp b/untests/jobber_tests.cpp
index 9a6ab22..687901a 100644
--- a/untests/jobber_tests.cpp
+++ b/untests/jobber_tests.cpp
@@ -9,6 +9,9 @@
 
 #include <thread>
 #include <numeric>
+#include <iostream>
+
+#include <cmath>
 #include <cstring>
 
 namespace jb = jobber_hpp;
diff --git a/untests/scheduler_tests.cpp b/untests/scheduler_tests.cpp
index b663d36..6de44ef 100644
--- a/untests/scheduler_tests.cpp
+++ b/untests/scheduler_tests.cpp
@@ -9,6 +9,9 @@
 
 #include <thread>
 #include <numeric>
+#include <iostream>
+
+#include <cmath>
 #include <cstring>
 
 namespace sd = scheduler_hpp;