diff --git a/src/security/Context.h b/src/security/Context.h
index a2b87782639..641e6b0a417 100644
--- a/src/security/Context.h
+++ b/src/security/Context.h
@@ -13,9 +13,6 @@
 
 #if USE_OPENSSL
 #include "compat/openssl.h"
-#if HAVE_OPENSSL_SSL_H
-#include <openssl/ssl.h>
-#endif
 
 #elif HAVE_LIBGNUTLS
 #if HAVE_GNUTLS_GNUTLS_H
diff --git a/src/security/ServerOptions.h b/src/security/ServerOptions.h
index 9525ea381a1..4915fc08901 100644
--- a/src/security/ServerOptions.h
+++ b/src/security/ServerOptions.h
@@ -13,9 +13,6 @@
 #include "security/PeerOptions.h"
 #if USE_OPENSSL
 #include "compat/openssl.h"
-#if HAVE_OPENSSL_X509_H
-#include <openssl/x509.h>
-#endif
 #endif
 
 namespace Security
diff --git a/src/security/Session.h b/src/security/Session.h
index deda8830435..7fba67ac3a1 100644
--- a/src/security/Session.h
+++ b/src/security/Session.h
@@ -18,9 +18,6 @@
 
 #if USE_OPENSSL
 #include "compat/openssl.h"
-#if HAVE_OPENSSL_SSL_H
-#include <openssl/ssl.h>
-#endif
 #endif
 
 #if HAVE_LIBGNUTLS
diff --git a/src/security/forward.h b/src/security/forward.h
index 14e02e25aa4..863a1f18fe2 100644
--- a/src/security/forward.h
+++ b/src/security/forward.h
@@ -33,9 +33,6 @@
 #if HAVE_OPENSSL_RSA_H
 #include <openssl/rsa.h>
 #endif
-#if HAVE_OPENSSL_X509_H
-#include <openssl/x509.h>
-#endif
 #endif /* USE_OPENSSL */
 #include <unordered_set>
 
diff --git a/src/ssl/bio.h b/src/ssl/bio.h
index 6872fa00268..81e0f8bd856 100644
--- a/src/ssl/bio.h
+++ b/src/ssl/bio.h
@@ -20,9 +20,6 @@
 
 #include <iosfwd>
 #include <list>
-#if HAVE_OPENSSL_BIO_H
-#include <openssl/bio.h>
-#endif
 #include <string>
 #include <type_traits>
 
diff --git a/src/ssl/context_storage.cc b/src/ssl/context_storage.cc
index e1e2b121c15..1dac49728f2 100644
--- a/src/ssl/context_storage.cc
+++ b/src/ssl/context_storage.cc
@@ -13,12 +13,6 @@
 #include "Store.h"
 
 #include <limits>
-#if USE_OPENSSL
-#include "compat/openssl.h"
-#if HAVE_OPENSSL_SSL_H
-#include <openssl/ssl.h>
-#endif
-#endif
 
 Ssl::CertificateStorageAction::CertificateStorageAction(const Mgr::Command::Pointer &aCmd)
     :   Mgr::Action(aCmd)
diff --git a/src/ssl/context_storage.h b/src/ssl/context_storage.h
index a7c8cc009b2..2b8fa2149ae 100644
--- a/src/ssl/context_storage.h
+++ b/src/ssl/context_storage.h
@@ -22,9 +22,6 @@
 
 #include <list>
 #include <map>
-#if HAVE_OPENSSL_SSL_H
-#include <openssl/ssl.h>
-#endif
 
 namespace  Ssl
 {
diff --git a/src/ssl/gadgets.h b/src/ssl/gadgets.h
index e0c60c3a351..7672f4013ee 100644
--- a/src/ssl/gadgets.h
+++ b/src/ssl/gadgets.h
@@ -21,9 +21,6 @@
 #include <optional>
 #include <string>
 
-#if HAVE_OPENSSL_ASN1_H
-#include <openssl/asn1.h>
-#endif
 #if HAVE_OPENSSL_PEM_H
 #include <openssl/pem.h>
 #endif