diff --git a/src/ocsp.c b/src/ocsp.c
index 57d47d6a7..399eb0a23 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -639,6 +639,7 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE_bio(WOLFSSL_BIO* bio,
             return NULL;
         }
     }
+#ifndef NO_FILESYSTEM
     else if (bio->type == BIO_FILE) {
         long i;
         long l;
@@ -663,6 +664,7 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE_bio(WOLFSSL_BIO* bio,
 
         len = wolfSSL_BIO_read(bio, (char *)data, (int)l);
     }
+#endif
     else
         return NULL;
 
diff --git a/src/ssl.c b/src/ssl.c
index 0edef2155..05b8c5118 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -6864,6 +6864,7 @@ long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt, void* pt)
 }
 
 #ifndef NO_CERTS
+
 int wolfSSL_check_private_key(const WOLFSSL* ssl)
 {
     DecodedCert der;
@@ -17803,7 +17804,7 @@ char*  wolfSSL_X509_get_subjectCN(WOLFSSL_X509* x509)
 
 #ifdef OPENSSL_EXTRA
 
-#ifdef FORTRESS
+#if defined(FORTRESS) && !defined(NO_FILESYSTEM)
 int wolfSSL_cmp_peer_cert_to_file(WOLFSSL* ssl, const char *fname)
 {
     int ret = WOLFSSL_FATAL_ERROR;
@@ -24218,11 +24219,13 @@ void WOLFSSL_ERR_remove_thread_state(void* pid)
     return;
 }
 
+#ifndef NO_FILESYSTEM
 /***TBD ***/
 void wolfSSL_print_all_errors_fp(XFILE *fp)
 {
     (void)fp;
 }
+#endif
 
 int wolfSSL_SESSION_set_ex_data(WOLFSSL_SESSION* session, int idx, void* data)
 {
@@ -25191,8 +25194,14 @@ int wolfSSL_X509_NAME_digest(const WOLFSSL_X509_NAME *name,
     if (name == NULL || type == NULL)
         return WOLFSSL_FAILURE;
 
+#ifndef NO_FILESYSTEM
     return wolfSSL_EVP_Digest((unsigned char*)name->fullName.fullName,
                               name->fullName.fullNameLen, md, len, type, NULL);
+#else
+    (void)md;
+    (void)len;
+    return NOT_COMPILED_IN;
+#endif
 }
 
 long wolfSSL_SSL_CTX_get_timeout(const WOLFSSL_CTX *ctx)
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 9d8f9a56f..9c43fc587 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -933,8 +933,8 @@ static int _SaveDerAndPem(const byte* der, int derSz,
     byte* pem, int pemSz, const char* fileDer,
     const char* filePem, int pemType, int errBase)
 {
-    int ret;
 #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
+    int ret;
     FILE* derFile;
 
     derFile = fopen(fileDer, "wb");