diff --git a/src/Manager.cpp b/src/Manager.cpp
index 301b4a6f..138b314c 100644
--- a/src/Manager.cpp
+++ b/src/Manager.cpp
@@ -1,13 +1,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "kompute/Manager.hpp"
-#include "fmt/format.h"
 #include "kompute/logger/Logger.hpp"
 #include <fmt/core.h>
+#include <fmt/ranges.h>
 #include <iterator>
 #include <set>
 #include <sstream>
 #include <string>
+#include <unordered_map>
 
 namespace kp {
 
diff --git a/src/include/kompute/Manager.hpp b/src/include/kompute/Manager.hpp
index 137ca6ff..457e24ef 100644
--- a/src/include/kompute/Manager.hpp
+++ b/src/include/kompute/Manager.hpp
@@ -1,11 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 #pragma once
 
-#include <set>
-#include <unordered_map>
-
 #include "kompute/Core.hpp"
-
 #include "kompute/Sequence.hpp"
 #include "logger/Logger.hpp"