diff --git a/cyassl/openssl/dsa.h b/cyassl/openssl/dsa.h
index 2bb476bbd..39ddf8ce7 100644
--- a/cyassl/openssl/dsa.h
+++ b/cyassl/openssl/dsa.h
@@ -1,3 +1,12 @@
 /* dsa.h for openSSL */
 
+#ifndef CYASSL_OPENSSL_DSA
+#define CYASSL_OPENSSL_DSA
+
+#define CyaSSL_DSA_LoadDer  wolfSSL_DSA_LoadDer
+#define CyaSSL_DSA_do_sign  wolfSSL_DSA_do_sign
+
+#include <cyassl/openssl/ssl.h>
 #include <wolfssl/openssl/dsa.h>
+#endif
+
diff --git a/cyassl/openssl/evp.h b/cyassl/openssl/evp.h
index fe9f42410..a0715587c 100644
--- a/cyassl/openssl/evp.h
+++ b/cyassl/openssl/evp.h
@@ -24,4 +24,17 @@
  *
  */
 
+#ifndef CYASSL_OPENSSL_EVP
+#define CYASSL_OPENSSL_EVP
+
+#define CyaSSL_StoreExternalIV       wolfSSL_StoreExternalIV
+#define CyaSSL_SetInternalIV         wolfSSL_SetInternalIV
+#define CYASSL_EVP_MD                WOLFSSL_EVP_MD
+#define CyaSSL_EVP_X_STATE           wolfSSL_EVP_X_STATE
+#define CyaSSL_EVP_X_STATE_LEN       wolfSSL_EVP_X_STATE_LEN
+#define CyaSSL_3des_iv               wolfSSL_3des_iv
+#define CyaSSL_aes_ctr_iv            wolfSSL_aes_ctr_iv
+
 #include <wolfssl/openssl/evp.h>
+#endif
+
diff --git a/cyassl/openssl/rsa.h b/cyassl/openssl/rsa.h
index 06f10a573..f4f24b825 100644
--- a/cyassl/openssl/rsa.h
+++ b/cyassl/openssl/rsa.h
@@ -1,3 +1,12 @@
 /* rsa.h for openSSL */
 
+#ifndef CYASSL_OPENSSL_RSA
+#define CYASSL_OPENSSL_RSA
+
+#define CyaSSL_RSA_GenAdd   wolfSSL_RSA_GenAdd
+#define CyaSSL_RSA_LoadDer  wolfSSL_RSA_LoadDer
+
+#include <cyassl/openssl/ssl.h>
 #include <wolfssl/openssl/rsa.h>
+#endif
+
diff --git a/cyassl/openssl/ssl.h b/cyassl/openssl/ssl.h
index 094b9943b..ebf8dfa3b 100644
--- a/cyassl/openssl/ssl.h
+++ b/cyassl/openssl/ssl.h
@@ -20,8 +20,14 @@
  */
 
 
-/*  ssl.h defines openssl compatibility layer 
+/*  ssl.h defines openssl compatibility layer
  *
  */
+#ifndef CYASSL_OPENSSL_H_
+#define CYASSL_OPENSSL_H_
 
+#include <cyassl/ssl.h>
 #include <wolfssl/openssl/ssl.h>
+
+#endif
+