diff --git a/ctaocrypt/src/integer.c b/ctaocrypt/src/integer.c
index f5f6a91e6..7738789b1 100644
--- a/ctaocrypt/src/integer.c
+++ b/ctaocrypt/src/integer.c
@@ -3736,7 +3736,7 @@ int mp_sqrmod (mp_int * a, mp_int * b, mp_int * c)
 #endif
 
 
-#if defined(CYASSL_KEY_GEN) || defined(HAVE_ECC) || defined(OPENSSL_EXTRA)
+#if defined(HAVE_ECC) || !defined(NO_PWDBASED)
 
 /* single digit addition */
 int mp_add_d (mp_int* a, mp_digit b, mp_int* c)
@@ -3900,7 +3900,7 @@ int mp_sub_d (mp_int * a, mp_digit b, mp_int * c)
   return MP_OKAY;
 }
 
-#endif /* CYASSL_KEY_GEN || HAVE_ECC */
+#endif /* defined(HAVE_ECC) || !defined(NO_PWDBASED) */
 
 
 #ifdef CYASSL_KEY_GEN
diff --git a/cyassl/ctaocrypt/integer.h b/cyassl/ctaocrypt/integer.h
index fb0ee4e9a..0405ff97d 100644
--- a/cyassl/ctaocrypt/integer.h
+++ b/cyassl/ctaocrypt/integer.h
@@ -303,7 +303,7 @@ int mp_init_multi(mp_int* a, mp_int* b, mp_int* c, mp_int* d, mp_int* e,
     int mp_lcm (mp_int * a, mp_int * b, mp_int * c);
 #endif
 
-#if defined(CYASSL_KEY_GEN) || defined(HAVE_ECC) || defined(OPENSSL_EXTRA)
+#if defined(HAVE_ECC) || !defined(NO_PWDBASED)
     int mp_sub_d (mp_int * a, mp_digit b, mp_int * c);
 #endif