diff --git a/src/internal.c b/src/internal.c
index 30422bcde..cc90de0e5 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -2699,7 +2699,8 @@ static INLINE void DecodeSigAlg(const byte* input, byte* hashAlgo, byte* hsType)
 }
 #endif /* !NO_WOLFSSL_SERVER || !NO_CERTS */
 
-#if !defined(NO_DH) || defined(HAVE_ECC)
+#if !defined(NO_DH) || defined(HAVE_ECC) || \
+    (!defined(NO_RSA) && defined(WC_RSA_PSS))
 
 static enum wc_HashType HashAlgoToType(int hashAlgo)
 {
@@ -2729,9 +2730,11 @@ static enum wc_HashType HashAlgoToType(int hashAlgo)
     return WC_HASH_TYPE_NONE;
 }
 
-#ifndef NO_CERTS
+#endif /* !NO_DH || HAVE_ECC || (!NO_RSA && WC_RSA_PSS) */
 
 
+#ifndef NO_CERTS
+
 void InitX509Name(WOLFSSL_X509_NAME* name, int dynamicFlag)
 {
     (void)dynamicFlag;
@@ -2840,10 +2843,8 @@ void FreeX509(WOLFSSL_X509* x509)
     if (x509->altNames)
         FreeAltNames(x509->altNames, x509->heap);
 }
-#endif /* !NO_CERTS */
-#endif /* !NO_DH || HAVE_ECC */
 
-#ifndef NO_CERTS
+
 /* Encode the signature algorithm into buffer.
  *
  * hashalgo  The hash algorithm.
diff --git a/tests/api.c b/tests/api.c
index c6b98dad2..fc7a400cf 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -10636,7 +10636,7 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
     const int hour = 60*60;
     const int min  = 60;
     const byte asn_utc_time = ASN_UTC_TIME;
-#ifndef TIME_T_NOT_LONG
+#if !defined(TIME_T_NOT_LONG) && !defined(NO_64BIT)
     const byte asn_gen_time = ASN_GENERALIZED_TIME;
 #endif
     WOLFSSL_ASN1_TIME *asn_time, *s;
@@ -10671,7 +10671,7 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
     XMEMSET(date_str, 0, sizeof(date_str));
 
     /* Generalized time will overflow time_t if not long */
-#ifndef TIME_T_NOT_LONG
+#if !defined(TIME_T_NOT_LONG) && !defined(NO_64BIT)
     s = (WOLFSSL_ASN1_TIME*)XMALLOC(sizeof(WOLFSSL_ASN1_TIME), NULL,
                                     DYNAMIC_TYPE_OPENSSL);
     /* GeneralizedTime notation test */
@@ -10686,7 +10686,7 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
 
     XFREE(s,NULL,DYNAMIC_TYPE_OPENSSL);
     XMEMSET(date_str, 0, sizeof(date_str));
-#endif
+#endif /* !TIME_T_NOT_LONG && !NO_64BIT */
 
     /* if WOLFSSL_ASN1_TIME struct is not allocated */
     s = NULL;