diff --git a/src/ssl.c b/src/ssl.c
index b9a224ebb..c18a5407a 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -12186,8 +12186,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
     }
 #endif
 
-#if defined(OPENSSL_EXTRA) || defined(HAVE_LIGHTY)
-    #ifdef OPENSSL_EXTRA
+#ifdef OPENSSL_EXTRA
     /* registers client cert callback, called during handshake if server
        requests client auth but user has not loaded client cert/key */
     void wolfSSL_CTX_set_client_cert_cb(WOLFSSL_CTX *ctx, client_cert_cb cb)
@@ -12399,9 +12398,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
         }
         return ret;
     }
-    #endif /* OPENSSL_EXTRA */
-
-#endif /* OPENSSL_EXTRA || HAVE_LIGHTY */
+#endif /* OPENSSL_EXTRA */
 
 #ifndef WOLFSSL_NO_CA_NAMES
     WOLF_STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_CTX_get_client_CA_list(
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index 2ffa47ad9..ca9d4620b 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -1086,8 +1086,8 @@
 
 #undef WSSL_HARDEN_TLS
 
-#if !defined(WOLFSSL_NO_CA_NAMES) && \
-    (defined(OPENSSL_EXTRA) || defined(HAVE_LIGHTY))
+/* Client CA Names feature */
+#if !defined(WOLFSSL_NO_CA_NAMES) && defined(OPENSSL_EXTRA)
     #define SSL_CA_NAMES(ssl) ((ssl)->client_ca_names != NULL ? \
         (ssl)->client_ca_names : \
         (ssl)->ctx->client_ca_names)