diff --git a/src/ssl.c b/src/ssl.c
index 342ea54f7..b49eeecc6 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -15230,8 +15230,9 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
         (void)depth;
     }
 
-    void* WOLFSSL_get_app_data( const WOLFSSL *ssl) {
-        //checkout exdata stuff...
+    void* WOLFSSL_get_app_data( const WOLFSSL *ssl)
+    {
+        /* checkout exdata stuff... */
         (void)ssl;
 
         return 0;
diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h
index 93041fa7f..103d5f217 100644
--- a/wolfssl/openssl/ssl.h
+++ b/wolfssl/openssl/ssl.h
@@ -49,7 +49,6 @@ typedef WOLFSSL_CTX      SSL_CTX;
 typedef WOLFSSL_X509       X509;
 typedef WOLFSSL_X509_NAME  X509_NAME;
 typedef WOLFSSL_X509_CHAIN X509_CHAIN;
-typedef WOLFSSL_ASN1_STRING    ASN1_STRING; 
 
 
 /* redeclare guard */
@@ -73,6 +72,7 @@ typedef WOLFSSL_X509_EXTENSION X509_EXTENSION;
 typedef WOLFSSL_ASN1_TIME      ASN1_TIME;
 typedef WOLFSSL_ASN1_INTEGER   ASN1_INTEGER;
 typedef WOLFSSL_ASN1_OBJECT    ASN1_OBJECT;
+typedef WOLFSSL_ASN1_STRING    ASN1_STRING;
 typedef WOLFSSL_dynlock_value  CRYPTO_dynlock_value;
 
 #define ASN1_UTCTIME WOLFSSL_ASN1_TIME
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index df4b38619..58c21e7b9 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -1497,20 +1497,16 @@ WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack,
 #endif
 
 
-//We also want this to be inside openssl extra, but clang throws an error
-#ifdef HAVE_LIGHTY   
+#ifdef OPENSSL_EXTRA /*lighttp compatibility */
+#ifdef HAVE_LIGHTY
 
-typedef struct WOLFSSL_X509_NAME_ENTRY { 
+typedef struct WOLFSSL_X509_NAME_ENTRY {
     WOLFSSL_ASN1_OBJECT* object;
     WOLFSSL_ASN1_STRING* value;
     int set;
     int size;
 } WOLFSSL_X509_NAME_ENTRY;
 
-#endif
-
-#ifdef OPENSSL_EXTRA /*lighttp compatibility */
-#ifdef HAVE_LIGHTY
 
 #include <wolfssl/openssl/dh.h>