diff --git a/http/http_client.hpp b/http/http_client.hpp
index 1175845..48e8cfd 100644
--- a/http/http_client.hpp
+++ b/http/http_client.hpp
@@ -17,6 +17,8 @@
 
 #include "async_resolve.hpp"
 #include "http_response.hpp"
+#include "logging.hpp"
+#include "ssl_key_handler.hpp"
 
 #include <boost/asio/connect.hpp>
 #include <boost/asio/io_context.hpp>
@@ -37,8 +39,6 @@
 #include <boost/beast/version.hpp>
 #include <boost/container/devector.hpp>
 #include <boost/system/error_code.hpp>
-#include <logging.hpp>
-#include <ssl_key_handler.hpp>
 
 #include <cstdlib>
 #include <functional>
diff --git a/http/http_connection.hpp b/http/http_connection.hpp
index 45581fd..aa8b8c9 100644
--- a/http/http_connection.hpp
+++ b/http/http_connection.hpp
@@ -4,7 +4,11 @@
 #include "authentication.hpp"
 #include "http_response.hpp"
 #include "http_utility.hpp"
+#include "json_html_serializer.hpp"
 #include "logging.hpp"
+#include "mutual_tls.hpp"
+#include "security_headers.hpp"
+#include "ssl_key_handler.hpp"
 #include "utility.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
@@ -21,10 +25,6 @@
 #include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/url/url_view.hpp>
-#include <json_html_serializer.hpp>
-#include <mutual_tls.hpp>
-#include <security_headers.hpp>
-#include <ssl_key_handler.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/http/http_response.hpp b/http/http_response.hpp
index b1b15fb..f9204e4 100644
--- a/http/http_response.hpp
+++ b/http/http_response.hpp
@@ -1,10 +1,10 @@
 #pragma once
 #include "logging.hpp"
 #include "nlohmann/json.hpp"
+#include "utils/hex_utils.hpp"
 
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/string_body.hpp>
-#include <utils/hex_utils.hpp>
 
 #include <optional>
 #include <string>
diff --git a/http/http_server.hpp b/http/http_server.hpp
index 0d224a1..cc4fc22 100644
--- a/http/http_server.hpp
+++ b/http/http_server.hpp
@@ -2,6 +2,7 @@
 
 #include "http_connection.hpp"
 #include "logging.hpp"
+#include "ssl_key_handler.hpp"
 
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/tcp.hpp>
@@ -9,7 +10,6 @@
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/beast/ssl/ssl_stream.hpp>
-#include <ssl_key_handler.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/http/routing.hpp b/http/routing.hpp
index 8d5def6..5b3ddfe 100644
--- a/http/routing.hpp
+++ b/http/routing.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "async_resp.hpp"
 #include "common.hpp"
 #include "dbus_utility.hpp"
 #include "error_messages.hpp"
@@ -12,7 +13,6 @@
 #include "verb.hpp"
 #include "websocket.hpp"
 
-#include <async_resp.hpp>
 #include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/container/flat_map.hpp>
 
diff --git a/http/utility.hpp b/http/utility.hpp
index f49aa9b..4ea44d5 100644
--- a/http/utility.hpp
+++ b/http/utility.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <bmcweb_config.h>
+#include "bmcweb_config.h"
+
 #include <openssl/crypto.h>
 
 #include <boost/callable_traits.hpp>
diff --git a/http/websocket.hpp b/http/websocket.hpp
index 3e4ef0c..0ab13f2 100644
--- a/http/websocket.hpp
+++ b/http/websocket.hpp
@@ -1,7 +1,7 @@
 #pragma once
+#include "async_resp.hpp"
 #include "http_request.hpp"
 
-#include <async_resp.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/beast/websocket.hpp>