diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 7e1d4c534..71a1290e4 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -141,14 +141,6 @@ extern int wc_InitRsaHw(RsaKey* key);
     };
     #endif
 #endif
-#if defined(HAVE_FIPS) && \
-    ( defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) )
-    /* aes.h is locked w/ FIPS, have to add new enums in non-boundary location
-     * when building in FIPS mode */
-enum {
-    GCM_NONCE_MID_SZ = 12 /* The usual default nonce size for AES-GCM. */
-};
-#endif
 
 #ifdef WOLFSSL_RENESAS_TSIP_TLS
 void tsip_inform_key_position(const word32 key_n_start,
diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c
index 566f2ec6b..d8a54df03 100644
--- a/wolfcrypt/src/evp.c
+++ b/wolfcrypt/src/evp.c
@@ -33,15 +33,6 @@
 #elif defined(WOLFCRYPT_ONLY)
 #else
 
-#if defined(HAVE_FIPS) && \
-    ( defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) )
-    /* aes.h is locked w/ FIPS, have to add new enums in non-boundary location
-     * when building in FIPS mode */
-enum {
-    GCM_NONCE_MID_SZ = 12 /* The usual default nonce size for AES-GCM. */
-};
-#endif
-
 #if defined(OPENSSL_EXTRA)
 
 #include <wolfssl/openssl/ecdsa.h>