diff --git a/cyassl/ctaocrypt/md5.h b/cyassl/ctaocrypt/md5.h
index fc811608f..66dc5082b 100644
--- a/cyassl/ctaocrypt/md5.h
+++ b/cyassl/ctaocrypt/md5.h
@@ -38,7 +38,7 @@
     #define wc_Md5Final  Md5Final
     #define wc_Md5Hash   Md5Hash
 #endif
-//
+
 //#ifdef __cplusplus
 //    extern "C" {
 //#endif
diff --git a/wolfssl/wolfcrypt/md5.h b/wolfssl/wolfcrypt/md5.h
index 8e6fa4fa2..bfc690e5c 100644
--- a/wolfssl/wolfcrypt/md5.h
+++ b/wolfssl/wolfcrypt/md5.h
@@ -49,17 +49,17 @@ enum {
     MD5_PAD_SIZE    = 56
 };
 
-#ifdef CYASSL_PIC32MZ_HASH
+#if defined(CYASSL_PIC32MZ_HASH) || defined(WOLFSSL_PIC32MZ_HASH)
 #include "port/pic32/pic32mz-crypt.h"
 #endif
-
+        
 /* MD5 digest */
 typedef struct Md5 {
     word32  buffLen;   /* in bytes          */
     word32  loLen;     /* length in bytes   */
     word32  hiLen;     /* length in bytes   */
     word32  buffer[MD5_BLOCK_SIZE  / sizeof(word32)];
-    #ifndef CYASSL_PIC32MZ_HASH
+    #if !defined(CYASSL_PIC32MZ_HASH) || !defined(WOLFSSL_PIC32MZ_HASH)
     word32  digest[MD5_DIGEST_SIZE / sizeof(word32)];
     #else
     word32  digest[PIC32_HASH_SIZE / sizeof(word32)];