It was a very bad idea to use #include "../e_os.h" -- when this occurs

in cryptlib.h (which is often included as "../cryptlib.h"), then the
question remains relative to which directory this is to be interpreted.
gcc went one further directory up, as intended; but makedepend thinks
differently, and so probably do some C compilers.  So the ../ must go away;
thus e_os.h goes back into include/openssl (but I now use
#include "openssl/e_os.h" instead of <openssl/e_os.h> to make the point) --
and we have another huge bunch of dependency changes.  Argh.

31 files changed, 2028 insertions, 1915 deletions

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 34715749d1..31aefe2453 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -145,28 +145,28 @@ dclean:
 
 cpt_err.o: ../include/openssl/crypto.h ../include/openssl/err.h
 cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/stack.h
-cryptlib.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
-cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-cryptlib.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
-cryptlib.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h
-cryptlib.o: date.h
-cversion.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
-cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-cversion.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
-cversion.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h
-cversion.o: date.h
-ex_data.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
-ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h
-ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ex_data.o: ../include/openssl/stack.h cryptlib.h
-mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
-mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
-mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-mem.o: ../include/openssl/stack.h cryptlib.h
-tmdiff.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
-tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-tmdiff.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
-tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/stack.h
-tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h
+cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+cryptlib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+cryptlib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+cryptlib.o: ../include/openssl/stack.h cryptlib.h date.h
+cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+cversion.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+cversion.o: ../include/openssl/stack.h cryptlib.h date.h
+ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+ex_data.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+ex_data.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+ex_data.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h
+mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+mem.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+mem.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+mem.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h
+tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+tmdiff.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+tmdiff.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+tmdiff.o: ../include/openssl/stack.h ../include/openssl/tmdiff.h cryptlib.h
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index 14e2cc8bae..658e4231ba 100644
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -117,267 +117,284 @@ clean:
 
 a_bitstr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_bitstr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_bitstr.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_bitstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_bitstr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_bitstr.o: ../../include/openssl/opensslconf.h
 a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_bitstr.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h
+a_bitstr.o: ../../include/openssl/stack.h ../cryptlib.h
 a_bmp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_bmp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_bmp.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_bmp.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_bmp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_bmp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_bmp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_bmp.o: ../cryptlib.h ../e_os.h
+a_bmp.o: ../cryptlib.h
 a_bool.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_bool.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_bool.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_bool.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_bool.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 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 ../e_os.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_os2.h
-a_bytes.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_bytes.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_bytes.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_bytes.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_bytes.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_bytes.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_bytes.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-a_bytes.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_bytes.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_bytes.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_bytes.o: ../cryptlib.h ../e_os.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_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_os2.h
-a_d2i_fp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_d2i_fp.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_d2i_fp.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_d2i_fp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.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 ../e_os.h
+a_d2i_fp.o: ../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
 a_digest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 a_digest.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-a_digest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_digest.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_digest.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_digest.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_digest.o: ../../include/openssl/opensslconf.h
+a_digest.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+a_digest.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+a_digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+a_digest.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 a_digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 a_digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 a_digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 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 ../e_os.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_os2.h
-a_dup.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_dup.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_dup.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_dup.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_dup.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_dup.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_dup.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-a_dup.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_dup.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_dup.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_dup.o: ../cryptlib.h ../e_os.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_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/err.h
+a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_enum.o: ../cryptlib.h ../e_os.h
+a_enum.o: ../cryptlib.h
 a_gentm.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_gentm.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_gentm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 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 ../e_os.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_os2.h
-a_hdr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_hdr.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_hdr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_hdr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_hdr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_hdr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_hdr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-a_hdr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_hdr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_hdr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_hdr.o: ../cryptlib.h ../e_os.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_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_os2.h
-a_i2d_fp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_i2d_fp.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_i2d_fp.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_i2d_fp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.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 ../e_os.h
+a_i2d_fp.o: ../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/err.h
+a_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_int.o: ../cryptlib.h ../e_os.h
+a_int.o: ../cryptlib.h
 a_meth.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_meth.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 a_meth.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
 a_meth.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 a_meth.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-a_meth.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_meth.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_meth.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_meth.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_meth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_meth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-a_meth.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_meth.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_meth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_meth.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-a_meth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../e_os.h
+a_meth.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_meth.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+a_meth.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+a_meth.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+a_meth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+a_meth.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+a_meth.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+a_meth.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+a_meth.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+a_meth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+a_meth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+a_meth.o: ../cryptlib.h
 a_object.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_object.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_object.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_object.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_object.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_object.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_object.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h
+a_object.o: ../../include/openssl/stack.h ../cryptlib.h
 a_octet.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_octet.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_octet.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_octet.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_octet.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_octet.o: ../cryptlib.h ../e_os.h
+a_octet.o: ../cryptlib.h
 a_print.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_print.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_print.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 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 ../e_os.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_os2.h
-a_set.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_set.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_set.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_set.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_set.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_set.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_set.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-a_set.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_set.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_set.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_set.o: ../cryptlib.h ../e_os.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_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
 a_sign.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 a_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-a_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_sign.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_sign.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-a_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_sign.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-a_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../e_os.h
+a_sign.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+a_sign.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+a_sign.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+a_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+a_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+a_sign.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+a_sign.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+a_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+a_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+a_sign.o: ../cryptlib.h
 a_time.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_time.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_time.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_time.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_time.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 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 ../e_os.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_os2.h
-a_type.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_type.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_type.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_type.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_type.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_type.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_type.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-a_type.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_type.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_type.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_type.o: ../cryptlib.h ../e_os.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_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/err.h
+a_utctm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_utctm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_utctm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_utctm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_utctm.o: ../cryptlib.h ../e_os.h
+a_utctm.o: ../cryptlib.h
 a_utf8.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_utf8.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_utf8.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_utf8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_utf8.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_utf8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_utf8.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_utf8.o: ../cryptlib.h ../e_os.h
+a_utf8.o: ../cryptlib.h
 a_verify.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_verify.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 a_verify.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
 a_verify.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 a_verify.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-a_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_verify.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-a_verify.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-a_verify.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-a_verify.o: ../../include/openssl/opensslconf.h
+a_verify.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+a_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+a_verify.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+a_verify.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+a_verify.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 a_verify.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 a_verify.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 a_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 a_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_verify.o: ../cryptlib.h ../e_os.h
+a_verify.o: ../cryptlib.h
 a_vis.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_vis.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-a_vis.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+a_vis.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+a_vis.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 a_vis.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_vis.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_vis.o: ../cryptlib.h ../e_os.h
+a_vis.o: ../cryptlib.h
 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
@@ -386,390 +403,407 @@ 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_os2.h
-asn1_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-asn1_lib.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-asn1_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-asn1_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.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 ../e_os.h
+asn1_lib.o: ../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
 asn1_par.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 asn1_par.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-asn1_par.o: ../../include/openssl