diff --git a/.gitignore b/.gitignore
index f5e254412..4c9cadffa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,9 +40,10 @@ wolfssl-config
 cyassl.sublime*
 fips.h
 fips.c
-fipsv2.c
 fips_test.c
 fips
+wolfcrypt_first.c
+wolfcrypt_last.c
 selftest.c
 src/async.c
 wolfssl/async.h
diff --git a/autogen.sh b/autogen.sh
index 60452d180..e658a241b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,6 +20,8 @@ if test -e .git; then
   touch ./ctaocrypt/src/fips_test.c
   touch ./wolfcrypt/src/fips.c
   touch ./wolfcrypt/src/fips_test.c
+  touch ./wolfcrypt/src/wolfcrypt_first.c
+  touch ./wolfcrypt/src/wolfcrypt_last.c
   touch ./wolfssl/wolfcrypt/fips.h
 
   # touch CAVP selftest files for non-selftest distribution
diff --git a/wolfssl/wolfcrypt/hmac.h b/wolfssl/wolfcrypt/hmac.h
index 761acd24f..8fece03ae 100644
--- a/wolfssl/wolfcrypt/hmac.h
+++ b/wolfssl/wolfcrypt/hmac.h
@@ -173,11 +173,6 @@ typedef struct Hmac {
 #endif /* WOLFSSL_ASYNC_CRYPT */
 } Hmac;
 
-#ifndef WC_HMAC_TYPE_DEFINED
-    typedef struct RsaKey RsaKey;
-    #define WC_HMAC_TYPE_DEFINED
-#endif
-
 #endif /* HAVE_FIPS */
 
 /* does init */