diff --git a/include/authorization.hpp b/include/authorization.hpp
index 997e504..0ccd1e5 100644
--- a/include/authorization.hpp
+++ b/include/authorization.hpp
@@ -2,13 +2,12 @@
 
 #include "webroutes.hpp"
 
-#include <app.h>
-#include <common.h>
-#include <http_request.h>
-#include <http_response.h>
-
+#include <app.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_set.hpp>
+#include <common.hpp>
+#include <http_request.hpp>
+#include <http_response.hpp>
 #include <http_utility.hpp>
 #include <pam_authenticate.hpp>
 
diff --git a/include/cors_preflight.hpp b/include/cors_preflight.hpp
index 6fa9c0a..0a5c3cc 100644
--- a/include/cors_preflight.hpp
+++ b/include/cors_preflight.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <app.h>
-#include <http_request.h>
-#include <http_response.h>
+#include <app.hpp>
+#include <http_request.hpp>
+#include <http_response.hpp>
 
 namespace cors_preflight
 {
diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp
index 089df76..aeab103 100644
--- a/include/dbus_monitor.hpp
+++ b/include/dbus_monitor.hpp
@@ -1,7 +1,5 @@
 #pragma once
-#include <app.h>
-#include <websocket.h>
-
+#include <app.hpp>
 #include <async_resp.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
@@ -9,6 +7,7 @@
 #include <openbmc_dbus_rest.hpp>
 #include <sdbusplus/bus/match.hpp>
 #include <sdbusplus/message/types.hpp>
+#include <websocket.hpp>
 
 #include <variant>
 
diff --git a/include/http_utility.hpp b/include/http_utility.hpp
index d282a28..119a1ee 100644
--- a/include/http_utility.hpp
+++ b/include/http_utility.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "http_request.h"
+#include "http_request.hpp"
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/include/ibm/locks.hpp b/include/ibm/locks.hpp
index 201085f..a8513f6 100644
--- a/include/ibm/locks.hpp
+++ b/include/ibm/locks.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <logging.h>
-
 #include <boost/algorithm/string.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/endian/conversion.hpp>
+#include <logging.hpp>
 #include <nlohmann/json.hpp>
 
 #include <filesystem>
diff --git a/include/ibm/management_console_rest.hpp b/include/ibm/management_console_rest.hpp
index b0e57ed..3612b4f 100644
--- a/include/ibm/management_console_rest.hpp
+++ b/include/ibm/management_console_rest.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include <app.h>
 #include <tinyxml2.h>
 
+#include <app.hpp>
 #include <async_resp.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/include/image_upload.hpp b/include/image_upload.hpp
index 25b4f2a..df6f56c 100644
--- a/include/image_upload.hpp
+++ b/include/image_upload.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <app.h>
-
+#include <app.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp
index 477582a..8bc955d 100644
--- a/include/kvm_websocket.hpp
+++ b/include/kvm_websocket.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include <app.h>
 #include <sys/socket.h>
-#include <websocket.h>
 
+#include <app.hpp>
 #include <async_resp.hpp>
 #include <boost/container/flat_map.hpp>
+#include <websocket.hpp>
 
 namespace crow
 {
diff --git a/include/login_routes.hpp b/include/login_routes.hpp
index 55a240e..1f7b35a 100644
--- a/include/login_routes.hpp
+++ b/include/login_routes.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
-#include <app.h>
-#include <common.h>
-#include <http_request.h>
-#include <http_response.h>
-
+#include <app.hpp>
 #include <boost/container/flat_set.hpp>
+#include <common.hpp>
+#include <http_request.hpp>
+#include <http_response.hpp>
 #include <pam_authenticate.hpp>
 #include <webassets.hpp>
 
diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp
index e2ebba1..7ad80a6 100644
--- a/include/nbd_proxy.hpp
+++ b/include/nbd_proxy.hpp
@@ -14,9 +14,7 @@
 // limitations under the License.
 */
 #pragma once
-#include <app.h>
-#include <websocket.h>
-
+#include <app.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/local/stream_protocol.hpp>
 #include <boost/asio/write.hpp>
@@ -25,6 +23,7 @@
 #include <boost/container/flat_map.hpp>
 #include <dbus_utility.hpp>
 #include <privileges.hpp>
+#include <websocket.hpp>
 
 #include <variant>
 
diff --git a/include/obmc_console.hpp b/include/obmc_console.hpp
index 020ef91..645ea8c 100644
--- a/include/obmc_console.hpp
+++ b/include/obmc_console.hpp
@@ -1,12 +1,12 @@
 #pragma once
-#include <app.h>
 #include <sys/socket.h>
-#include <websocket.h>
 
+#include <app.hpp>
 #include <async_resp.hpp>
 #include <boost/asio/local/stream_protocol.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
+#include <websocket.hpp>
 
 namespace crow
 {
diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index 01c70e2..a369ef2 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #pragma once
-#include <app.h>
 #include <tinyxml2.h>
 
+#include <app.hpp>
 #include <async_resp.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/include/persistent_data.hpp b/include/persistent_data.hpp
index 038fcc6..19c424a 100644
--- a/include/persistent_data.hpp
+++ b/include/persistent_data.hpp
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <app.h>
-#include <http_request.h>
-#include <http_response.h>
-
+#include <app.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
+#include <http_request.hpp>
+#include <http_response.hpp>
 #include <nlohmann/json.hpp>
 #include <pam_authenticate.hpp>
 #include <sessions.hpp>
diff --git a/include/redfish_v1.hpp b/include/redfish_v1.hpp
index 1e4bd65..4230b5f 100644
--- a/include/redfish_v1.hpp
+++ b/include/redfish_v1.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <app.h>
+#include <app.hpp>
 
 namespace crow
 {
diff --git a/include/security_headers.hpp b/include/security_headers.hpp
index cf845c1..13ec893 100644
--- a/include/security_headers.hpp
+++ b/include/security_headers.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <http_response.h>
+#include <http_response.hpp>
 
 inline void addSecurityHeaders(crow::Response& res)
 {
diff --git a/include/sessions.hpp b/include/sessions.hpp
index dc6ac1f..7cdb82a 100644
--- a/include/sessions.hpp
+++ b/include/sessions.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "logging.h"
-#include "utility.h"
-
+#include "logging.hpp"
 #include "random.hpp"
+#include "utility.hpp"
 
 #include <openssl/rand.h>
 
diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp
index 3d8abe4..a175f0a 100644
--- a/include/vm_websocket.hpp
+++ b/include/vm_websocket.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <app.h>
-#include <websocket.h>
-
+#include <app.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/process.hpp>
+#include <websocket.hpp>
 
 #include <csignal>
 
diff --git a/include/webassets.hpp b/include/webassets.hpp
index c2a6851..3703c30 100644
--- a/include/webassets.hpp
+++ b/include/webassets.hpp
@@ -2,13 +2,12 @@
 
 #include "webroutes.hpp"
 
-#include <app.h>
-#include <http_request.h>
-#include <http_response.h>
-#include <routing.h>
-
+#include <app.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_set.hpp>
+#include <http_request.hpp>
+#include <http_response.hpp>
+#include <routing.hpp>
 
 #include <filesystem>
 #include <fstream>