diff -rup /usr/include/wolfssl/ssl.h wolfssl/ssl.h
--- /usr/include/wolfssl/ssl.h	2020-06-26 07:09:46.827611150 -0700
+++ wolfssl/ssl.h	2020-06-26 06:24:16.376046803 -0700
@@ -920,7 +920,7 @@ WOLFSSL_API int  wolfSSL_BIO_new_bio_pai
 
 WOLFSSL_API int wolfSSL_RSA_padding_add_PKCS1_PSS(WOLFSSL_RSA *rsa, unsigned char *EM,
                                                   const unsigned char *mHash,
-                                                  const WOLFSSL_EVP_MD *Hash, int saltLen);
+                                                  const WOLFSSL_EVP_MD *WolfSSLHash, int saltLen);
 WOLFSSL_API int wolfSSL_RSA_verify_PKCS1_PSS(WOLFSSL_RSA *rsa, const unsigned char *mHash,
                                           const WOLFSSL_EVP_MD *hashAlg,
                                           const unsigned char *EM, int saltLen);
diff -rup /usr/include/wolfssl/wolfcrypt/asn.h wolfssl/wolfcrypt/asn.h
--- /usr/include/wolfssl/wolfcrypt/asn.h	2020-06-26 07:09:46.895610573 -0700
+++ wolfssl/wolfcrypt/asn.h	2020-06-26 06:21:36.862159331 -0700
@@ -1115,7 +1115,7 @@ WOLFSSL_LOCAL int GetAsnTimeString(void*
 WOLFSSL_LOCAL int ExtractDate(const unsigned char* date, unsigned char format,
                                                  wolfssl_tm* certTime, int* idx);
 WOLFSSL_LOCAL int DateGreaterThan(const struct tm* a, const struct tm* b);
-WOLFSSL_LOCAL int ValidateDate(const byte* date, byte format, int dateType);
+WOLFSSL_LOCAL int WolfSSLValidateDate(const byte* date, byte format, int dateType);
 WOLFSSL_LOCAL int wc_OBJ_sn2nid(const char *sn);
 
 /* ASN.1 helper functions */
diff -rup /usr/include/wolfssl/wolfcrypt/hmac.h wolfssl/wolfcrypt/hmac.h
--- /usr/include/wolfssl/wolfcrypt/hmac.h	2020-06-26 07:09:46.927610303 -0700
+++ wolfssl/wolfcrypt/hmac.h	2020-06-26 07:19:42.843225264 -0700
@@ -131,11 +131,11 @@ typedef union {
 #ifdef WOLFSSL_SHA3
     wc_Sha3 sha3;
 #endif
-} Hash;
+} WolfSSLHash;
 
 /* Hmac digest */
 struct Hmac {
-    Hash    hash;
+    WolfSSLHash    hash;
     word32  ipad[WC_HMAC_BLOCK_SIZE  / sizeof(word32)];  /* same block size all*/
     word32  opad[WC_HMAC_BLOCK_SIZE  / sizeof(word32)];
     word32  innerHash[WC_MAX_DIGEST_SIZE / sizeof(word32)];
Only in wolfssl/wolfcrypt: hmac.h~
diff -rup /usr/include/wolfssl/wolfcrypt/wc_port.h wolfssl/wolfcrypt/wc_port.h
--- /usr/include/wolfssl/wolfcrypt/wc_port.h	2020-06-26 07:09:46.927610303 -0700
+++ wolfssl/wolfcrypt/wc_port.h	2020-06-26 06:21:24.974018611 -0700
@@ -683,7 +683,7 @@ WOLFSSL_API int wolfCrypt_Cleanup(void);
 #endif
 #if !defined(XVALIDATE_DATE) && !defined(HAVE_VALIDATE_DATE)
     #define USE_WOLF_VALIDDATE
-    #define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
+    #define XVALIDATE_DATE(d, f, t) WolfSSLValidateDate((d), (f), (t))
 #endif
 
 /* wolf struct tm and time_t */