diff --git a/http/app.h b/http/app.hpp
similarity index 97%
rename from http/app.h
rename to http/app.hpp
index 39829cb..9a4eb20 100644
--- a/http/app.h
+++ b/http/app.hpp
@@ -1,12 +1,11 @@
 #pragma once
 
-#include "http_request.h"
-#include "http_server.h"
-#include "logging.h"
-#include "routing.h"
-#include "utility.h"
-
+#include "http_request.hpp"
+#include "http_server.hpp"
+#include "logging.hpp"
 #include "privileges.hpp"
+#include "routing.hpp"
+#include "utility.hpp"
 
 #include <chrono>
 #include <cstdint>
diff --git a/http/common.h b/http/common.hpp
similarity index 98%
rename from http/common.h
rename to http/common.hpp
index 95cc763..6f6b24c 100644
--- a/http/common.h
+++ b/http/common.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "utility.h"
+#include "utility.hpp"
 
 #include <boost/beast/http/verb.hpp>
 
diff --git a/http/http_connection.h b/http/http_connection.hpp
similarity index 99%
rename from http/http_connection.h
rename to http/http_connection.hpp
index 8aaabcd..302d19b 100644
--- a/http/http_connection.h
+++ b/http/http_connection.hpp
@@ -1,13 +1,12 @@
 #pragma once
 #include "config.h"
 
-#include "http_response.h"
-#include "logging.h"
-#include "timer_queue.h"
-#include "utility.h"
-
 #include "authorization.hpp"
+#include "http_response.hpp"
 #include "http_utility.hpp"
+#include "logging.hpp"
+#include "timer_queue.hpp"
+#include "utility.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/http/http_request.h b/http/http_request.hpp
similarity index 98%
rename from http/http_request.h
rename to http/http_request.hpp
index c3e497f..d9d6cf7 100644
--- a/http/http_request.h
+++ b/http/http_request.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "common.h"
-
+#include "common.hpp"
 #include "sessions.hpp"
 
 #include <boost/asio/io_context.hpp>
diff --git a/http/http_response.h b/http/http_response.hpp
similarity index 97%
rename from http/http_response.h
rename to http/http_response.hpp
index c8f05ab..b521b20 100644
--- a/http/http_response.h
+++ b/http/http_response.hpp
@@ -1,7 +1,6 @@
 #pragma once
-#include "http_request.h"
-#include "logging.h"
-
+#include "http_request.hpp"
+#include "logging.hpp"
 #include "nlohmann/json.hpp"
 
 #include <boost/beast/http/message.hpp>
diff --git a/http/http_server.h b/http/http_server.hpp
similarity index 98%
rename from http/http_server.h
rename to http/http_server.hpp
index 0ca7dea..0be487f 100644
--- a/http/http_server.h
+++ b/http/http_server.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "http_connection.h"
-#include "logging.h"
-#include "timer_queue.h"
+#include "http_connection.hpp"
+#include "logging.hpp"
+#include "timer_queue.hpp"
 
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/tcp.hpp>
diff --git a/http/logging.h b/http/logging.hpp
similarity index 100%
rename from http/logging.h
rename to http/logging.hpp
diff --git a/http/routing.h b/http/routing.hpp
similarity index 99%
rename from http/routing.h
rename to http/routing.hpp
index 59fa636..9c6a15b 100644
--- a/http/routing.h
+++ b/http/routing.hpp
@@ -1,15 +1,14 @@
 #pragma once
 
-#include "common.h"
-#include "http_request.h"
-#include "http_response.h"
-#include "logging.h"
-#include "utility.h"
-#include "websocket.h"
-
+#include "common.hpp"
 #include "error_messages.hpp"
+#include "http_request.hpp"
+#include "http_response.hpp"
+#include "logging.hpp"
 #include "privileges.hpp"
 #include "sessions.hpp"
+#include "utility.hpp"
+#include "websocket.hpp"
 
 #include <async_resp.hpp>
 #include <boost/container/flat_map.hpp>
diff --git a/http/timer_queue.h b/http/timer_queue.hpp
similarity index 98%
rename from http/timer_queue.h
rename to http/timer_queue.hpp
index 85791ea..5baf7be 100644
--- a/http/timer_queue.h
+++ b/http/timer_queue.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logging.h"
+#include "logging.hpp"
 
 #include <boost/circular_buffer.hpp>
 #include <boost/circular_buffer/space_optimized.hpp>
diff --git a/http/ut/utility_test.cpp b/http/ut/utility_test.cpp
index 0f40756..a81adf5 100644
--- a/http/ut/utility_test.cpp
+++ b/http/ut/utility_test.cpp
@@ -1,4 +1,4 @@
-#include "utility.h"
+#include "utility.hpp"
 
 #include "gmock/gmock.h"
 
