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
 {