diff --git a/wolfcrypt/src/fe_low_mem.c b/wolfcrypt/src/fe_low_mem.c
index 80834f54c..2dc914c81 100644
--- a/wolfcrypt/src/fe_low_mem.c
+++ b/wolfcrypt/src/fe_low_mem.c
@@ -27,6 +27,7 @@
 
 #include <wolfssl/wolfcrypt/settings.h>
 
+#if defined(CURVED25519_SMALL) /* use slower code that takes less memory */
 #if defined(HAVE_ED25519) || defined(HAVE_CURVE25519)
 
 #include <wolfssl/wolfcrypt/fe_operations.h>
@@ -593,4 +594,4 @@ void fe_sqrt(byte *r, const byte *a)
 }
 
 #endif /* HAVE_CURVE25519 or HAVE_ED25519 */
-
+#endif /* CURVED25519_SMALL */
diff --git a/wolfcrypt/src/fe_operations.c b/wolfcrypt/src/fe_operations.c
index d78467e21..9259403ec 100644
--- a/wolfcrypt/src/fe_operations.c
+++ b/wolfcrypt/src/fe_operations.c
@@ -27,6 +27,7 @@
 
 #include <wolfssl/wolfcrypt/settings.h>
 
+#ifndef CURVED25519_SMALL /* run when not defined to use small memory math */
 #if defined(HAVE_ED25519) || defined(HAVE_CURVE25519)
 
 #include <wolfssl/wolfcrypt/fe_operations.h>
@@ -1405,4 +1406,5 @@ void fe_cmov(fe f,const fe g,unsigned int b)
   f[9] = f9 ^ x9;
 }
 #endif /* HAVE ED25519 or CURVE25519 */
+#endif /* not defined CURVED25519_SMALL */
 
diff --git a/wolfcrypt/src/ge_low_mem.c b/wolfcrypt/src/ge_low_mem.c
index 43c533c69..f8dba9266 100644
--- a/wolfcrypt/src/ge_low_mem.c
+++ b/wolfcrypt/src/ge_low_mem.c
@@ -27,7 +27,8 @@
 
 #include <wolfssl/wolfcrypt/settings.h>
 
-#ifdef HAVE_ED25519
+#if defined(CURVED25519_SMALL) /* use slower code that takes less memory */
+#if defined(HAVE_ED25519)
 
 #include <wolfssl/wolfcrypt/ge_operations.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
@@ -71,12 +72,12 @@ int ge_compress_key(byte* out, const byte* xIn, const byte* yIn,
 {
 	byte tmp[F25519_SIZE];
 	byte parity;
+    byte pt[32];
     int     i;
 
 	fe_copy(tmp, xIn);
 	parity = (tmp[0] & 1) << 7;
 
-    byte pt[32];
 	fe_copy(pt, yIn);
 	pt[31] |= parity;
 
@@ -555,4 +556,5 @@ int ge_double_scalarmult_vartime(ge_p2* R, const unsigned char *h,
 }
 
 #endif /* HAVE_ED25519 */
+#endif /* CURVED25519_SMALL */
 
diff --git a/wolfcrypt/src/ge_operations.c b/wolfcrypt/src/ge_operations.c
index 665cfe89b..259b5b144 100644
--- a/wolfcrypt/src/ge_operations.c
+++ b/wolfcrypt/src/ge_operations.c
@@ -28,6 +28,7 @@
 
 #include <wolfssl/wolfcrypt/settings.h>
 
+#ifndef CURVED25519_SMALL /* run when not defined to use small memory math */
 #ifdef HAVE_ED25519
 
 #include <wolfssl/wolfcrypt/ge_operations.h>
@@ -2600,4 +2601,5 @@ void ge_tobytes(unsigned char *s,const ge_p2 *h)
   s[31] ^= fe_isnegative(x) << 7;
 }
 #endif /* HAVE_ED25519 */
+#endif /* not defined CURVED25519_SMALL */