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