diff --git a/tests/api.c b/tests/api.c
index 32b90b9a07..0645aed2a4 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -14185,9 +14185,9 @@ static int test_wolfSSL_ECH_conn_ex(method_provider serverMeth,
     ExpectIntEQ(WOLFSSL_SUCCESS,
         wolfSSL_CTX_load_verify_locations(ctx, caCertFile, 0));
     ExpectIntEQ(WOLFSSL_SUCCESS,
-        wolfSSL_CTX_use_certificate_file(ctx, cliCertFile, SSL_FILETYPE_PEM));
+        wolfSSL_CTX_use_certificate_file(ctx, cliCertFile, WOLFSSL_FILETYPE_PEM));
     ExpectIntEQ(WOLFSSL_SUCCESS,
-        wolfSSL_CTX_use_PrivateKey_file(ctx, cliKeyFile, SSL_FILETYPE_PEM));
+        wolfSSL_CTX_use_PrivateKey_file(ctx, cliKeyFile, WOLFSSL_FILETYPE_PEM));
 
     tcp_connect(&sockfd, wolfSSLIP, server_args.signal->port, 0, 0, NULL);
 
@@ -16358,8 +16358,8 @@ static int test_wolfSSL_sk_SSL_CIPHER(void)
 #else
     ExpectNotNull(ctx = SSL_CTX_new(wolfSSLv23_client_method()));
 #endif
-    ExpectTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, SSL_FILETYPE_PEM));
-    ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM));
+    ExpectTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile, WOLFSSL_FILETYPE_PEM));
+    ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLFSSL_FILETYPE_PEM));
     ExpectNotNull(ssl = SSL_new(ctx));
     ExpectNotNull(sk = SSL_get_ciphers(ssl));
     ExpectNotNull(dupSk = sk_SSL_CIPHER_dup(sk));
@@ -16394,8 +16394,8 @@ static int test_wolfSSL_set1_curves_list(void)
     ExpectNotNull(ctx = SSL_CTX_new(wolfSSLv23_client_method()));
 #endif
     ExpectTrue(SSL_CTX_use_certificate_file(ctx, eccCertFile,
-               SSL_FILETYPE_PEM));
-    ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, eccKeyFile, SSL_FILETYPE_PEM));
+               WOLFSSL_FILETYPE_PEM));
+    ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, eccKeyFile, WOLFSSL_FILETYPE_PEM));
     ExpectNotNull(ssl = SSL_new(ctx));
 
     ExpectIntEQ(SSL_CTX_set1_curves_list(ctx, NULL), WC_NO_ERR_TRACE(WOLFSSL_FAILURE));
@@ -16553,8 +16553,8 @@ static int test_wolfSSL_set1_sigalgs_list(void)
     ExpectNotNull(ctx = SSL_CTX_new(wolfSSLv23_client_method()));
 #endif
     ExpectTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile,
-               SSL_FILETYPE_PEM));
-    ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM));
+               WOLFSSL_FILETYPE_PEM));
+    ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLFSSL_FILETYPE_PEM));
     ExpectNotNull(ssl = SSL_new(ctx));
 
     ExpectIntEQ(wolfSSL_CTX_set1_sigalgs_list(NULL, NULL), WC_NO_ERR_TRACE(WOLFSSL_FAILURE));
@@ -16703,8 +16703,8 @@ static int test_wolfSSL_set_tlsext_status_type(void)
 
     ExpectNotNull(ctx = SSL_CTX_new(wolfSSLv23_server_method()));
     ExpectTrue(SSL_CTX_use_certificate_file(ctx, svrCertFile,
-        SSL_FILETYPE_PEM));
-    ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, SSL_FILETYPE_PEM));
+        WOLFSSL_FILETYPE_PEM));
+    ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKeyFile, WOLFSSL_FILETYPE_PEM));
     ExpectNotNull(ssl = SSL_new(ctx));
     ExpectIntEQ(SSL_set_tlsext_status_type(ssl,TLSEXT_STATUSTYPE_ocsp),
         SSL_SUCCESS);
@@ -16774,7 +16774,7 @@ static int test_wolfSSL_X509_ALGOR_get0(void)
     const byte badObj[] = { 0x06, 0x00 };
 
     ExpectNotNull(x509 = wolfSSL_X509_load_certificate_file(cliCertFile,
-        SSL_FILETYPE_PEM));
+        WOLFSSL_FILETYPE_PEM));
     ExpectNotNull(alg = X509_get0_tbs_sigalg(x509));
 
     /* Invalid case */
