From: Bodo Möller <bodo@openssl.org>
Date: Wed, 21 Jul 1999 22:10:23 +0000 (+0000)
Subject: Torture weak compilers less by not automatically including x509.h where
X-Git-Tag: OpenSSL_0_9_4~78
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f0e8ae723cf8f86a91bdc5be8a6a5b956309729f;ds=sidebyside

Torture weak compilers less by not automatically including x509.h where
it is not needed.
---

diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index ec8157a4fb..cae549e1b8 100644
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -137,40 +137,19 @@ a_bool.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 a_bool.o: ../cryptlib.h
 a_bytes.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-a_bytes.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_bytes.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-a_bytes.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-a_bytes.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-a_bytes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_bytes.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_bytes.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_bytes.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_bytes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_bytes.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-a_bytes.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_bytes.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_bytes.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_bytes.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-a_bytes.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+a_bytes.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+a_bytes.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_bytes.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_bytes.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_bytes.o: ../../include/openssl/stack.h ../cryptlib.h
 a_d2i_fp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-a_d2i_fp.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-a_d2i_fp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_d2i_fp.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-a_d2i_fp.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-a_d2i_fp.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-a_d2i_fp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_d2i_fp.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_d2i_fp.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_d2i_fp.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_d2i_fp.o: ../../include/openssl/opensslconf.h
-a_d2i_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_d2i_fp.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_d2i_fp.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-a_d2i_fp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_d2i_fp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_d2i_fp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_d2i_fp.o: ../cryptlib.h
+a_d2i_fp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+a_d2i_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+a_d2i_fp.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_d2i_fp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_d2i_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_d2i_fp.o: ../../include/openssl/stack.h ../cryptlib.h
 a_digest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_digest.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 a_digest.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -189,22 +168,12 @@ a_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 a_digest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 a_digest.o: ../cryptlib.h
 a_dup.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-a_dup.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-a_dup.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_dup.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-a_dup.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-a_dup.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-a_dup.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_dup.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_dup.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_dup.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_dup.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_dup.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-a_dup.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_dup.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_dup.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_dup.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-a_dup.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+a_dup.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+a_dup.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+a_dup.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_dup.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_dup.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_dup.o: ../../include/openssl/stack.h ../cryptlib.h
 a_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
@@ -220,40 +189,19 @@ a_gentm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_gentm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 a_gentm.o: ../cryptlib.h
 a_hdr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-a_hdr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-a_hdr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_hdr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-a_hdr.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-a_hdr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-a_hdr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_hdr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_hdr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_hdr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_hdr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_hdr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-a_hdr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_hdr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_hdr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_hdr.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-a_hdr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+a_hdr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+a_hdr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+a_hdr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_hdr.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_hdr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_hdr.o: ../../include/openssl/stack.h ../cryptlib.h
 a_i2d_fp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-a_i2d_fp.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-a_i2d_fp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_i2d_fp.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-a_i2d_fp.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-a_i2d_fp.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-a_i2d_fp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_i2d_fp.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_i2d_fp.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_i2d_fp.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_i2d_fp.o: ../../include/openssl/opensslconf.h
-a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_i2d_fp.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_i2d_fp.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-a_i2d_fp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_i2d_fp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_i2d_fp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_i2d_fp.o: ../cryptlib.h
+a_i2d_fp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+a_i2d_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+a_i2d_fp.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_i2d_fp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_i2d_fp.o: ../../include/openssl/stack.h ../cryptlib.h
 a_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
@@ -300,22 +248,12 @@ a_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 a_print.o: ../cryptlib.h
 a_set.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-a_set.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-a_set.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_set.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-a_set.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-a_set.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-a_set.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_set.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_set.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_set.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_set.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_set.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-a_set.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_set.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_set.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_set.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-a_set.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+a_set.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+a_set.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+a_set.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_set.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_set.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_set.o: ../../include/openssl/stack.h ../cryptlib.h
 a_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_sign.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 a_sign.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -341,22 +279,12 @@ a_time.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_time.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 a_time.o: ../cryptlib.h
 a_type.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-a_type.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-a_type.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_type.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-a_type.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-a_type.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-a_type.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_type.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_type.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_type.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_type.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_type.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-a_type.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_type.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_type.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_type.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-a_type.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+a_type.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+a_type.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+a_type.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_type.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_type.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_type.o: ../../include/openssl/stack.h ../cryptlib.h
 a_utctm.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_utctm.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_utctm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
