diff --git a/src/ssl.c b/src/ssl.c
index 1afe54ac1..3a90dfa11 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -34897,7 +34897,7 @@ int wolfSSL_BN_is_word(const WOLFSSL_BIGNUM* bn, WOLFSSL_BN_ULONG w)
         return WOLFSSL_FAILURE;
     }
 
-    if (w <= MP_MASK) {
+    if (w <= (WOLFSSL_BN_ULONG) MP_MASK) {
         if (mp_isword((mp_int*)bn->internal, (mp_digit)w) == MP_YES) {
             return WOLFSSL_SUCCESS;
         }
@@ -35548,7 +35548,7 @@ static int wolfSSL_BN_add_word_int(WOLFSSL_BIGNUM *bn, WOLFSSL_BN_ULONG w,
     }
 
     if (ret == WOLFSSL_SUCCESS) {
-        if (w <= MP_MASK) {
+        if (w <= (WOLFSSL_BN_ULONG) MP_MASK) {
             if (sub == 1) {
                 rc = mp_sub_d((mp_int*)bn->internal, (mp_digit)w,
                               (mp_int*)bn->internal);
@@ -35856,7 +35856,7 @@ WOLFSSL_BN_ULONG wolfSSL_BN_mod_word(const WOLFSSL_BIGNUM *bn,
         return (WOLFSSL_BN_ULONG)WOLFSSL_FATAL_ERROR;
     }
 
-    if (w <= MP_MASK) {
+    if (w <= (WOLFSSL_BN_ULONG) MP_MASK) {
         mp_digit bn_ret;
         if (mp_mod_d((mp_int*)bn->internal, (mp_digit)w, &bn_ret) != MP_OKAY) {
             WOLFSSL_MSG("mp_add_d error");
diff --git a/src/x509.c b/src/x509.c
index 1e6ff1e2c..83c62a1c4 100644
--- a/src/x509.c
+++ b/src/x509.c
@@ -6525,9 +6525,9 @@ static int x509AddCertDir(WOLFSSL_BY_DIR *ctx, const char *argc, long argl)
 #else
     (void)ctx;
     (void)argc;
+    (void)argl;
     return WOLFSSL_NOT_IMPLEMENTED;
 #endif
-    (void)argl;
 }
 
 /* set additional data to X509_LOOKUP                                   */
@@ -12233,7 +12233,7 @@ int wolfSSL_X509_set_pubkey(WOLFSSL_X509 *cert, WOLFSSL_EVP_PKEY *pkey)
 int wolfSSL_X509_set_version(WOLFSSL_X509* x509, long v)
 {
     WOLFSSL_ENTER("wolfSSL_X509_set_version");
-    if ((x509 == NULL) || (v < 0) || (v >= INT_MAX)) {
+    if ((x509 == NULL) || (v < 0) || ((int) v >= INT_MAX)) {
         return WOLFSSL_FAILURE;
     }
     x509->version = (int) v + 1;
diff --git a/wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h b/wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h
index 0ecc37b26..c41d5ad4c 100644
--- a/wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h
+++ b/wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h
@@ -31,6 +31,18 @@
 #endif
 
 #include "r_tsip_rx_if.h"
+
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
+#ifndef WOLFSSL_USER_SETTINGS
+    #include <wolfssl/options.h>
+#endif
+#include <wolfssl/wolfcrypt/settings.h>
+
+#include <wolfssl/wolfcrypt/visibility.h>
+#include <wolfssl/wolfcrypt/ecc.h>
 #include <wolfssl/wolfcrypt/logging.h>
 
 #ifdef __cplusplus