diff --git a/wolfssl/wolfcrypt/integer.h b/wolfssl/wolfcrypt/integer.h
index 099b9f4e3..c150fd880 100644
--- a/wolfssl/wolfcrypt/integer.h
+++ b/wolfssl/wolfcrypt/integer.h
@@ -77,6 +77,10 @@ extern "C" {
     #undef MP_64BIT
 #endif
 
+
+/* allow user to define on mp_digit, mp_word, DIGIT_BIT types */
+#ifndef WOLFSSL_BIGINT_TYPES
+
 /* some default configurations.
  *
  * A "mp_digit" must be able to hold DIGIT_BIT + 1 bits
@@ -119,6 +123,7 @@ extern "C" {
 #endif
 #endif
 
+#endif /* WOLFSSL_BIGINT_TYPES */
 
 /* otherwise the bits per digit is calculated automatically from the size of
    a mp_digit */
diff --git a/wolfssl/wolfcrypt/tfm.h b/wolfssl/wolfcrypt/tfm.h
index ac24eb93c..4e2804d1a 100644
--- a/wolfssl/wolfcrypt/tfm.h
+++ b/wolfssl/wolfcrypt/tfm.h
@@ -202,6 +202,9 @@
 #endif
 
 
+/* allow user to define on fp_digit, fp_word types */
+#ifndef WOLFSSL_BIGINT_TYPES
+
 /* some default configurations.
  */
 #if defined(FP_64BIT)
@@ -227,6 +230,8 @@
    #endif
 #endif
 
+#endif /* WOLFSSL_BIGINT_TYPES */
+
 /* # of digits this is */
 #define DIGIT_BIT  (int)((CHAR_BIT) * sizeof(fp_digit))