diff --git a/http/http_client.hpp b/http/http_client.hpp
index ae8bfeb..cceb007 100644
--- a/http/http_client.hpp
+++ b/http/http_client.hpp
@@ -14,6 +14,10 @@
 // limitations under the License.
 */
 #pragma once
+
+#include "async_resolve.hpp"
+#include "http_response.hpp"
+
 #include <boost/asio/connect.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/address.hpp>
@@ -33,8 +37,6 @@
 #include <boost/beast/version.hpp>
 #include <boost/container/devector.hpp>
 #include <boost/system/error_code.hpp>
-#include <http/http_response.hpp>
-#include <include/async_resolve.hpp>
 #include <logging.hpp>
 #include <ssl_key_handler.hpp>
 
diff --git a/include/ibm/locks.hpp b/include/ibm/locks.hpp
index 7cd8037..e713f97 100644
--- a/include/ibm/locks.hpp
+++ b/include/ibm/locks.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
+#include "ibm/utils.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/endian/conversion.hpp>
-#include <include/ibm/utils.hpp>
 #include <logging.hpp>
 #include <nlohmann/json.hpp>
 
diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index e102b7b..7f3b43a 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -19,6 +19,7 @@
 #include "registries/base_message_registry.hpp"
 #include "registries/openbmc_message_registry.hpp"
 #include "registries/task_event_message_registry.hpp"
+#include "utility.hpp"
 
 #include <sys/inotify.h>
 
@@ -29,7 +30,6 @@
 #include <dbus_utility.hpp>
 #include <error_messages.hpp>
 #include <event_service_store.hpp>
-#include <http/utility.hpp>
 #include <http_client.hpp>
 #include <persistent_data.hpp>
 #include <random.hpp>
diff --git a/test/include/multipart_test.cpp b/test/include/multipart_test.cpp
index f29bcfe..38ac53d 100644
--- a/test/include/multipart_test.cpp
+++ b/test/include/multipart_test.cpp
@@ -1,4 +1,4 @@
-#include "http/http_request.hpp"
+#include "http_request.hpp"
 #include "multipart_parser.hpp"
 
 #include <boost/beast/http/fields.hpp>
diff --git a/test/redfish-core/lib/log_services_dump_test.cpp b/test/redfish-core/lib/log_services_dump_test.cpp
index 192b79d..5258309 100644
--- a/test/redfish-core/lib/log_services_dump_test.cpp
+++ b/test/redfish-core/lib/log_services_dump_test.cpp
@@ -1,8 +1,8 @@
 #include "app.hpp"
+#include "async_resp.hpp"
 #include "event_service_manager.hpp"
-#include "include/async_resp.hpp"
-#include "redfish-core/lib/health.hpp"
-#include "redfish-core/lib/log_services.hpp"
+#include "health.hpp"
+#include "log_services.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/test/redfish-core/lib/service_root_test.cpp b/test/redfish-core/lib/service_root_test.cpp
index 661f157..1f50100 100644
--- a/test/redfish-core/lib/service_root_test.cpp
+++ b/test/redfish-core/lib/service_root_test.cpp
@@ -1,7 +1,7 @@
 #include "bmcweb_config.h"
 
+#include "async_resp.hpp"
 #include "http_response.hpp"
-#include "include/async_resp.hpp"
 #include "nlohmann/json.hpp"
 #include "service_root.hpp"
 
diff --git a/test/redfish-core/lib/thermal_subsystem_test.cpp b/test/redfish-core/lib/thermal_subsystem_test.cpp
index c688023..88747a2 100644
--- a/test/redfish-core/lib/thermal_subsystem_test.cpp
+++ b/test/redfish-core/lib/thermal_subsystem_test.cpp
@@ -1,4 +1,4 @@
-#include "include/async_resp.hpp"
+#include "async_resp.hpp"
 #include "thermal_subsystem.hpp"
 
 #include <nlohmann/json.hpp>