diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index d2a4a74..7da9100 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -14,12 +14,20 @@
 // limitations under the License.
 */
 #pragma once
+#include "dbus_utility.hpp"
+#include "error_messages.hpp"
+#include "event_service_store.hpp"
+#include "http_client.hpp"
 #include "metric_report.hpp"
+#include "persistent_data.hpp"
+#include "random.hpp"
 #include "registries.hpp"
 #include "registries/base_message_registry.hpp"
 #include "registries/openbmc_message_registry.hpp"
 #include "registries/task_event_message_registry.hpp"
+#include "server_sent_events.hpp"
 #include "utility.hpp"
+#include "utils/json_utils.hpp"
 
 #include <sys/inotify.h>
 
@@ -27,15 +35,7 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/container/flat_map.hpp>
-#include <dbus_utility.hpp>
-#include <error_messages.hpp>
-#include <event_service_store.hpp>
-#include <http_client.hpp>
-#include <persistent_data.hpp>
-#include <random.hpp>
 #include <sdbusplus/bus/match.hpp>
-#include <server_sent_events.hpp>
-#include <utils/json_utils.hpp>
 
 #include <cstdlib>
 #include <ctime>
diff --git a/redfish-core/include/gzfile.hpp b/redfish-core/include/gzfile.hpp
index a77c6ab..844932a 100644
--- a/redfish-core/include/gzfile.hpp
+++ b/redfish-core/include/gzfile.hpp
@@ -1,9 +1,12 @@
 #pragma once
 
+#include "logging.hpp"
+
 #include <zlib.h>
 
 #include <array>
 #include <filesystem>
+#include <string>
 #include <vector>
 
 class GzFileReader
diff --git a/redfish-core/include/query.hpp b/redfish-core/include/query.hpp
index f9386da..0fa6c18 100644
--- a/redfish-core/include/query.hpp
+++ b/redfish-core/include/query.hpp
@@ -27,7 +27,7 @@
 // IWYU pragma: no_include <boost/url/impl/params_view.hpp>
 // IWYU pragma: no_include <boost/url/impl/url_view.hpp>
 
-#include <redfish_aggregator.hpp>
+#include "redfish_aggregator.hpp"
 
 namespace redfish
 {
diff --git a/redfish-core/include/redfish_aggregator.hpp b/redfish-core/include/redfish_aggregator.hpp
index bd56d68..8923fdd 100644
--- a/redfish-core/include/redfish_aggregator.hpp
+++ b/redfish-core/include/redfish_aggregator.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <aggregation_utils.hpp>
+#include "aggregation_utils.hpp"
+#include "dbus_utility.hpp"
+#include "error_messages.hpp"
+#include "http_client.hpp"
+#include "http_connection.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
-#include <dbus_utility.hpp>
-#include <error_messages.hpp>
-#include <http_client.hpp>
-#include <http_connection.hpp>
 
 #include <array>
 
diff --git a/redfish-core/include/resource_messages.hpp b/redfish-core/include/resource_messages.hpp
index 0b0773e..3153935 100644
--- a/redfish-core/include/resource_messages.hpp
+++ b/redfish-core/include/resource_messages.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "registries/resource_event_message_registry.hpp"
+
 #include <nlohmann/json.hpp>
-#include <registries/resource_event_message_registry.hpp>
 
 namespace redfish
 {
diff --git a/redfish-core/include/server_sent_events.hpp b/redfish-core/include/server_sent_events.hpp
index a92fb7e..fcc6531 100644
--- a/redfish-core/include/server_sent_events.hpp
+++ b/redfish-core/include/server_sent_events.hpp
@@ -16,9 +16,15 @@
 */
 #pragma once
 
+#include "logging.hpp"
+
+#include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/beast/http/buffer_body.hpp>
 #include <boost/beast/http/message.hpp>
+#include <boost/beast/http/read.hpp>
+#include <boost/beast/http/serializer.hpp>
+#include <boost/beast/http/write.hpp>
 #include <boost/beast/version.hpp>
 
 #include <cstdlib>
diff --git a/redfish-core/include/utils/chassis_utils.hpp b/redfish-core/include/utils/chassis_utils.hpp
index 33e8bb7..9c7c7db 100644
--- a/redfish-core/include/utils/chassis_utils.hpp
+++ b/redfish-core/include/utils/chassis_utils.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "async_resp.hpp"
 #include "dbus_utility.hpp"
-
-#include <async_resp.hpp>
+#include "error_messages.hpp"
 
 #include <array>
 #include <string_view>
diff --git a/redfish-core/include/utils/collection.hpp b/redfish-core/include/utils/collection.hpp
index b66ab5d..f2f0669 100644
--- a/redfish-core/include/utils/collection.hpp
+++ b/redfish-core/include/utils/collection.hpp
@@ -1,8 +1,13 @@
 #pragma once
 
+#include "async_resp.hpp"
 #include "dbus_utility.hpp"
+#include "error_messages.hpp"
+#include "http/utility.hpp"
+#include "human_sort.hpp"
 
-#include <human_sort.hpp>
+#include <boost/url/url.hpp>
+#include <nlohmann/json.hpp>
 
 #include <span>
 #include <string>
diff --git a/redfish-core/include/utils/sw_utils.hpp b/redfish-core/include/utils/sw_utils.hpp
index e2b90ca..67cb115 100644
--- a/redfish-core/include/utils/sw_utils.hpp
+++ b/redfish-core/include/utils/sw_utils.hpp
@@ -1,10 +1,12 @@
 #pragma once
-#include <async_resp.hpp>
-#include <dbus_utility.hpp>
-#include <generated/enums/resource.hpp>
+#include "async_resp.hpp"
+#include "dbus_utility.hpp"
+#include "error_messages.hpp"
+#include "generated/enums/resource.hpp"
+#include "utils/dbus_utils.hpp"
+
 #include <sdbusplus/asio/property.hpp>
 #include <sdbusplus/unpack_properties.hpp>
-#include <utils/dbus_utils.hpp>
 
 #include <algorithm>
 #include <string>
diff --git a/redfish-core/include/utils/systemd_utils.hpp b/redfish-core/include/utils/systemd_utils.hpp
index ad157dc..4757283 100644
--- a/redfish-core/include/utils/systemd_utils.hpp
+++ b/redfish-core/include/utils/systemd_utils.hpp
@@ -17,6 +17,9 @@
 
 #include <systemd/sd-id128.h>
 
+#include <array>
+#include <string>
+
 namespace redfish
 {
 
diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp
index 71e7449..f5f9360 100644
--- a/redfish-core/include/utils/telemetry_utils.hpp
+++ b/redfish-core/include/utils/telemetry_utils.hpp
@@ -1,8 +1,16 @@
 #pragma once
 
 #include "dbus_utility.hpp"
+#include "http/utility.hpp"
+#include "logging.hpp"
 #include "utility.hpp"
 
+#include <boost/container/flat_map.hpp>
+#include <boost/container/flat_set.hpp>
+#include <sdbusplus/message/native_types.hpp>
+
+#include <string>
+
 namespace redfish
 {