@@ -19807,7 +19807,7 @@ static int test_wolfSSL_X509_SEP(void)
 #if 0
     /* Use certificate with the extension here. */
     ExpectNotNull(x509 = wolfSSL_X509_load_certificate_file(svrCertFile,
-        SSL_FILETYPE_PEM));
+        WOLFSSL_FILETYPE_PEM));
 
     outSz = 0;
     ExpectNotNull(out = wolfSSL_X509_get_device_type(x509, NULL, &outSz));
@@ -20592,7 +20592,7 @@ static int test_wolfSSL_CTX_ctrl(void)
             SSL_FILETYPE_ASN1));
 #else
         ExpectNotNull(ecX509 = wolfSSL_X509_load_certificate_file(
-            cliEccCertFile, SSL_FILETYPE_PEM));
+            cliEccCertFile, WOLFSSL_FILETYPE_PEM));
 #endif
         ExpectNotNull(pkey = X509_get_pubkey(ecX509));
         /* current ECC key is 256 bit (32 bytes) */
@@ -21022,9 +21022,9 @@ static int test_wolfSSL_OCSP_id_get0_info(void)
     ASN1_INTEGER* x509Int = NULL;
 
     ExpectNotNull(cert = wolfSSL_X509_load_certificate_file(svrCertFile,
-        SSL_FILETYPE_PEM));
+        WOLFSSL_FILETYPE_PEM));
     ExpectNotNull(issuer = wolfSSL_X509_load_certificate_file(caCertFile,
-        SSL_FILETYPE_PEM));
+        WOLFSSL_FILETYPE_PEM));
 
     ExpectNotNull(id = OCSP_cert_to_id(NULL, cert, issuer));
     ExpectNotNull(id2 = OCSP_cert_to_id(NULL, cert, issuer));
@@ -27379,7 +27379,7 @@ static int test_wolfSSL_crypto_policy_certs_and_keys(void)
         if (ctx != NULL) {
             /* 1024 RSA */
             rc = SSL_CTX_use_PrivateKey_file(ctx, key1024,
-                                             SSL_FILETYPE_PEM);
+                                             WOLFSSL_FILETYPE_PEM);
 
             if (is_legacy) {
                 ExpectIntEQ(rc, WOLFSSL_SUCCESS);
@@ -27390,7 +27390,7 @@ static int test_wolfSSL_crypto_policy_certs_and_keys(void)
 
             /* 2048 RSA */
             rc = SSL_CTX_use_PrivateKey_file(ctx, key2048,
-                                             SSL_FILETYPE_PEM);
+                                             WOLFSSL_FILETYPE_PEM);
 
             if (!is_future) {
                 ExpectIntEQ(rc, WOLFSSL_SUCCESS);
@@ -27401,17 +27401,17 @@ static int test_wolfSSL_crypto_policy_certs_and_keys(void)
 
             /* 3072 RSA */
             rc = SSL_CTX_use_PrivateKey_file(ctx, key3072,
-                                             SSL_FILETYPE_PEM);
+                                             WOLFSSL_FILETYPE_PEM);
             ExpectIntEQ(rc, WOLFSSL_SUCCESS);
 
             /* 256 ecc */
             rc = SSL_CTX_use_PrivateKey_file(ctx, key256,
-                                             SSL_FILETYPE_PEM);
+                                             WOLFSSL_FILETYPE_PEM);
             ExpectIntEQ(rc, WOLFSSL_SUCCESS);
 
             /* 384 ecc */
             rc = SSL_CTX_use_PrivateKey_file(ctx, key384,
-                                             SSL_FILETYPE_PEM);
+                                             WOLFSSL_FILETYPE_PEM);
             ExpectIntEQ(rc, WOLFSSL_SUCCESS);
 
             /* cleanup */
@@ -27867,9 +27867,9 @@ static int test_wolfSSL_SSL_in_init(void)
 #endif
     if ((testCertFile != NULL) && (testKeyFile != NULL)) {
         ExpectTrue(SSL_CTX_use_certificate_file(ctx, testCertFile,
-            SSL_FILETYPE_PEM));
+            WOLFSSL_FILETYPE_PEM));
         ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, testKeyFile,
