diff --git a/src/server/sample_user_handler.cpp b/src/server/sample_user_handler.cpp
index 3bd676b6ad62..fa7034d79c5e 100644
--- a/src/server/sample_user_handler.cpp
+++ b/src/server/sample_user_handler.cpp
@@ -15,6 +15,7 @@
 #include "server/sample_user_handler.hpp"
 
 #include "config.hpp"
+#include "lexical_cast.hpp"
 #include "serialization/string_utils.hpp"
 #include "util.hpp"
 
diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
index 259473af5e81..3172688b9d4b 100644
--- a/src/server/server_base.cpp
+++ b/src/server/server_base.cpp
@@ -14,11 +14,10 @@
 
 #include "server/server_base.hpp"
 
+#include "lexical_cast.hpp"
 #include "log.hpp"
-#include "util.hpp"
 #include "utils/functional.hpp"
 
-
 static lg::log_domain log_server("server");
 #define ERR_SERVER LOG_STREAM(err, log_server)
 #define WRN_SERVER LOG_STREAM(warn, log_server)