diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras
index 4db52f1914..74386583cf 100644
--- a/.wolfssl_known_macro_extras
+++ b/.wolfssl_known_macro_extras
@@ -30,8 +30,8 @@ ARDUINO_UNOR4_WIFI
 ASN_DUMP_OID
 ASN_TEMPLATE_SKIP_ISCA_CHECK
 ATCAPRINTF
-ATCA_HAL_I2C
 ATCA_ENABLE_DEPRECATED
+ATCA_HAL_I2C
 ATCA_TFLEX_SUPPORT
 ATECC_DEV_TYPE
 AVR
@@ -471,7 +471,6 @@ NO_WOLFSSL_RENESAS_FSPSM_AES
 NO_WOLFSSL_RENESAS_FSPSM_HASH
 NO_WOLFSSL_RENESAS_TSIP_CRYPT_AES
 NO_WOLFSSL_SHA256
-NO_WOLFSSL_SHA256_INTERLEAVE
 NO_WOLFSSL_SHA512_INTERLEAVE
 NO_WOLFSSL_SKIP_TRAILING_PAD
 NO_WOLFSSL_SMALL_STACK_STATIC
@@ -628,7 +627,6 @@ USS_API
 WC_AESXTS_STREAM_NO_REQUEST_ACCOUNTING
 WC_AES_BS_WORD_SIZE
 WC_AES_GCM_DEC_AUTH_EARLY
-WC_ALLOW_ECC_ZERO_HASH
 WC_ASN_HASH_SHA256
 WC_ASN_RUNTIME_DATE_CHECK_CONTROL
 WC_ASYNC_ENABLE_ECC_KEYGEN
@@ -653,8 +651,6 @@ WC_ASYNC_NO_SHA512
 WC_ASYNC_NO_X25519
 WC_ASYNC_THREAD_BIND
 WC_CACHE_RESISTANT_BASE64_TABLE
-WC_DILITHIUM_CACHE_PRIV_VECTORS
-WC_DILITHIUM_CACHE_PUB_VECTORS
 WC_DILITHIUM_FIXED_ARRAY
 WC_DISABLE_RADIX_ZERO_PAD
 WC_FLAG_DONT_USE_AESNI
@@ -719,11 +715,9 @@ WOLFSSL_ASN_EXTRA
 WOLFSSL_ASN_TEMPLATE_NEED_SET_INT32
 WOLFSSL_ASN_TEMPLATE_TYPE_CHECK
 WOLFSSL_ATECC508
-WOLFSSL_ATECC508A_NOIDLE
 WOLFSSL_ATECC508A_NOSOFTECC
 WOLFSSL_ATECC508A_TLS
 WOLFSSL_ATECC_ECDH_IOENC
-WOLFSSL_ATECC_NO_ECDH_ENC
 WOLFSSL_ATECC_RNG
 WOLFSSL_ATECC_TFLXTLS
 WOLFSSL_ATECC_TNGTLS
@@ -744,15 +738,11 @@ WOLFSSL_CLIENT_EXAMPLE
 WOLFSSL_CONTIKI
 WOLFSSL_CRL_ALLOW_MISSING_CDP
 WOLFSSL_DILITHIUM_ASSIGN_KEY
-WOLFSSL_DILITHIUM_NO_ASN1
 WOLFSSL_DILITHIUM_NO_CHECK_KEY
 WOLFSSL_DILITHIUM_NO_MAKE
 WOLFSSL_DILITHIUM_REVERSE_HASH_OID
 WOLFSSL_DILITHIUM_SIGN_CHECK_W0
 WOLFSSL_DILITHIUM_SIGN_CHECK_Y
-WOLFSSL_DILITHIUM_SIGN_SMALL_MEM_PRECALC
-WOLFSSL_DILITHIUM_SIGN_SMALL_MEM_PRECALC_A
-WOLFSSL_DILITHIUM_SMALL_MEM_POLY64
 WOLFSSL_DISABLE_EARLY_SANITY_CHECKS
 WOLFSSL_DRBG_SHA256
 WOLFSSL_DTLS_DISALLOW_FUTURE
@@ -809,10 +799,8 @@ WOLFSSL_LINUXKM_USE_GET_RANDOM_USER_KRETPROBE
 WOLFSSL_LINUXKM_USE_MUTEXES
 WOLFSSL_LMS_CACHE_BITS
 WOLFSSL_LMS_FULL_HASH
-WOLFSSL_LMS_LARGE_CACHES
 WOLFSSL_LMS_MAX_HEIGHT
 WOLFSSL_LMS_MAX_LEVELS
-WOLFSSL_LMS_NO_SIG_CACHE
 WOLFSSL_LMS_ROOT_LEVELS
 WOLFSSL_LPC43xx
 WOLFSSL_MAKE_SYSTEM_NAME_LINUX
@@ -869,16 +857,10 @@ WOLFSSL_NO_TICKET_EXPIRE
 WOLFSSL_NO_TRUSTED_CERTS_VERIFY
 WOLFSSL_NO_WORD64_OPS
 WOLFSSL_NO_XOR_OPS
-WOLFSSL_NXP_LPC55S6X
-WOLFSSL_NXP_CASPER
-WOLFSSL_NXP_CASPER_ECC_MULMOD
-WOLFSSL_NXP_CASPER_ECC_MUL2ADD
-WOLFSSL_NXP_CASPER_RSA_PUB_EXPTMOD
-WOLFSSL_NXP_HASHCRYPT
-WOLFSSL_NXP_HASHCRYPT_AES
-WOLFSSL_NXP_HASHCRYPT_SHA
-WOLFSSL_NXP_RNG_1
 WOLFSSL_NRF51_AES
+WOLFSSL_NXP_CASPER_ECC_MUL2ADD
+WOLFSSL_NXP_CASPER_ECC_MULMOD
+WOLFSSL_NXP_LPC55S6X
 WOLFSSL_OLDTLS_AEAD_CIPHERSUITES
 WOLFSSL_OLD_SET_CURVES_LIST
 WOLFSSL_OLD_TIMINGPADVERIFY
@@ -971,10 +953,8 @@ WOLFSSL_USE_FLASHMEM
 WOLFSSL_USE_FORCE_ZERO
 WOLFSSL_USE_OPTIONS_H
 WOLFSSL_VALIDATE_DH_KEYGEN
-WOLFSSL_WC_LMS_SERIALIZE_STATE
 WOLFSSL_WC_SLHDSA_RECURSIVE
 WOLFSSL_WC_XMSS_NO_SHA256
-WOLFSSL_WC_XMSS_NO_SHAKE256
 WOLFSSL_WICED_PSEUDO_UNIX_EPOCH_TIME
 WOLFSSL_X509_STORE_ALLOW_NON_CA_INTERMEDIATE
 WOLFSSL_X509_STORE_CERTS
@@ -983,7 +963,6 @@ WOLFSSL_XFREE_NO_NULLNESS_CHECK
 WOLFSSL_XILINX_CRYPTO_OLD
 WOLFSSL_XILINX_PATCH
 WOLFSSL_XIL_MSG_NO_SLEEP
-WOLFSSL_XMSS_LARGE_SECRET_KEY
 WOLFSSL_ZEPHYR
 WOLF_ALLOW_BUILTIN
 WOLF_CRYPTO_CB_CMD