-            SSL_FILETYPE_PEM));
+            WOLFSSL_FILETYPE_PEM));
     }
 
     ExpectNotNull(ssl = SSL_new(ctx));
@@ -28192,9 +28192,9 @@ static int test_wolfSSL_set_psk_use_session_callback(void)
 #endif
     if ((testCertFile != NULL) && (testKeyFile != NULL)) {
         ExpectTrue(SSL_CTX_use_certificate_file(ctx, testCertFile,
-            SSL_FILETYPE_PEM));
+            WOLFSSL_FILETYPE_PEM));
         ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, testKeyFile,
-            SSL_FILETYPE_PEM));
+            WOLFSSL_FILETYPE_PEM));
     }
 
     ExpectNotNull(ssl = SSL_new(ctx));
@@ -28413,9 +28413,9 @@ static int test_SSL_CIPHER_get_xxx(void)
     #endif
         if  (testCertFile != NULL && testKeyFile != NULL) {
             ExpectTrue(SSL_CTX_use_certificate_file(ctx, testCertFile,
-                                                    SSL_FILETYPE_PEM));
+                                                    WOLFSSL_FILETYPE_PEM));
             ExpectTrue(SSL_CTX_use_PrivateKey_file(ctx, testKeyFile,
-                                                    SSL_FILETYPE_PEM));
+                                                    WOLFSSL_FILETYPE_PEM));
         }
 
         ExpectNotNull(ssl = SSL_new(ctx));
diff --git a/tests/api/test_dtls.c b/tests/api/test_dtls.c
index ccacf370ba..f8524fe3df 100644
--- a/tests/api/test_dtls.c
+++ b/tests/api/test_dtls.c
@@ -1291,22 +1291,22 @@ int test_dtls_rtx_across_epoch_change(void)
     /* CH0 */
     wolfSSL_SetLoggingPrefix("client:");
     ExpectIntEQ(wolfSSL_connect(ssl_c), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* HRR */
     wolfSSL_SetLoggingPrefix("server:");
     ExpectIntEQ(wolfSSL_accept(ssl_s), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* CH1 */
     wolfSSL_SetLoggingPrefix("client:");
     ExpectIntEQ(wolfSSL_connect(ssl_c), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* SH ... FINISHED */
     wolfSSL_SetLoggingPrefix("server:");
     ExpectIntEQ(wolfSSL_accept(ssl_s), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* we should have now SH ... FINISHED messages in the buffer*/
     ExpectIntGE(test_ctx.c_msg_count, 2);
@@ -1319,7 +1319,7 @@ int test_dtls_rtx_across_epoch_change(void)
     /* Read the SH */
     wolfSSL_SetLoggingPrefix("client:");
     ExpectIntEQ(wolfSSL_connect(ssl_c), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* trigger client timeout */
     ExpectIntEQ(wolfSSL_dtls_got_timeout(ssl_c), WOLFSSL_SUCCESS);
diff --git a/tests/api/test_dtls13.c b/tests/api/test_dtls13.c
index 3be0df3ebf..43f992e9d3 100644
--- a/tests/api/test_dtls13.c
+++ b/tests/api/test_dtls13.c
@@ -1530,19 +1530,19 @@ int test_dtls13_min_rtx_interval(void)
 
     /* CH0 */
     ExpectIntEQ(wolfSSL_connect(ssl_c), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* HRR */
     ExpectIntEQ(wolfSSL_accept(ssl_s), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* CH1 */
     ExpectIntEQ(wolfSSL_connect(ssl_c), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* SH ... FINISHED */
     ExpectIntEQ(wolfSSL_accept(ssl_s), -1);
-    ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), SSL_ERROR_WANT_READ);
+    ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), WOLFSSL_ERROR_WANT_READ);
 
     /* We should have SH ... FINISHED messages in the buffer */
     ExpectIntGE(test_ctx.c_msg_count, 2);
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index 3ef6df3b28..07f5829f1e 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -146,7 +146,7 @@
 #endif
 #endif
 
-#if (defined(HAVE_FIPS) && FIPS_VERSION3_LT(7,0,0)) || defined(HAVE_SELFTEST)
+#if defined(HAVE_FIPS) || defined(HAVE_SELFTEST)
     #define INLINE WC_INLINE
 #endif