diff --git a/common/common.h b/common/common.h
index c3898dc64..998d6dd32 100644
--- a/common/common.h
+++ b/common/common.h
@@ -4,9 +4,6 @@
 
 #include "llama-cpp.h"
 
-#include <functional>
-#include <queue>
-#include <optional>
 #include <string>
 #include <vector>
 #include <sstream>
diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index 6f3095e2c..85dcaec3f 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -25,6 +25,7 @@
 #include <deque>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <signal.h>
 #include <thread>
 #include <unordered_map>