diff --git a/src/crypto/tc/aes.c b/src/crypto/tc/aes.c
index eaeeef6..7e1bc9d 100644
--- a/src/crypto/tc/aes.c
+++ b/src/crypto/tc/aes.c
@@ -30,9 +30,6 @@
 
 #include "tomcrypt.h"
 
-#undef LTC_ARGCHK
-#define LTC_ARGCHK(X) do {} while(0)
-
 #define SETUP    rijndael_setup
 #define ECB_ENC  rijndael_ecb_encrypt
 #define ECB_DEC  rijndael_ecb_decrypt
@@ -416,4 +413,3 @@ int ECB_KS(int *keysize)
       return CRYPT_OK;
    }
 }
-
diff --git a/src/crypto/tc/aes_cbc.c b/src/crypto/tc/aes_cbc.c
index 0ba9a59..5d023f0 100644
--- a/src/crypto/tc/aes_cbc.c
+++ b/src/crypto/tc/aes_cbc.c
@@ -8,9 +8,6 @@
  */
 #include "tomcrypt.h"
 
-#undef LTC_ARGCHK
-#define LTC_ARGCHK(X) do {} while(0)
-
 /**
    @file cbc_start.c
    CBC implementation, start chain, Tom St Denis
diff --git a/src/crypto/tc/sha256.c b/src/crypto/tc/sha256.c
index e4765ef..0bbf708 100644
--- a/src/crypto/tc/sha256.c
+++ b/src/crypto/tc/sha256.c
@@ -9,9 +9,6 @@
 
 #include "tomcrypt.h"
 
-#undef LTC_ARGCHK
-#define LTC_ARGCHK(X) do {} while(0)
-
 /* Various logical functions */
 #define Ch(x,y,z)       (z ^ (x & (y ^ z)))
 #define Maj(x,y,z)      (((x | y) & z) | (x & y))
@@ -205,4 +202,3 @@ int sha256_done(hash_state * md, unsigned char *out)
     }
     return CRYPT_OK;
 }
-
diff --git a/src/crypto/tc/tomcrypt_cfg.h b/src/crypto/tc/tomcrypt_cfg.h
index 5d64ca7..875207b 100644
--- a/src/crypto/tc/tomcrypt_cfg.h
+++ b/src/crypto/tc/tomcrypt_cfg.h
@@ -63,7 +63,7 @@ LTC_EXPORT int   LTC_CALL XSTRCMP(const char *s1, const char *s2);
 
 /* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing */
 #ifndef ARGTYPE
-   #define ARGTYPE  0
+   #define ARGTYPE  3
 #endif
 
 #undef LTC_ENCRYPT