diff --git a/lib/hcrypto/NTMakefile b/lib/hcrypto/NTMakefile
index c35059517..8063ca616 100644
--- a/lib/hcrypto/NTMakefile
+++ b/lib/hcrypto/NTMakefile
@@ -41,7 +41,7 @@ HEIMBASEDIR = $(SRC)\lib\base
 
 HX509DIR = $(SRC)\lib\hx509
 
-!if INCLUDE_openssl_crypto
+!ifdef INCLUDE_openssl_crypto
 openssl_inc=-I$(INCLUDE_openssl_crypto)
 !endif
 
diff --git a/lib/hcrypto/evp-openssl.c b/lib/hcrypto/evp-openssl.c
index 188c09797..98463bd16 100644
--- a/lib/hcrypto/evp-openssl.c
+++ b/lib/hcrypto/evp-openssl.c
@@ -36,6 +36,7 @@
 #include <heimbase.h>
 
 #include <assert.h>
+#include <evp.h>
 
 #ifdef HAVE_HCRYPTO_W_OPENSSL
 
@@ -48,7 +49,6 @@
  *       never use knowledge of opaque OpenSSL type internals.
  */
 
-#include <evp.h>
 #include <evp-openssl.h>
 
 /*
@@ -401,6 +401,16 @@ get_EVP_MD(heim_base_once_t *once, hc_EVP_MD *hc_memoize,
                           &initialized, NID_##name);                    \
     }
 
+#else /* HAVE_HCRYPTO_W_OPENSSL */
+
+#define OSSL_CIPHER_ALGORITHM(name, flags)                              \
+    const hc_EVP_CIPHER *hc_EVP_ossl_##name(void) { return NULL; }
+
+#define OSSL_MD_ALGORITHM(name)                                         \
+    const hc_EVP_MD *hc_EVP_ossl_##name(void) { return NULL; }
+
+#endif /* HAVE_HCRYPTO_W_OPENSSL */
+
 /**
  * The triple DES cipher type (OpenSSL provider)
  *
@@ -621,7 +631,3 @@ OSSL_MD_ALGORITHM(sha384)
  * @ingroup hcrypto_evp
  */
 OSSL_MD_ALGORITHM(sha512)
-
-#else /* HAVE_HCRYPTO_W_OPENSSL */
-static char dummy;
-#endif /* HAVE_HCRYPTO_W_OPENSSL */