diff --git a/wolfcrypt/src/hmac.c b/wolfcrypt/src/hmac.c
index 47f8f1382..6f1682929 100644
--- a/wolfcrypt/src/hmac.c
+++ b/wolfcrypt/src/hmac.c
@@ -24,6 +24,7 @@
     #include <config.h>
 #endif
 
+#include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/wolfcrypt/wc_port.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
 #include <wolfssl/wolfcrypt/logging.h>
diff --git a/wolfcrypt/src/kdf.c b/wolfcrypt/src/kdf.c
index 1bb338e80..c83cf2bec 100644
--- a/wolfcrypt/src/kdf.c
+++ b/wolfcrypt/src/kdf.c
@@ -24,6 +24,7 @@
     #include <config.h>
 #endif
 
+#include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/wolfcrypt/wc_port.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
 #include <wolfssl/wolfcrypt/logging.h>
diff --git a/wolfcrypt/src/wc_kyber_poly.c b/wolfcrypt/src/wc_kyber_poly.c
index 52c8af356..d780655f9 100644
--- a/wolfcrypt/src/wc_kyber_poly.c
+++ b/wolfcrypt/src/wc_kyber_poly.c
@@ -49,7 +49,7 @@
  * WOLFSSL_SMALL_STACK                                        Default: OFF
  *   Use less stack by dynamically allocating local variables.
  *
- * WOLFSSL_KYBER_NTT_UNROLL                                   Defualt: OFF
+ * WOLFSSL_KYBER_NTT_UNROLL                                   Default: OFF
  *   Enable an alternative NTT implementation that may be faster on some
  *   platforms and is smaller in code size.
  * WOLFSSL_KYBER_INVNTT_UNROLL                                Default: OFF
@@ -61,6 +61,7 @@
     #include <config.h>
 #endif
 
+#include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/wolfcrypt/wc_kyber.h>
 #include <wolfssl/wolfcrypt/cpuid.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
@@ -1133,7 +1134,7 @@ void kyber_keygen(sword16* priv, sword16* pub, sword16* e, const sword16* a,
     }
 }
 
-/* Encapsuluate message.
+/* Encapsulate message.
  *
  * @param  [in]   pub  Public key vector of polynomials.
  * @param  [out]  bp   Vector of polynomials.
@@ -1266,7 +1267,7 @@ void kyber_keygen(sword16* priv, sword16* pub, sword16* e, const sword16* a,
     }
 }
 
-/* Encapsuluate message.
+/* Encapsulate message.
  *
  * @param  [in]   pub  Public key vector of polynomials.
  * @param  [out]  bp   Vector of polynomials.
@@ -2713,7 +2714,7 @@ static void kyber_cbd_eta3(sword16* p, const byte* r)
 /* Get noise/error by calculating random bytes and sampling to a binomial
  * distribution.
  *
- * @param  [in, out]  prf   Psuedo-random function object.
+ * @param  [in, out]  prf   Pseudo-random function object.
  * @param  [out]      p     Polynomial.
  * @param  [in]       seed  Seed to use when calculating random.
  * @param  [in]       eta1  Size of noise/error integers.
@@ -2756,7 +2757,7 @@ static int kyber_get_noise_eta1_c(KYBER_PRF_T* prf, sword16* p,
 /* Get noise/error by calculating random bytes and sampling to a binomial
  * distribution. Values -2..2
  *
- * @param  [in, out]  prf   Psuedo-random function object.
+ * @param  [in, out]  prf   Pseudo-random function object.
  * @param  [out]      p     Polynomial.
  * @param  [in]       seed  Seed to use when calculating random.
  * @return  0 on success.
@@ -2835,7 +2836,7 @@ static void kyber_get_noise_x4_eta3_avx2(byte* rand, byte* seed)
 /* Get noise/error by calculating random bytes and sampling to a binomial
  * distribution. Values -2..2
  *
- * @param  [in, out]  prf   Psuedo-random function object.
+ * @param  [in, out]  prf   Pseudo-random function object.
  * @param  [out]      p     Polynomial.
  * @param  [in]       seed  Seed to use when calculating random.
  * @return  0 on success.
@@ -2858,7 +2859,7 @@ static int kyber_get_noise_eta2_avx2(KYBER_PRF_T* prf, sword16* p,
 /* Get the noise/error by calculating random bytes and sampling to a binomial
  * distribution.
  *
- * @param  [in, out]  prf   Psuedo-random function object.
+ * @param  [in, out]  prf   Pseudo-random function object.
  * @param  [out]      vec1  First Vector of polynomials.
  * @param  [out]      vec2  Second Vector of polynomials.
  * @param  [out]      poly  Polynomial.
@@ -2925,7 +2926,7 @@ static int kyber_get_noise_k3_avx2(sword16* vec1, sword16* vec2, sword16* poly,
 /* Get the noise/error by calculating random bytes and sampling to a binomial
  * distribution.
  *
- * @param  [in, out]  prf   Psuedo-random function object.
+ * @param  [in, out]  prf   Pseudo-random function object.
  * @param  [out]      vec1  First Vector of polynomials.
  * @param  [out]      vec2  Second Vector of polynomials.
  * @param  [out]      poly  Polynomial.
@@ -3163,7 +3164,7 @@ static int kyber_get_noise_k4_aarch64(sword16* vec1, sword16* vec2,
 /* Get the noise/error by calculating random bytes and sampling to a binomial
  * distribution.
  *
- * @param  [in, out]  prf   Psuedo-random function object.
+ * @param  [in, out]  prf   Pseudo-random function object.
  * @param  [in]       kp    Number of polynomials in vector.
  * @param  [out]      vec1  First Vector of polynomials.
  * @param  [in]       eta1  Size of noise/error integers with first vector.
@@ -3208,7 +3209,7 @@ static int kyber_get_noise_c(KYBER_PRF_T* prf, int kp, sword16* vec1, int eta1,
 /* Get the noise/error by calculating random bytes and sampling to a binomial
  * distribution.
  *
- * @param  [in, out]  prf   Psuedo-random function object.
+ * @param  [in, out]  prf   Pseudo-random function object.
  * @param  [in]       kp    Number of polynomials in vector.
  * @param  [out]      vec1  First Vector of polynomials.
  * @param  [out]      vec2  Second Vector of polynomials.
diff --git a/wolfcrypt/src/wc_lms_impl.c b/wolfcrypt/src/wc_lms_impl.c
index bb9345c9a..49c13c165 100644
--- a/wolfcrypt/src/wc_lms_impl.c
+++ b/wolfcrypt/src/wc_lms_impl.c
@@ -41,6 +41,7 @@
     #include <config.h>
 #endif
 
+#include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/wolfcrypt/wc_lms.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
 
diff --git a/wolfssl/wolfcrypt/wc_lms.h b/wolfssl/wolfcrypt/wc_lms.h
index 0f3169622..d7317eadd 100644
--- a/wolfssl/wolfcrypt/wc_lms.h
+++ b/wolfssl/wolfcrypt/wc_lms.h
@@ -88,6 +88,8 @@
 #ifndef WC_LMS_H
 #define WC_LMS_H
 
+#include <wolfssl/wolfcrypt/types.h>
+
 #if defined(WOLFSSL_HAVE_LMS) && defined(WOLFSSL_WC_LMS)
 
 #include <wolfssl/wolfcrypt/lms.h>