diff --git a/cf/crypto.m4 b/cf/crypto.m4
index fddbd3431..da0778817 100644
--- a/cf/crypto.m4
+++ b/cf/crypto.m4
@@ -11,12 +11,16 @@ m4_define([test_headers], [
 		#include <sys/types.h>
 		#endif
 		#include <openssl/evp.h>
+		#include <openssl/bn.h>
 		#include <openssl/md4.h>
 		#include <openssl/md5.h>
 		#include <openssl/sha.h>
 		#include <openssl/des.h>
 		#include <openssl/rc4.h>
 		#include <openssl/aes.h>
+		#include <openssl/rsa.h>
+		#include <openssl/dsa.h>
+		#include <openssl/dh.h>
 		#include <openssl/ec.h>
 		#include <openssl/engine.h>
 		#include <openssl/ui.h>
diff --git a/include/crypto-headers.h b/include/crypto-headers.h
index a23aaf86e..ed2f5b8f2 100644
--- a/include/crypto-headers.h
+++ b/include/crypto-headers.h
@@ -22,9 +22,13 @@
 #include <openssl/pkcs12.h>
 #include <openssl/pem.h>
 #include <openssl/hmac.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
 #include <openssl/ecdh.h>
+#include <openssl/dh.h>
+#include <openssl/bn.h>
 #ifndef BN_is_negative
 #define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
 #define BN_is_negative(bn) ((bn)->neg != 0)