diff --git a/src/include/event_dispatcher.hpp b/src/include/event_dispatcher.hpp
index c062fab..7faccfb 100644
--- a/src/include/event_dispatcher.hpp
+++ b/src/include/event_dispatcher.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <atomic>
+#include <condition_variable>
 #include <mutex>
+#include <string>
 
 namespace duckdb_httplib_openssl {
 class DataSink;
diff --git a/src/include/http_server.hpp b/src/include/http_server.hpp
index 0c3dccd..de26290 100644
--- a/src/include/http_server.hpp
+++ b/src/include/http_server.hpp
@@ -6,10 +6,8 @@
 #include "httplib.hpp"
 
 #include <memory>
-#include <mutex>
 #include <string>
 #include <thread>
-#include <unordered_map>
 
 #include "watcher.hpp"
 #include "event_dispatcher.hpp"
diff --git a/src/include/utils/env.hpp b/src/include/utils/env.hpp
index f21f24a..f02c733 100644
--- a/src/include/utils/env.hpp
+++ b/src/include/utils/env.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
 
 namespace duckdb {
 
diff --git a/src/include/watcher.hpp b/src/include/watcher.hpp
index 282a0b2..bd178a1 100644
--- a/src/include/watcher.hpp
+++ b/src/include/watcher.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <atomic>
+#include <condition_variable>
 #include <duckdb.hpp>
+#include <mutex>
 #include <thread>
 
 namespace duckdb {