diff --git a/test/http/crow_getroutes_test.cpp b/test/http/crow_getroutes_test.cpp
index e5c9d6e..0c3f8de 100644
--- a/test/http/crow_getroutes_test.cpp
+++ b/test/http/crow_getroutes_test.cpp
@@ -1,7 +1,6 @@
 #include "app.hpp"
-#include "routing.hpp"
-
-#include <boost/beast/http/status.hpp>
+#include "async_resp.hpp"
+#include "http_request.hpp"
 
 #include <memory>
 
diff --git a/test/http/http2_connection_test.cpp b/test/http/http2_connection_test.cpp
index 7d6572c..dc71ef3 100644
--- a/test/http/http2_connection_test.cpp
+++ b/test/http/http2_connection_test.cpp
@@ -1,13 +1,21 @@
+#include "async_resp.hpp"
 #include "http/http2_connection.hpp"
 #include "http/http_request.hpp"
 #include "http/http_response.hpp"
 
+#include <nghttp2/nghttp2.h>
+#include <unistd.h>
+
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/impl/write.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/beast/_experimental/test/stream.hpp>
+#include <boost/beast/http/field.hpp>
 
 #include <bit>
-#include <filesystem>
-#include <fstream>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/test/http/http_body_test.cpp b/test/http/http_body_test.cpp
index 6367cf9..0983c1d 100644
--- a/test/http/http_body_test.cpp
+++ b/test/http/http_body_test.cpp
@@ -1,11 +1,15 @@
 #include "file_test_utilities.hpp"
 #include "http_body.hpp"
 
+#include <boost/beast/core/file_base.hpp>
 #include <boost/system/error_code.hpp>
 
 #include <array>
+#include <cstddef>
+#include <cstdio>
 #include <span>
 #include <string>
+#include <utility>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
diff --git a/test/http/http_connection_test.cpp b/test/http/http_connection_test.cpp
index 6647e61..4dda70e 100644
--- a/test/http/http_connection_test.cpp
+++ b/test/http/http_connection_test.cpp
@@ -1,15 +1,20 @@
+#include "async_resp.hpp"
 #include "http/http_connection.hpp"
 #include "http/http_request.hpp"
 #include "http/http_response.hpp"
 
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/beast/_experimental/test/stream.hpp>
+#include <boost/beast/http/field.hpp>
+#include <boost/beast/http/verb.hpp>
 
-#include <filesystem>
-#include <fstream>
+#include <chrono>
 #include <functional>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "gtest/gtest.h"
 namespace crow
diff --git a/test/http/http_response_test.cpp b/test/http/http_response_test.cpp
index 457cd7a..d0836a2 100644
--- a/test/http/http_response_test.cpp
+++ b/test/http/http_response_test.cpp
@@ -1,13 +1,18 @@
 #include "boost/beast/core/buffers_to_string.hpp"
-#include "boost/beast/core/flat_buffer.hpp"
 #include "boost/beast/http/serializer.hpp"
 #include "file_test_utilities.hpp"
 #include "http/http_body.hpp"
 #include "http/http_response.hpp"
+#include "utility.hpp"
 
+#include <boost/beast/core/file_base.hpp>
+#include <boost/beast/core/file_posix.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/status.hpp>
+
+#include <cstdio>
 #include <filesystem>
-#include <fstream>
-#include <thread>
+#include <string>
 
 #include "gtest/gtest.h"
 namespace
diff --git a/test/http/mutual_tls.cpp b/test/http/mutual_tls.cpp
index 7b5cb25..be8b651 100644
--- a/test/http/mutual_tls.cpp
+++ b/test/http/mutual_tls.cpp
@@ -1,8 +1,20 @@
 #include "mutual_tls.hpp"
 
+#include "sessions.hpp"
+
+#include <openssl/asn1.h>
+#include <openssl/ec.h>
+#include <openssl/evp.h>
+#include <openssl/obj_mac.h>
+#include <openssl/types.h>
+#include <openssl/x509.h>
+#include <openssl/x509_vfy.h>
+#include <openssl/x509v3.h>
+
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ssl/verify_context.hpp>
 
+#include <array>
 #include <memory>
 
 #include <gmock/gmock.h>
diff --git a/test/http/mutual_tls_meta.cpp b/test/http/mutual_tls_meta.cpp
index 5f32cb5..0e280c1 100644
--- a/test/http/mutual_tls_meta.cpp
+++ b/test/http/mutual_tls_meta.cpp
@@ -1,5 +1,9 @@
 #include "http/mutual_tls_meta.hpp"
 
+#include <optional>
+#include <string>
+#include <vector>
+
 #include <gtest/gtest.h> // IWYU pragma: keep
 
 namespace redfish
diff --git a/test/http/server_sent_event_test.cpp b/test/http/server_sent_event_test.cpp
index d3f9403..3e740cb 100644
--- a/test/http/server_sent_event_test.cpp
+++ b/test/http/server_sent_event_test.cpp
@@ -1,15 +1,15 @@
 #include "boost/asio/read.hpp"
-#include "boost/asio/read_until.hpp"
-#include "http/http_request.hpp"
-#include "http/http_response.hpp"
 #include "http/server_sent_event.hpp"
 
-#include <boost/asio/steady_timer.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/beast/_experimental/test/stream.hpp>
 
+#include <chrono>
 #include <memory>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include "gtest/gtest.h"
 namespace crow
diff --git a/test/http/utility_test.cpp b/test/http/utility_test.cpp
index c0b6412..20af871 100644
--- a/test/http/utility_test.cpp
+++ b/test/http/utility_test.cpp
@@ -1,16 +1,16 @@
-#include "bmcweb_config.h"
 
 #include "utility.hpp"
 
-#include <boost/url/error.hpp>
+#include <bits/basic_string.h>
+
+#include <boost/system/result.hpp>
+#include <boost/url/parse.hpp>
 #include <boost/url/url.hpp>
 #include <boost/url/url_view.hpp>
-#include <nlohmann/json.hpp>
 
-#include <cstdint>
+#include <algorithm>
 #include <ctime>
 #include <functional>
-#include <limits>
 #include <string>
 #include <string_view>