diff --git a/http/utility.h b/http/utility.hpp
similarity index 100%
rename from http/utility.h
rename to http/utility.hpp
diff --git a/http/websocket.h b/http/websocket.hpp
similarity index 99%
rename from http/websocket.h
rename to http/websocket.hpp
index 021fffa..f5c2a7a 100644
--- a/http/websocket.h
+++ b/http/websocket.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "http_request.h"
+#include "http_request.hpp"
 
 #include <async_resp.hpp>
 #include <boost/algorithm/string/predicate.hpp>
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>
diff --git a/redfish-core/include/error_messages.hpp b/redfish-core/include/error_messages.hpp
index 0b9fad1..7dfdc80 100644
--- a/redfish-core/include/error_messages.hpp
+++ b/redfish-core/include/error_messages.hpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 */
 #pragma once
-#include "http_response.h"
+#include "http_response.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/redfish-core/include/node.hpp b/redfish-core/include/node.hpp
index 9863794..47c5cc6 100644
--- a/redfish-core/include/node.hpp
+++ b/redfish-core/include/node.hpp
@@ -15,9 +15,8 @@
 */
 #pragma once
 
-#include "http_request.h"
-#include "http_response.h"
-
+#include "http_request.hpp"
+#include "http_response.hpp"
 #include "privileges.hpp"
 
 #include <error_messages.hpp>
diff --git a/redfish-core/include/privileges.hpp b/redfish-core/include/privileges.hpp
index c3a88d5..e9a24f7 100644
--- a/redfish-core/include/privileges.hpp
+++ b/redfish-core/include/privileges.hpp
@@ -15,10 +15,9 @@
 */
 #pragma once
 
-#include <logging.h>
-
 #include <boost/beast/http/verb.hpp>
 #include <boost/container/flat_map.hpp>
+#include <logging.hpp>
 
 #include <array>
 #include <bitset>
diff --git a/redfish-core/include/utils/json_utils.hpp b/redfish-core/include/utils/json_utils.hpp
index 7bd8bb8..c355000 100644
--- a/redfish-core/include/utils/json_utils.hpp
+++ b/redfish-core/include/utils/json_utils.hpp
@@ -15,10 +15,9 @@
 */
 #pragma once
 
-#include <http_request.h>
-#include <http_response.h>
-
 #include <error_messages.hpp>
+#include <http_request.hpp>
+#include <http_response.hpp>
 #include <nlohmann/json.hpp>
 
 #include <bitset>
diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp
index 21892ee..f10a4a1 100644
--- a/redfish-core/src/error_messages.cpp
+++ b/redfish-core/src/error_messages.cpp
@@ -13,9 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-#include <logging.h>
-
 #include <error_messages.hpp>
+#include <logging.hpp>
 
 namespace redfish
 {
diff --git a/src/crow_getroutes_test.cpp b/src/crow_getroutes_test.cpp
index 20c14ea..eea045c 100644
--- a/src/crow_getroutes_test.cpp
+++ b/src/crow_getroutes_test.cpp
@@ -1,4 +1,4 @@
-#include <app.h>
+#include <app.hpp>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -44,4 +44,4 @@
                                      testing::Pointee(std::string("/baz")),
                                      testing::Pointee(std::string("/boo")),
                                      testing::Pointee(std::string("/moo"))));
-}
\ No newline at end of file
+}
diff --git a/src/security_headers_middleware_test.cpp b/src/security_headers_middleware_test.cpp
index 500839a..f5cd3d5 100644
--- a/src/security_headers_middleware_test.cpp
+++ b/src/security_headers_middleware_test.cpp
@@ -1,5 +1,4 @@
-#include <app.h>
-
+#include <app.hpp>
 #include <security_headers_middleware.hpp>
 
 #include <gmock/gmock.h>
diff --git a/src/webassets_test.cpp b/src/webassets_test.cpp
index 48dc398..b182f46 100644
--- a/src/webassets_test.cpp
+++ b/src/webassets_test.cpp
@@ -1,5 +1,4 @@
-#include <app.h>
-
+#include <app.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/lexical_cast.hpp>
 #include <gzip_helper.hpp>
diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index cd31152..3e796c2 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -1,6 +1,6 @@
-#include <app.h>
 #include <systemd/sd-daemon.h>
 
+#include <app.hpp>
 #include <boost/asio/io_context.hpp>
 #include <dbus_monitor.hpp>
 #include <dbus_singleton.hpp>