diff --git a/cf/crypto.m4 b/cf/crypto.m4
index 8caa6d5aa..fbf9ee8c9 100644
--- a/cf/crypto.m4
+++ b/cf/crypto.m4
@@ -11,6 +11,7 @@ m4_define([test_headers], [
 		#ifdef HAVE_SYS_TYPES_H
 		#include <sys/types.h>
 		#endif
+		#include <openssl/evp.h>
 		#include <openssl/md4.h>
 		#include <openssl/md5.h>
 		#include <openssl/sha.h>
@@ -20,10 +21,10 @@ m4_define([test_headers], [
 		#include <openssl/engine.h>
 		#include <openssl/ui.h>
 		#include <openssl/rand.h>
-		#include <openssl/evp.h>
 		#include <openssl/hmac.h>
 		#include <openssl/pkcs12.h>
 		#else
+		#include <hcrypto/evp.h>
 		#include <hcrypto/md4.h>
 		#include <hcrypto/md5.h>
 		#include <hcrypto/sha.h>
@@ -31,7 +32,6 @@ m4_define([test_headers], [
 		#include <hcrypto/rc4.h>
 		#include <hcrypto/aes.h>
 		#include <hcrypto/engine.h>
-		#include <hcrypto/evp.h>
 		#include <hcrypto/hmac.h>
 		#include <hcrypto/pkcs12.h>
 		#endif
diff --git a/include/make_crypto.c b/include/make_crypto.c
index 135bfdf3c..e85c3cdcc 100644
--- a/include/make_crypto.c
+++ b/include/make_crypto.c
@@ -63,6 +63,7 @@ main(int argc, char **argv)
     fputs("#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY\n", f);
     fputs("#define OPENSSL_DES_LIBDES_COMPATIBILITY\n", f);
     fputs("#endif\n", f);
+    fputs("#include <openssl/evp.h>\n", f);
     fputs("#include <openssl/des.h>\n", f);
     fputs("#include <openssl/rc4.h>\n", f);
     fputs("#include <openssl/rc2.h>\n", f);
@@ -72,7 +73,6 @@ main(int argc, char **argv)
     fputs("#include <openssl/sha.h>\n", f);
     fputs("#include <openssl/aes.h>\n", f);
     fputs("#include <openssl/ui.h>\n", f);
-    fputs("#include <openssl/evp.h>\n", f);
     fputs("#include <openssl/rand.h>\n", f);
     fputs("#include <openssl/engine.h>\n", f);
     fputs("#include <openssl/pkcs12.h>\n", f);
@@ -85,6 +85,7 @@ main(int argc, char **argv)
     fputs("#ifdef KRB5\n", f);
     fputs("#include <krb5-types.h>\n", f);
     fputs("#endif\n", f);
+    fputs("#include <hcrypto/evp.h>\n", f);
     fputs("#include <hcrypto/des.h>\n", f);
     fputs("#include <hcrypto/md2.h>\n", f);
     fputs("#include <hcrypto/md4.h>\n", f);
@@ -94,7 +95,6 @@ main(int argc, char **argv)
     fputs("#include <hcrypto/rc2.h>\n", f);
     fputs("#include <hcrypto/aes.h>\n", f);
     fputs("#include <hcrypto/ui.h>\n", f);
-    fputs("#include <hcrypto/evp.h>\n", f);
     fputs("#include <hcrypto/rand.h>\n", f);
     fputs("#include <hcrypto/engine.h>\n", f);
     fputs("#include <hcrypto/pkcs12.h>\n", f);