diff --git a/IDE/GCC-ARM/Header/user_settings.h b/IDE/GCC-ARM/Header/user_settings.h
index c3b61925f..1496866b1 100644
--- a/IDE/GCC-ARM/Header/user_settings.h
+++ b/IDE/GCC-ARM/Header/user_settings.h
@@ -637,6 +637,10 @@ extern unsigned int my_rng_seed_gen(void);
 #undef  NO_SIG_WRAPPER
 //#define NO_SIG_WRAPPER
 
+#undef WOLFSSL_IGNORE_FILE_WARN
+#define WOLFSSL_IGNORE_FILE_WARN
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/IDE/GCC-ARM/Makefile.common b/IDE/GCC-ARM/Makefile.common
index 8030448bd..a98fd55b0 100644
--- a/IDE/GCC-ARM/Makefile.common
+++ b/IDE/GCC-ARM/Makefile.common
@@ -115,7 +115,6 @@ endif
 
 # wolfCrypt Additional
 SRC_C += ../../wolfcrypt/src/asm.c
-SRC_C += ../../wolfcrypt/src/async.c
 SRC_C += ../../wolfcrypt/src/asn.c
 SRC_C += ../../wolfcrypt/src/blake2s.c
 SRC_C += ../../wolfcrypt/src/chacha.c
@@ -150,7 +149,6 @@ SRC_C += ../../wolfcrypt/src/poly1305.c
 SRC_C += ../../wolfcrypt/src/pwdbased.c
 SRC_C += ../../wolfcrypt/src/rc2.c
 SRC_C += ../../wolfcrypt/src/sakke.c
-SRC_C += ../../wolfcrypt/src/selftest.c
 SRC_C += ../../wolfcrypt/src/signature.c
 SRC_C += ../../wolfcrypt/src/srp.c
 SRC_C += ../../wolfcrypt/src/sp_arm32.c
@@ -170,6 +168,14 @@ SRC_C += ../../wolfcrypt/src/wc_port.c
 SRC_C += ../../wolfcrypt/src/wolfevent.c
 SRC_C += ../../wolfcrypt/src/wolfmath.c
 
+ifeq "$(ASYNC)" "1"
+SRC_C += ../../wolfcrypt/src/async.c
+endif
+
+ifeq "$(SELFTEST)" "1"
+SRC_C += ../../wolfcrypt/src/selftest.c
+endif
+
 # wolfCrypt non-standard algorithms (disabled by default)
 SRC_C += ../../wolfcrypt/src/arc4.c
 SRC_C += ../../wolfcrypt/src/blake2b.c