@@ -399,23 +327,12 @@ asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bn.h
 asn1_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
 asn1_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 asn1_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-asn1_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-asn1_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-asn1_lib.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-asn1_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-asn1_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-asn1_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-asn1_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-asn1_lib.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-asn1_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-asn1_lib.o: ../../include/openssl/opensslconf.h
-asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-asn1_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-asn1_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-asn1_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-asn1_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-asn1_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-asn1_lib.o: ../cryptlib.h
+asn1_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+asn1_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+asn1_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+asn1_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+asn1_lib.o: ../../include/openssl/stack.h ../cryptlib.h
 asn1_par.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 asn1_par.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 asn1_par.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -441,40 +358,21 @@ asn_pack.o: ../../include/openssl/opensslconf.h
 asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 asn_pack.o: ../../include/openssl/stack.h ../cryptlib.h
 d2i_dhp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-d2i_dhp.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-d2i_dhp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-d2i_dhp.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-d2i_dhp.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-d2i_dhp.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+d2i_dhp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+d2i_dhp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+d2i_dhp.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
 d2i_dhp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-d2i_dhp.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-d2i_dhp.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-d2i_dhp.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-d2i_dhp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-d2i_dhp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-d2i_dhp.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-d2i_dhp.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-d2i_dhp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-d2i_dhp.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-d2i_dhp.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+d2i_dhp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+d2i_dhp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+d2i_dhp.o: ../../include/openssl/stack.h ../cryptlib.h
 d2i_dsap.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-d2i_dsap.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-d2i_dsap.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-d2i_dsap.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-d2i_dsap.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+d2i_dsap.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+d2i_dsap.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 d2i_dsap.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
 d2i_dsap.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-d2i_dsap.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-d2i_dsap.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-d2i_dsap.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-d2i_dsap.o: ../../include/openssl/opensslconf.h
-d2i_dsap.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-d2i_dsap.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-d2i_dsap.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-d2i_dsap.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-d2i_dsap.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-d2i_dsap.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-d2i_dsap.o: ../cryptlib.h
+d2i_dsap.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+d2i_dsap.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+d2i_dsap.o: ../../include/openssl/stack.h ../cryptlib.h
 d2i_pr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 d2i_pr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 d2i_pr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -510,95 +408,46 @@ d2i_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 d2i_pu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 d2i_pu.o: ../cryptlib.h
 d2i_r_pr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-d2i_r_pr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-d2i_r_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-d2i_r_pr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-d2i_r_pr.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-d2i_r_pr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-d2i_r_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-d2i_r_pr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-d2i_r_pr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-d2i_r_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+d2i_r_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+d2i_r_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+d2i_r_pr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+d2i_r_pr.o: ../../include/openssl/err.h ../../include/openssl/objects.h
 d2i_r_pr.o: ../../include/openssl/opensslconf.h
-d2i_r_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-d2i_r_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-d2i_r_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-d2i_r_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-d2i_r_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-d2i_r_pr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+d2i_r_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
+d2i_r_pr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 d2i_r_pr.o: ../cryptlib.h
 d2i_r_pu.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-d2i_r_pu.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-d2i_r_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-d2i_r_pu.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-d2i_r_pu.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-d2i_r_pu.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-d2i_r_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-d2i_r_pu.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-d2i_r_pu.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-d2i_r_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+d2i_r_pu.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+d2i_r_pu.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+d2i_r_pu.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+d2i_r_pu.o: ../../include/openssl/err.h ../../include/openssl/objects.h
 d2i_r_pu.o: ../../include/openssl/opensslconf.h
