diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 905497467..7d8145552 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -41,7 +41,12 @@
 
 #define CYASSL_VERSION "1.9.6"
 
-#undef X509_NAME   /* wincrypt.h clash */
+#ifdef _WIN32
+    /* wincrypt.h clashes */
+    #undef X509_NAME
+    #undef OCSP_REQUEST 
+    #undef OCSP_RESPONSE
+#endif
 
 #ifdef __cplusplus
     extern "C" {