diff --git a/Makefile.am b/Makefile.am
index c1a0fdfa5..88a7281aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,13 +59,8 @@ EXTRA_DIST+= IDE
 EXTRA_DIST+= README.md
 EXTRA_DIST+= LICENSING
 
-#-------------------------------------#
-if BUILD_FIPS
 include cyassl/include.am
-else
 include wolfssl/include.am
-endif
-#-------------------------------------#
 include certs/include.am
 include certs/1024/include.am
 include certs/crl/include.am
@@ -77,6 +72,12 @@ include support/include.am
 include wolfcrypt/benchmark/include.am
 include wolfcrypt/src/include.am
 include wolfcrypt/test/include.am
+
+if BUILD_FIPS
+include ctaocrypt/src/include.am
+include ctaocrypt/test/include.am
+endif
+
 include examples/client/include.am
 include examples/server/include.am
 include examples/echoclient/include.am
diff --git a/cyassl/ctaocrypt/md5.h b/cyassl/ctaocrypt/md5.h
index 2879e4cee..fc811608f 100644
--- a/cyassl/ctaocrypt/md5.h
+++ b/cyassl/ctaocrypt/md5.h
@@ -25,9 +25,19 @@
 #define CTAO_CRYPT_MD5_H
 
 #include <wolfssl/wolfcrypt/md5.h>
+#include <cyassl/ctaocrypt/types.h>
 
-
-//#include <cyassl/ctaocrypt/types.h>
+#ifndef HAVE_FIPS
+    #define InitMd5   wc_InitMd5
+    #define Md5Update wc_Md5Update
+    #define Md5Final  wc_Md5Final
+    #define Md5Hash   wc_Md5Hash
+#else
+    #define wc_InitMd5   InitMd5
+    #define wc_Md5Update Md5Update
+    #define wc_Md5Final  Md5Final
+    #define wc_Md5Hash   Md5Hash
+#endif
 //
 //#ifdef __cplusplus
 //    extern "C" {
diff --git a/wolfcrypt/src/md5.c b/wolfcrypt/src/md5.c
index 3b25c7fd4..edb4165a9 100644
--- a/wolfcrypt/src/md5.c
+++ b/wolfcrypt/src/md5.c
@@ -379,7 +379,7 @@ int wc_Md5Hash(const byte* data, word32 len, byte* hash)
 
     wc_InitMd5(md5);
     wc_Md5Update(md5, data, len);
-    Md5Final(md5, hash);
+    wc_Md5Final(md5, hash);
 
 #ifdef CYASSL_SMALL_STACK
     XFREE(md5, NULL, DYNAMIC_TYPE_TMP_BUFFER);
diff --git a/wolfssl/wolfcrypt/md5.h b/wolfssl/wolfcrypt/md5.h
index 9f82748c9..8e6fa4fa2 100644
--- a/wolfssl/wolfcrypt/md5.h
+++ b/wolfssl/wolfcrypt/md5.h
@@ -26,12 +26,11 @@
 
 #include <wolfssl/wolfcrypt/types.h>
 
-/* for md5 reverse compatibility */
-#ifndef NO_MD5
-	#define InitMd5 wc_InitMd5
-	#define Md5Update wc_Md5Update
-	#define Md5Final wc_Md5Final
-	#define Md5Hash wc_Md5Hash
+#ifdef HAVE_FIPS
+    #define wc_InitMd5   InitMd5
+    #define wc_Md5Update Md5Update
+    #define wc_Md5Final  Md5Final
+    #define wc_Md5Hash   Md5Hash
 #endif
 
 #ifdef __cplusplus