diff --git a/src/headers/tomcrypt_custom.h b/src/headers/tomcrypt_custom.h
index 9a60f40..113e443 100644
--- a/src/headers/tomcrypt_custom.h
+++ b/src/headers/tomcrypt_custom.h
@@ -244,16 +244,9 @@
 #define LTC_F9_MODE
 #define LTC_PELICAN
 
-#if defined(LTC_PELICAN) && !defined(LTC_RIJNDAEL)
-   #error Pelican-MAC requires LTC_RIJNDAEL
-#endif
-
 /* ---> Encrypt + Authenticate Modes <--- */
 
 #define LTC_EAX_MODE
-#if defined(LTC_EAX_MODE) && !(defined(LTC_CTR_MODE) && defined(LTC_OMAC))
-   #error LTC_EAX_MODE requires CTR and LTC_OMAC mode
-#endif
 
 #define LTC_OCB_MODE
 #define LTC_OCB3_MODE
@@ -285,10 +278,6 @@
   #define LTC_YARROW_AES 2
 #endif
 
-#if defined(LTC_YARROW) && !defined(LTC_CTR_MODE)
-   #error LTC_YARROW requires LTC_CTR_MODE chaining mode to be defined!
-#endif
-
 /* a PRNG that simply reads from an available system source */
 #define LTC_SPRNG
 
@@ -425,6 +414,18 @@
     #undef LTC_RSA_BLINDING
 #endif
 
+#if defined(LTC_PELICAN) && !defined(LTC_RIJNDAEL)
+   #error Pelican-MAC requires LTC_RIJNDAEL
+#endif
+
+#if defined(LTC_EAX_MODE) && !(defined(LTC_CTR_MODE) && defined(LTC_OMAC))
+   #error LTC_EAX_MODE requires CTR and LTC_OMAC mode
+#endif
+
+#if defined(LTC_YARROW) && !defined(LTC_CTR_MODE)
+   #error LTC_YARROW requires LTC_CTR_MODE chaining mode to be defined!
+#endif
+
 #if defined(LTC_DER) && !defined(MPI)
    #error ASN.1 DER requires MPI functionality
 #endif