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)
 {