diff --git a/wolfssl/openssl/asn1.h b/wolfssl/openssl/asn1.h
index 659ae905f..272698fe6 100644
--- a/wolfssl/openssl/asn1.h
+++ b/wolfssl/openssl/asn1.h
@@ -25,7 +25,6 @@
 #define WOLFSSL_ASN1_H_
 
 #include <wolfssl/openssl/ssl.h>
-typedef struct WOLFSSL_ASN1_STRING      ASN1_STRING;
 
 #define ASN1_STRING_new      wolfSSL_ASN1_STRING_type_new
 #define ASN1_STRING_type_new wolfSSL_ASN1_STRING_type_new
diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h
index 38e39296b..3360c6923 100644
--- a/wolfssl/openssl/evp.h
+++ b/wolfssl/openssl/evp.h
@@ -58,7 +58,11 @@
 #endif
 
 typedef char WOLFSSL_EVP_CIPHER;
-typedef char WOLFSSL_EVP_MD;
+#ifndef WOLFSSL_EVP_TYPE_DEFINED
+typedef struct WOLFSSL_EVP_PKEY WOLFSSL_EVP_PKEY;
+typedef char   WOLFSSL_EVP_MD;
+#define WOLFSSL_EVP_TYPE_DEFINED
+#endif
 
 #ifndef NO_MD5
     WOLFSSL_API const WOLFSSL_EVP_MD* wolfSSL_EVP_md5(void);
@@ -200,11 +204,6 @@ typedef struct WOLFSSL_EVP_CIPHER_CTX {
 } WOLFSSL_EVP_CIPHER_CTX;
 
 
-#ifndef WOLFSSL_EVP_PKEY_TYPE_DEFINED /* guard on redeclaration */
-typedef struct WOLFSSL_EVP_PKEY     WOLFSSL_EVP_PKEY;
-#define WOLFSSL_EVP_PKEY_TYPE_DEFINED
-#endif
-
 typedef struct  WOLFSSL_EVP_PKEY_CTX {
     WOLFSSL_EVP_PKEY *pkey;
     int op; /* operation */
@@ -429,7 +428,6 @@ typedef WOLFSSL_EVP_MD         EVP_MD;
 typedef WOLFSSL_EVP_CIPHER     EVP_CIPHER;
 typedef WOLFSSL_EVP_MD_CTX     EVP_MD_CTX;
 typedef WOLFSSL_EVP_CIPHER_CTX EVP_CIPHER_CTX;
-typedef WOLFSSL_EVP_PKEY_CTX   EVP_PKEY_CTX;
 
 #ifndef NO_MD5
     #define EVP_md5       wolfSSL_EVP_md5
diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h
index 3048bbdf2..67b5b78ac 100644
--- a/wolfssl/openssl/ssl.h
+++ b/wolfssl/openssl/ssl.h
@@ -69,12 +69,6 @@ typedef WOLFSSL_X509_CHAIN X509_CHAIN;
 
 typedef WOLFSSL_EVP_PKEY       EVP_PKEY;
 typedef WOLFSSL_EVP_PKEY       PKCS8_PRIV_KEY_INFO;
-typedef WOLFSSL_RSA            RSA;
-typedef WOLFSSL_DSA            DSA;
-typedef WOLFSSL_EC_KEY         EC_KEY;
-typedef WOLFSSL_EC_GROUP       EC_GROUP;
-typedef WOLFSSL_EC_POINT       EC_POINT;
-typedef WOLFSSL_ECDSA_SIG	   ECDSA_SIG;
 typedef WOLFSSL_BIO            BIO;
 typedef WOLFSSL_BIO_METHOD     BIO_METHOD;
 typedef WOLFSSL_CIPHER         SSL_CIPHER;
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index aaef2dcf4..1294cc285 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -193,8 +193,13 @@ struct WOLFSSL_ASN1_TIME {
     /* ASN_TIME | LENGTH | date bytes */
 };
 
+#ifndef WOLFSSL_EVP_TYPE_DEFINED
+typedef struct WOLFSSL_EVP_PKEY WOLFSSL_EVP_PKEY;
 typedef char   WOLFSSL_EVP_MD;
-typedef struct WOLFSSL_EVP_PKEY {
+#define WOLFSSL_EVP_TYPE_DEFINED
+#endif
+
+struct WOLFSSL_EVP_PKEY {
     void* heap;
     int type;         /* openssh dereference */
     int save_type;    /* openssh dereference */
@@ -216,14 +221,9 @@ typedef struct WOLFSSL_EVP_PKEY {
     #ifdef HAVE_ECC
         int pkey_curve;
     #endif
-} WOLFSSL_EVP_PKEY;
+};
 typedef struct WOLFSSL_EVP_PKEY WOLFSSL_PKCS8_PRIV_KEY_INFO;
 
-#ifndef WOLFSSL_EVP_PKEY_TYPE_DEFINED /* guard on redeclaration */
-typedef struct WOLFSSL_EVP_PKEY     WOLFSSL_EVP_PKEY;
-#define WOLFSSL_EVP_PKEY_TYPE_DEFINED
-#endif
-
 #define WOLFSSL_EVP_PKEY_DEFAULT EVP_PKEY_RSA /* default key type */
 
 typedef struct WOLFSSL_MD4_CTX {