-d2i_r_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-d2i_r_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-d2i_r_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-d2i_r_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-d2i_r_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-d2i_r_pu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+d2i_r_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
+d2i_r_pu.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 d2i_r_pu.o: ../cryptlib.h
 d2i_s_pr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-d2i_s_pr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-d2i_s_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-d2i_s_pr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-d2i_s_pr.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+d2i_s_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+d2i_s_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 d2i_s_pr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
 d2i_s_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-d2i_s_pr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-d2i_s_pr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-d2i_s_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-d2i_s_pr.o: ../../include/openssl/opensslconf.h
-d2i_s_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-d2i_s_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-d2i_s_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-d2i_s_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-d2i_s_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-d2i_s_pr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-d2i_s_pr.o: ../cryptlib.h
+d2i_s_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+d2i_s_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+d2i_s_pr.o: ../../include/openssl/stack.h ../cryptlib.h
 d2i_s_pu.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-d2i_s_pu.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-d2i_s_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-d2i_s_pu.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-d2i_s_pu.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+d2i_s_pu.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+d2i_s_pu.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 d2i_s_pu.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
 d2i_s_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-d2i_s_pu.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-d2i_s_pu.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-d2i_s_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-d2i_s_pu.o: ../../include/openssl/opensslconf.h
-d2i_s_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-d2i_s_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-d2i_s_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-d2i_s_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-d2i_s_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-d2i_s_pu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-d2i_s_pu.o: ../cryptlib.h
+d2i_s_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+d2i_s_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+d2i_s_pu.o: ../../include/openssl/stack.h ../cryptlib.h
 evp_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-evp_asn1.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-evp_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-evp_asn1.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-evp_asn1.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-evp_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-evp_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-evp_asn1.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-evp_asn1.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-evp_asn1.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-evp_asn1.o: ../../include/openssl/opensslconf.h
-evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-evp_asn1.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-evp_asn1.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-evp_asn1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-evp_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-evp_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_asn1.o: ../cryptlib.h
+evp_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+evp_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+evp_asn1.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+evp_asn1.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+evp_asn1.o: ../../include/openssl/stack.h ../cryptlib.h
 f_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 f_enum.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 f_enum.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -651,40 +500,21 @@ f_string.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 f_string.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 f_string.o: ../cryptlib.h
 i2d_dhp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-i2d_dhp.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-i2d_dhp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-i2d_dhp.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-i2d_dhp.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-i2d_dhp.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+i2d_dhp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+i2d_dhp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+i2d_dhp.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
 i2d_dhp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-i2d_dhp.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-i2d_dhp.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-i2d_dhp.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 i2d_dhp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-i2d_dhp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-i2d_dhp.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-i2d_dhp.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-i2d_dhp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-i2d_dhp.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-i2d_dhp.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+i2d_dhp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+i2d_dhp.o: ../cryptlib.h
 i2d_dsap.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-i2d_dsap.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-i2d_dsap.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-i2d_dsap.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-i2d_dsap.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+i2d_dsap.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+i2d_dsap.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 i2d_dsap.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
 i2d_dsap.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-i2d_dsap.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-i2d_dsap.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-i2d_dsap.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 i2d_dsap.o: ../../include/openssl/opensslconf.h
-i2d_dsap.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-i2d_dsap.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-i2d_dsap.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-i2d_dsap.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-i2d_dsap.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-i2d_dsap.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-i2d_dsap.o: ../cryptlib.h
+i2d_dsap.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+i2d_dsap.o: ../../include/openssl/stack.h ../cryptlib.h
 i2d_pr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 i2d_pr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 i2d_pr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -716,77 +546,39 @@ i2d_pu.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 i2d_pu.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 i2d_pu.o: ../../include/openssl/stack.h ../cryptlib.h
 i2d_r_pr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-i2d_r_pr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-i2d_r_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-i2d_r_pr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-i2d_r_pr.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-i2d_r_pr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-i2d_r_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-i2d_r_pr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-i2d_r_pr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-i2d_r_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+i2d_r_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+i2d_r_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+i2d_r_pr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+i2d_r_pr.o: ../../include/openssl/err.h ../../include/openssl/objects.h
 i2d_r_pr.o: ../../include/openssl/opensslconf.h
