diff --git a/src/security_headers_middleware_test.cpp b/src/security_headers_middleware_test.cpp
index 80df725..99f1f5b 100644
--- a/src/security_headers_middleware_test.cpp
+++ b/src/security_headers_middleware_test.cpp
@@ -1,4 +1,5 @@
-#include <app.hpp>
+#include "app.hpp"
+
 #include <security_headers_middleware.hpp>
 
 #include <gmock/gmock.h>
diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index 05c10cc..1dbeb06 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -1,29 +1,31 @@
-#include <bmcweb_config.h>
+#include "bmcweb_config.h"
+
+#include "app.hpp"
+#include "cors_preflight.hpp"
+#include "dbus_monitor.hpp"
+#include "dbus_singleton.hpp"
+#include "hostname_monitor.hpp"
+#include "ibm/management_console_rest.hpp"
+#include "image_upload.hpp"
+#include "kvm_websocket.hpp"
+#include "login_routes.hpp"
+#include "nbd_proxy.hpp"
+#include "obmc_console.hpp"
+#include "openbmc_dbus_rest.hpp"
+#include "redfish.hpp"
+#include "redfish_aggregator.hpp"
+#include "security_headers.hpp"
+#include "ssl_key_handler.hpp"
+#include "vm_websocket.hpp"
+#include "webassets.hpp"
+
 #include <systemd/sd-daemon.h>
 
-#include <app.hpp>
 #include <boost/asio/io_context.hpp>
-#include <cors_preflight.hpp>
-#include <dbus_monitor.hpp>
-#include <dbus_singleton.hpp>
 #include <google/google_service_root.hpp>
-#include <hostname_monitor.hpp>
-#include <ibm/management_console_rest.hpp>
-#include <image_upload.hpp>
-#include <kvm_websocket.hpp>
-#include <login_routes.hpp>
-#include <nbd_proxy.hpp>
-#include <obmc_console.hpp>
-#include <openbmc_dbus_rest.hpp>
-#include <redfish.hpp>
-#include <redfish_aggregator.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/server.hpp>
-#include <security_headers.hpp>
-#include <ssl_key_handler.hpp>
-#include <vm_websocket.hpp>
-#include <webassets.hpp>
 
 #include <exception>
 #include <memory>