diff --git a/cyassl/openssl/ssl.h b/cyassl/openssl/ssl.h
index 2440b0d58..f268b6a37 100644
--- a/cyassl/openssl/ssl.h
+++ b/cyassl/openssl/ssl.h
@@ -37,8 +37,6 @@
 #ifdef _WIN32
     /* wincrypt.h clashes */
     #undef X509_NAME
-    #undef OCSP_REQUEST 
-    #undef OCSP_RESPONSE
 #endif
 
 
diff --git a/cyassl/ssl.h b/cyassl/ssl.h
index 88f4838ea..22ece6d13 100644
--- a/cyassl/ssl.h
+++ b/cyassl/ssl.h
@@ -43,6 +43,12 @@
     #define CYASSL_VERSION LIBCYASSL_VERSION_STRING
 #endif
 
+#ifdef _WIN32
+    /* wincrypt.h clashes */
+    #undef OCSP_REQUEST
+    #undef OCSP_RESPONSE
+#endif
+
 
 
 #ifdef __cplusplus