-i2d_r_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-i2d_r_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-i2d_r_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-i2d_r_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-i2d_r_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-i2d_r_pr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+i2d_r_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
+i2d_r_pr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 i2d_r_pr.o: ../cryptlib.h
 i2d_r_pu.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-i2d_r_pu.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-i2d_r_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-i2d_r_pu.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-i2d_r_pu.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-i2d_r_pu.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-i2d_r_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-i2d_r_pu.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-i2d_r_pu.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-i2d_r_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+i2d_r_pu.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+i2d_r_pu.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+i2d_r_pu.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+i2d_r_pu.o: ../../include/openssl/err.h ../../include/openssl/objects.h
 i2d_r_pu.o: ../../include/openssl/opensslconf.h
-i2d_r_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-i2d_r_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-i2d_r_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-i2d_r_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-i2d_r_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-i2d_r_pu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+i2d_r_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
+i2d_r_pu.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 i2d_r_pu.o: ../cryptlib.h
 i2d_s_pr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-i2d_s_pr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-i2d_s_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-i2d_s_pr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-i2d_s_pr.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+i2d_s_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+i2d_s_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 i2d_s_pr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
 i2d_s_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-i2d_s_pr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-i2d_s_pr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-i2d_s_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-i2d_s_pr.o: ../../include/openssl/opensslconf.h
-i2d_s_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-i2d_s_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-i2d_s_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-i2d_s_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-i2d_s_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-i2d_s_pr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-i2d_s_pr.o: ../cryptlib.h
+i2d_s_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+i2d_s_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+i2d_s_pr.o: ../../include/openssl/stack.h ../cryptlib.h
 i2d_s_pu.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-i2d_s_pu.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-i2d_s_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-i2d_s_pu.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-i2d_s_pu.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+i2d_s_pu.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+i2d_s_pu.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 i2d_s_pu.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
 i2d_s_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-i2d_s_pu.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-i2d_s_pu.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-i2d_s_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-i2d_s_pu.o: ../../include/openssl/opensslconf.h
-i2d_s_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-i2d_s_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-i2d_s_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-i2d_s_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-i2d_s_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-i2d_s_pu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-i2d_s_pu.o: ../cryptlib.h
+i2d_s_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+i2d_s_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+i2d_s_pu.o: ../../include/openssl/stack.h ../cryptlib.h
 n_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 n_pkey.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 n_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h
