diff --git a/configure.ac b/configure.ac
index b484201d3..6a43bcc6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5554,8 +5554,9 @@ AM_CONDITIONAL([BUILD_PKI],[test "x$ENABLED_PKI" = "xyes"])
 AM_CONDITIONAL([BUILD_DES3],[test "x$ENABLED_DES3" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
 AM_CONDITIONAL([BUILD_PKCS7],[test "x$ENABLED_PKCS7" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
 AM_CONDITIONAL([BUILD_HASHFLAGS],[test "x$ENABLED_HASHFLAGS" = "xyes"])
-AM_CONDITIONAL([BUILD_LINUXKM],[test "x$ENABLED_LINUXKM" = "xyes"])
-AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "x$ENABLED_NO_LIBRARY" = "xyes"])
+AM_CONDITIONAL([BUILD_LINUXKM],[test "$ENABLED_LINUXKM" = "yes"])
+AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "$ENABLED_NO_LIBRARY" = "yes"])
+AM_CONDITIONAL([BUILD_DEBUG],[test "$ax_enable_debug" = "yes" || test "$ENABLED_STACKSIZE" = "yes"])
 
 
 CREATE_HEX_VERSION
@@ -5687,6 +5688,7 @@ echo "   * C++ Flags:                  $CXXFLAGS"
 echo "   * CPP Flags:                  $CPPFLAGS"
 echo "   * CCAS Flags:                 $CCASFLAGS"
 echo "   * LIB Flags:                  $LIB"
+
 test "$ENABLED_LINUXKM" = "yes" && \
 echo "   * Linux Kernel Build Root:    $KERNEL_ROOT" && \
 echo "   * Linux Kernel Build Arch:    $KERNEL_ARCH" && \
@@ -5699,6 +5701,7 @@ echo "   * Auto-vectorize C flags:     $CFLAGS_AUTO_VECTORIZE_ENABLE" && \
 echo "   * SIMD enable as flags:       $ASFLAGS_FPU_DISABLE_SIMD_ENABLE" && \
 echo "   * FPU enable as flags:        $ASFLAGS_FPU_ENABLE_SIMD_DISABLE" && \
 echo "   * SIMD+FPU disable as flags:  $ASFLAGS_FPUSIMD_DISABLE" && \
+
 echo "   * SIMD+FPU enable as flags:   $ASFLAGS_FPUSIMD_ENABLE"
 echo "   * Debug enabled:              $ax_enable_debug"
 echo "   * Coverage enabled:           $ax_enable_coverage"
@@ -5834,6 +5837,8 @@ echo "   * Linux Kernel Module:        $ENABLED_LINUXKM"
 echo "   * valgrind unit tests:        $ENABLED_VALGRIND"
 echo "   * LIBZ:                       $ENABLED_LIBZ"
 echo "   * Examples:                   $ENABLED_EXAMPLES"
+echo "   * Crypt tests:                $ENABLED_CRYPT_TESTS"
+echo "   * Stack sizes in tests:       $ENABLED_STACKSIZE"
 echo "   * User Crypto:                $ENABLED_USER_CRYPTO"
 echo "   * Fast RSA:                   $ENABLED_FAST_RSA"
 echo "   * Single Precision:           $ENABLED_SP"
diff --git a/src/include.am b/src/include.am
index 78abea93a..c03d04b93 100644
--- a/src/include.am
+++ b/src/include.am
@@ -293,8 +293,12 @@ endif !BUILD_FIPS_RAND
 src_libwolfssl_la_SOURCES += \
                wolfcrypt/src/logging.c \
                wolfcrypt/src/wc_port.c \
-               wolfcrypt/src/error.c \
+               wolfcrypt/src/error.c
+
+if BUILD_DEBUG
+src_libwolfssl_la_SOURCES += \
                wolfcrypt/src/debug.c
+endif
 
 if !BUILD_FIPS_RAND
 src_libwolfssl_la_SOURCES += \
diff --git a/wolfcrypt/src/debug.c b/wolfcrypt/src/debug.c
index 60adae5a4..cf51fc639 100644
--- a/wolfcrypt/src/debug.c
+++ b/wolfcrypt/src/debug.c
@@ -24,19 +24,14 @@
     #include <config.h>
 #endif
 
-#ifndef WOLFSSL_USER_SETTINGS
-    #include <wolfssl/options.h>
-#endif
 #include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/version.h>
 #include <wolfssl/wolfcrypt/wc_port.h>
-#include <wolfssl/ssl.h>
-#include <wolfssl/test.h>
+#include <wolfssl/wolfcrypt/types.h>
 
 #ifdef HAVE_STACK_SIZE_VERBOSE
 WOLFSSL_API THREAD_LS_T unsigned char *StackSizeCheck_myStack = NULL;
-WOLFSSL_API     THREAD_LS_T size_t StackSizeCheck_stackSize = 0;
-WOLFSSL_API     THREAD_LS_T size_t StackSizeCheck_stackSizeHWM = 0;
-WOLFSSL_API     THREAD_LS_T size_t *StackSizeCheck_stackSizeHWM_ptr = 0;
-WOLFSSL_API     THREAD_LS_T void *StackSizeCheck_stackOffsetPointer = 0;
+WOLFSSL_API THREAD_LS_T size_t StackSizeCheck_stackSize = 0;
+WOLFSSL_API THREAD_LS_T size_t StackSizeCheck_stackSizeHWM = 0;
+WOLFSSL_API THREAD_LS_T size_t *StackSizeCheck_stackSizeHWM_ptr = 0;
+WOLFSSL_API THREAD_LS_T void *StackSizeCheck_stackOffsetPointer = 0;
 #endif