diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0069e7c779..288739162d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -721,6 +721,7 @@ if(NOT PYTHON_KEYTOOLS)
         lib/wolfssl/wolfcrypt/src/ecc.c
         lib/wolfssl/wolfcrypt/src/coding.c
         lib/wolfssl/wolfcrypt/src/chacha.c
+        lib/wolfssl/wolfcrypt/src/dilithium.c
         lib/wolfssl/wolfcrypt/src/ed25519.c
         lib/wolfssl/wolfcrypt/src/ed448.c
         lib/wolfssl/wolfcrypt/src/fe_operations.c
@@ -739,7 +740,11 @@ if(NOT PYTHON_KEYTOOLS)
         lib/wolfssl/wolfcrypt/src/sha256.c
         lib/wolfssl/wolfcrypt/src/sha512.c
         lib/wolfssl/wolfcrypt/src/tfm.c
+        lib/wolfssl/wolfcrypt/src/wc_lms.c
+        lib/wolfssl/wolfcrypt/src/wc_lms_impl.c
         lib/wolfssl/wolfcrypt/src/wc_port.c
+        lib/wolfssl/wolfcrypt/src/wc_xmss.c
+        lib/wolfssl/wolfcrypt/src/wc_xmss_impl.c
         lib/wolfssl/wolfcrypt/src/wolfmath.c)
 
     list(
diff --git a/tools/keytools/user_settings.h b/tools/keytools/user_settings.h
index 10e478236a..73870eba5e 100644
--- a/tools/keytools/user_settings.h
+++ b/tools/keytools/user_settings.h
@@ -29,7 +29,10 @@
 #include <stdint.h>
 
 /* System */
+#ifndef WOLFBOOT_KEYTOOLS
 #define WOLFBOOT_KEYTOOLS
+#endif
+
 #define SINGLE_THREADED
 #define WOLFCRYPT_ONLY