diff --git a/http/mutual_tls.cpp b/http/mutual_tls.cpp
index ec00de2..5ccf722 100644
--- a/http/mutual_tls.cpp
+++ b/http/mutual_tls.cpp
@@ -1,13 +1,23 @@
 #include "mutual_tls.hpp"
 
+#include "sessions.hpp"
+
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <string>
+
 extern "C"
 {
+#include <openssl/obj_mac.h>
+#include <openssl/types.h>
+#include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
+#include <openssl/x509v3.h>
 }
 
 #include "logging.hpp"
 #include "mutual_tls_meta.hpp"
-#include "persistent_data.hpp"
 
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ssl/verify_context.hpp>
diff --git a/http/server_sent_event.hpp b/http/server_sent_event.hpp
index cfc5dfb..76d10c0 100644
--- a/http/server_sent_event.hpp
+++ b/http/server_sent_event.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include "boost_formatters.hpp"
 #include "http_body.hpp"
 #include "http_request.hpp"
 #include "http_response.hpp"
diff --git a/redfish-core/include/filter_expr_parser_ast.hpp b/redfish-core/include/filter_expr_parser_ast.hpp
index b27dbb4..a9303fe 100644
--- a/redfish-core/include/filter_expr_parser_ast.hpp
+++ b/redfish-core/include/filter_expr_parser_ast.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include <boost/fusion/include/adapt_struct.hpp>
-#include <boost/spirit/home/x3.hpp>
 #include <boost/spirit/home/x3/support/ast/variant.hpp>
 
 #include <iostream>