index 42825f5485..93f9c5193c 100644
--- a/crypto/asn1/asn1_mac.h
+++ b/crypto/asn1/asn1_mac.h
@@ -64,8 +64,6 @@ extern "C" {
 #endif
 
 #include <openssl/asn1.h>
-#include <openssl/x509.h>
-#include <openssl/pkcs7.h>
 
 #ifndef ASN1_MAC_ERR_LIB
 #define ASN1_MAC_ERR_LIB	ERR_LIB_ASN1
diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index 30b9049a45..b831836e7b 100644
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 #include <openssl/rand.h>
 
 /* PKCS#5 password based encryption structure */
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index 0fc8df16d0..09f4bf6112 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 #include <openssl/rand.h>
 
 /* PKCS#5 v2.0 password based encryption structures */
diff --git a/crypto/asn1/p7_lib.c b/crypto/asn1/p7_lib.c
index 7b9477cb32..846be17158 100644
--- a/crypto/asn1/p7_lib.c
+++ b/crypto/asn1/p7_lib.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/pkcs7.h>
 #include <openssl/objects.h>
 
 int i2d_PKCS7(PKCS7 *a, unsigned char **pp)
diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c
index dee229451c..aa9a4f6c96 100644
--- a/crypto/asn1/p8_pkey.c
+++ b/crypto/asn1/p8_pkey.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_PKCS8_PRIV_KEY_INFO (PKCS8_PRIV_KEY_INFO *a, unsigned char **pp)
 {
diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c
index 8183b9f9e2..b2c20d139f 100644
--- a/crypto/asn1/x_algor.c
+++ b/crypto/asn1/x_algor.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_X509_ALGOR(X509_ALGOR *a, unsigned char **pp)
 	{
diff --git a/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c
index ae88b2741b..a1cbebf5a5 100644
--- a/crypto/asn1/x_attrib.c
+++ b/crypto/asn1/x_attrib.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 /* sequence */
 int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp)
diff --git a/crypto/asn1/x_cinf.c b/crypto/asn1/x_cinf.c
index 6f280923ab..fe1b18a90f 100644
--- a/crypto/asn1/x_cinf.c
+++ b/crypto/asn1/x_cinf.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_X509_CINF(X509_CINF *a, unsigned char **pp)
 	{
diff --git a/crypto/asn1/x_exten.c b/crypto/asn1/x_exten.c
index 9573b11c9e..d5f9e1df9e 100644
--- a/crypto/asn1/x_exten.c
+++ b/crypto/asn1/x_exten.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_X509_EXTENSION(X509_EXTENSION *a, unsigned char **pp)
 	{
diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c
index 5df74b9f45..b09fba33fb 100644
--- a/crypto/asn1/x_name.c
+++ b/crypto/asn1/x_name.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 static int i2d_X509_NAME_entries(X509_NAME *a);
 int i2d_X509_NAME_ENTRY(X509_NAME_ENTRY *a, unsigned char **pp)
diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c
index 30d8c1df08..b0057eb212 100644
--- a/crypto/asn1/x_pkey.c
+++ b/crypto/asn1/x_pkey.c
@@ -61,6 +61,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 /* need to implement */
 int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp)
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index 7e3bd0581c..4ac32c59dd 100644
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_X509_PUBKEY(X509_PUBKEY *a, unsigned char **pp)
 	{
diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c
index b7cd078ddb..c2782d1b9c 100644
--- a/crypto/asn1/x_sig.c
+++ b/crypto/asn1/x_sig.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_X509_SIG(X509_SIG *a, unsigned char **pp)
 	{
diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
index 296e68f3eb..84d6f7ca4d 100644
--- a/crypto/asn1/x_val.c
+++ b/crypto/asn1/x_val.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_X509_VAL(X509_VAL *a, unsigned char **pp)
 	{
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 4962a1066f..7abf6b2a6b 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 static ASN1_METHOD meth={
 	(int (*)())  i2d_X509,
diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl
index d9734409d9..1a380966cc 100644
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -79,23 +79,13 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 dsa_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-dsa_asn1.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-dsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-dsa_asn1.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-dsa_asn1.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+dsa_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+dsa_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
 dsa_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-dsa_asn1.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-dsa_asn1.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-dsa_asn1.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 dsa_asn1.o: ../../include/openssl/opensslconf.h
-dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-dsa_asn1.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-dsa_asn1.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-dsa_asn1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dsa_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-dsa_asn1.o: ../cryptlib.h
+dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+dsa_asn1.o: ../../include/openssl/stack.h ../cryptlib.h
 dsa_err.o: ../../include/openssl/bn.h ../../include/openssl/dsa.h
 dsa_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
 dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -128,20 +118,10 @@ dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 dsa_sign.o: ../cryptlib.h
 dsa_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-dsa_vrf.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-dsa_vrf.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-dsa_vrf.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-dsa_vrf.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+dsa_vrf.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+dsa_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dsa_vrf.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
 dsa_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-dsa_vrf.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-dsa_vrf.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-dsa_vrf.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 dsa_vrf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dsa_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-dsa_vrf.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-dsa_vrf.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-dsa_vrf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dsa_vrf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-dsa_vrf.o: ../cryptlib.h
+dsa_vrf.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+dsa_vrf.o: ../../include/openssl/stack.h ../cryptlib.h