diff --git a/src/image.c b/src/image.c
index aee76a2874..c916d9d87f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -602,7 +602,6 @@ static void wolfBoot_verify_signature_rsa_common(uint8_t key_slot,
 #endif /* WOLFBOOT_SIGN_RSA_ANY */
 
 #ifdef WOLFBOOT_SIGN_LMS
-#include <wolfssl/wolfcrypt/lms.h>
 #ifdef HAVE_LIBLMS
     #include <wolfssl/wolfcrypt/ext_lms.h>
 #else
@@ -670,7 +669,6 @@ static void wolfBoot_verify_signature_lms(uint8_t key_slot,
 #endif /* WOLFBOOT_SIGN_LMS */
 
 #ifdef WOLFBOOT_SIGN_XMSS
-#include <wolfssl/wolfcrypt/xmss.h>
 #ifdef HAVE_LIBXMSS
     #include <wolfssl/wolfcrypt/ext_xmss.h>
 #else
diff --git a/tools/keytools/keygen.c b/tools/keytools/keygen.c
index cf4adfb590..52dc26cc2e 100644
--- a/tools/keytools/keygen.c
+++ b/tools/keytools/keygen.c
@@ -62,7 +62,6 @@
 #endif
 
 #if defined(WOLFSSL_HAVE_LMS)
-    #include <wolfssl/wolfcrypt/lms.h>
     #ifdef HAVE_LIBLMS
         #include <wolfssl/wolfcrypt/ext_lms.h>
     #else
@@ -71,7 +70,6 @@
 #endif
 
 #if defined(WOLFSSL_HAVE_XMSS)
-    #include <wolfssl/wolfcrypt/xmss.h>
     #ifdef HAVE_LIBXMSS
         #include <wolfssl/wolfcrypt/ext_xmss.h>
     #else
diff --git a/tools/keytools/sign.c b/tools/keytools/sign.c
index f5c7c23937..58ba82e865 100644
--- a/tools/keytools/sign.c
+++ b/tools/keytools/sign.c
@@ -112,7 +112,6 @@ static inline int fp_truncate(FILE *f, size_t len)
 #include <wolfssl/wolfcrypt/error-crypt.h>
 
 #ifdef WOLFSSL_HAVE_LMS
-    #include <wolfssl/wolfcrypt/lms.h>
     #ifdef HAVE_LIBLMS
         #include <wolfssl/wolfcrypt/ext_lms.h>
     #else
@@ -121,7 +120,6 @@ static inline int fp_truncate(FILE *f, size_t len)
 #endif
 
 #ifdef WOLFSSL_HAVE_XMSS
-    #include <wolfssl/wolfcrypt/xmss.h>
     #ifdef HAVE_LIBXMSS
         #include <wolfssl/wolfcrypt/ext_xmss.h>
     #else