diff --git a/cf/crypto.m4 b/cf/crypto.m4
index e7bbf83bb..26063992d 100644
--- a/cf/crypto.m4
+++ b/cf/crypto.m4
@@ -17,21 +17,23 @@ m4_define([test_headers], [
 		#include <openssl/des.h>
 		#include <openssl/rc4.h>
 		#include <openssl/aes.h>
+		#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 <md4.h>
-		#include <md5.h>
-		#include <sha.h>
-		#include <des.h>
-		#include <rc4.h>
-		#include <aes.h>
-		#include <evp.h>
-		#include <hmac.h>
-		#include <pkcs12.h>
+		#include <hcrypto/md4.h>
+		#include <hcrypto/md5.h>
+		#include <hcrypto/sha.h>
+		#include <hcrypto/des.h>
+		#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
 		])
 m4_define([test_body], [