diff --git a/redfish-core/src/filter_expr_executor.cpp b/redfish-core/src/filter_expr_executor.cpp
index a1accaf..441b4bb 100644
--- a/redfish-core/src/filter_expr_executor.cpp
+++ b/redfish-core/src/filter_expr_executor.cpp
@@ -5,6 +5,17 @@
 #include "logging.hpp"
 #include "utils/time_utils.hpp"
 
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <variant>
+
 namespace redfish
 {
 
diff --git a/redfish-core/src/filter_expr_printer.cpp b/redfish-core/src/filter_expr_printer.cpp
index 946f17c..32b4e6f 100644
--- a/redfish-core/src/filter_expr_printer.cpp
+++ b/redfish-core/src/filter_expr_printer.cpp
@@ -4,11 +4,16 @@
 #include "filter_expr_parser_grammar.hpp"
 #include "logging.hpp"
 
-#include <iostream>
+#include <boost/spirit/home/x3/char/char_class.hpp>
+#include <boost/spirit/home/x3/core/parse.hpp>
+
+#include <cstdint>
+#include <format>
 #include <list>
-#include <numeric>
 #include <optional>
 #include <string>
+#include <string_view>
+#include <utility>
 
 namespace redfish
 {
diff --git a/src/ossl_random.cpp b/src/ossl_random.cpp
index 487f986..eff4738 100644
--- a/src/ossl_random.cpp
+++ b/src/ossl_random.cpp
@@ -1,5 +1,11 @@
 #include "ossl_random.hpp"
 
+#include "logging.hpp"
+
+#include <cstddef>
+#include <cstdint>
+#include <string_view>
+
 extern "C"
 {
 #include <openssl/crypto.h>
diff --git a/src/ssl_key_handler.cpp b/src/ssl_key_handler.cpp
index 705d687..e967e96 100644
--- a/src/ssl_key_handler.cpp
+++ b/src/ssl_key_handler.cpp
@@ -4,22 +4,35 @@
 
 #include "logging.hpp"
 #include "ossl_random.hpp"
-#include "persistent_data.hpp"
+#include "sessions.hpp"
 
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/ssl/verify_mode.hpp>
+#include <boost/beast/core/file_base.hpp>
 #include <boost/beast/core/file_posix.hpp>
 
+#include <bit>
+#include <cstddef>
+#include <limits>
+#include <system_error>
+#include <utility>
+
 extern "C"
 {
 #include <nghttp2/nghttp2.h>
+#include <openssl/asn1.h>
 #include <openssl/bio.h>
-#include <openssl/dh.h>
-#include <openssl/dsa.h>
+#include <openssl/ec.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#include <openssl/obj_mac.h>
 #include <openssl/pem.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
 #include <openssl/ssl.h>
+#include <openssl/tls1.h>
+#include <openssl/types.h>
+#include <openssl/x509.h>
+#include <openssl/x509_vfy.h>
+#include <openssl/x509v3.h>
 }
 
 #include <boost/asio/ssl/context.hpp>
diff --git a/src/webserver_cli.cpp b/src/webserver_cli.cpp
index 546e40a..821d592 100644
--- a/src/webserver_cli.cpp
+++ b/src/webserver_cli.cpp
@@ -4,8 +4,8 @@
 #include <CLI/CLI.hpp>
 #include <boost/asio/io_context.hpp>
 #include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/bus.hpp>
 
+#include <memory>
 #include <string>
 
 // Override default log option:
diff --git a/src/webserver_run.cpp b/src/webserver_run.cpp
index 9079ad6..b037860 100644
--- a/src/webserver_run.cpp
+++ b/src/webserver_run.cpp
@@ -25,7 +25,10 @@
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 
+#include <algorithm>
 #include <memory>
+#include <string>
+#include <string_view>
 
 static void setLogLevel(const std::string& logLevel)
 {
diff --git a/test/http/server_sent_event_test.cpp b/test/http/server_sent_event_test.cpp
index 4d86f56..13ae7f1 100644
--- a/test/http/server_sent_event_test.cpp
+++ b/test/http/server_sent_event_test.cpp
@@ -1,5 +1,5 @@
-#include "boost_formatters.hpp"
 #include "http/server_sent_event.hpp"
+#include "http_request.hpp"
 
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_context.hpp>
diff --git a/test/include/credential_pipe_test.cpp b/test/include/credential_pipe_test.cpp
index 3a750b4..ac51d29 100644
--- a/test/include/credential_pipe_test.cpp
+++ b/test/include/credential_pipe_test.cpp
@@ -1,7 +1,6 @@
 #include "credential_pipe.hpp"
 
-#include <unistd.h>
-
+#include <boost/asio/buffer.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/read.hpp>
 #include <boost/asio/readable_pipe.hpp>
diff --git a/test/include/ssl_key_handler_test.cpp b/test/include/ssl_key_handler_test.cpp
index f60252f..cbaf4f1 100644
--- a/test/include/ssl_key_handler_test.cpp
+++ b/test/include/ssl_key_handler_test.cpp
@@ -1,7 +1,8 @@
 #include "file_test_utilities.hpp"
 #include "ssl_key_handler.hpp"
 
-#include <gmock/gmock.h>
+#include <string>
+
 #include <gtest/gtest.h>
 
 namespace ensuressl
diff --git a/test/redfish-core/include/filter_expr_executor_test.cpp b/test/redfish-core/include/filter_expr_executor_test.cpp
index 5770ce1..c227c5f 100644
--- a/test/redfish-core/include/filter_expr_executor_test.cpp
+++ b/test/redfish-core/include/filter_expr_executor_test.cpp
@@ -2,10 +2,12 @@
 #include "filter_expr_parser_ast.hpp"
 #include "filter_expr_printer.hpp"
 
+#include <nlohmann/json.hpp>
+
 #include <optional>
 #include <string_view>
 
-#include "gmock/gmock.h"
+#include <gtest/gtest.h>
 
 namespace redfish
 {
diff --git a/test/redfish-core/include/filter_expr_parser_test.cpp b/test/redfish-core/include/filter_expr_parser_test.cpp
index 1776028..388885b 100644
--- a/test/redfish-core/include/filter_expr_parser_test.cpp
+++ b/test/redfish-core/include/filter_expr_parser_test.cpp
@@ -4,7 +4,7 @@
 #include <optional>
 #include <string_view>
 
-#include "gmock/gmock.h"
+#include <gtest/gtest.h>
 
 namespace redfish
 {
diff --git a/test/redfish-core/include/utils/sensor_utils_test.cpp b/test/redfish-core/include/utils/sensor_utils_test.cpp
index b6835cb..54c3b9c 100644
--- a/test/redfish-core/include/utils/sensor_utils_test.cpp
+++ b/test/redfish-core/include/utils/sensor_utils_test.cpp
@@ -2,7 +2,6 @@
 
 #include <string>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace redfish::sensor_utils
diff --git a/test/redfish-core/lib/chassis_test.cpp b/test/redfish-core/lib/chassis_test.cpp
index 59e21dd..957b5eb 100644
--- a/test/redfish-core/lib/chassis_test.cpp
+++ b/test/redfish-core/lib/chassis_test.cpp
@@ -5,7 +5,6 @@
 #include "http_response.hpp"
 
 #include <boost/beast/core/string_type.hpp>
-#include <boost/beast/http/message.hpp>
 #include <boost/beast/http/verb.hpp>
 #include <nlohmann/json.hpp>
 
diff --git a/test/redfish-core/lib/metadata_test.cpp b/test/redfish-core/lib/metadata_test.cpp
index 84365ac..d6b5dd7 100644
--- a/test/redfish-core/lib/metadata_test.cpp
+++ b/test/redfish-core/lib/metadata_test.cpp
@@ -1,9 +1,10 @@
 #include "file_test_utilities.hpp"
 #include "metadata.hpp"
 
-#include <string>
+#include <filesystem>
+#include <format>
+#include <string_view>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace redfish
diff --git a/test/redfish-core/lib/service_root_test.cpp b/test/redfish-core/lib/service_root_test.cpp
index 0038096..02e9f20 100644
--- a/test/redfish-core/lib/service_root_test.cpp
+++ b/test/redfish-core/lib/service_root_test.cpp
@@ -6,6 +6,7 @@
 
 #include <nlohmann/json.hpp>
 
+#include <cstddef>
 #include <memory>
 
 #include <gmock/gmock.h> // IWYU pragma: keep