To avoid commit wars over dependencies, let's make it so things that

depend on the environment, like the presence of the OpenBSD crypto
device or of Kerberos, do not change the dependencies within OpenSSL.

crypto/engine/hw_openbsd_dev_crypto.c

@@ -53,6 +53,18 @@
  *
  */
 
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <assert.h>
+#include <sys/ioctl.h>
+#include <openssl/engine.h>
+#include <openssl/evp.h>
+#include "eng_int.h"
+/* Maybe this is needed? ... */
+#include "../evp/evp_locl.h"
+
 #ifndef OPENSSL_OPENBSD_DEV_CRYPTO
 
 void ENGINE_load_openbsd_dev_crypto(void)
@@ -63,18 +75,7 @@ void ENGINE_load_openbsd_dev_crypto(void)
 
 #else /* OPENSSL_OPENBSD_DEV_CRYPTO */
 
-#include <fcntl.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <assert.h>
-#include <sys/ioctl.h>
 #include <crypto/cryptodev.h>
-#include <openssl/engine.h>
-#include <openssl/evp.h>
-#include "eng_int.h"
-/* Maybe this is needed? ... */
-#include "../evp/evp_locl.h"
 
 /****************************************************/
 /* Declare the normal generic ENGINE stuff here ... */

ssl/kssl.c

@@ -67,7 +67,7 @@
 */
 
 #include <openssl/opensslconf.h>
-#ifndef OPENSSL_NO_KRB5
+
 #define _XOPEN_SOURCE /* glibc2 needs this to declare strptime() */
 #include <time.h>
 #include <string.h>
@@ -77,6 +77,8 @@
 #include <openssl/objects.h>
 #include <openssl/krb5_asn.h>
 
+#ifndef OPENSSL_NO_KRB5
+
 /* 
  * When OpenSSL is built on Windows, we do not want to require that
  * the Kerberos DLLs be available in order for the OpenSSL DLLs to

ssl/kssl.h

@@ -63,6 +63,8 @@
 #ifndef	KSSL_H
 #define	KSSL_H
 
+#include <openssl/opensslconf.h>
+
 #ifndef OPENSSL_NO_KRB5
 
 #include <stdio.h>

ssl/kssl_lcl.h

@@ -59,10 +59,10 @@
 #ifndef	KSSL_LCL_H
 #define	KSSL_LCL_H
 
-#ifndef OPENSSL_NO_KRB5
-
 #include <openssl/kssl.h>
 
+#ifndef OPENSSL_NO_KRB5
+
 #ifdef  __cplusplus
 extern "C" {
 #endif

ssl/s3_clnt.c

@@ -62,9 +62,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include "ssl_locl.h"
-#ifndef OPENSSL_NO_KRB5
 #include "kssl_lcl.h"
-#endif
 #include <openssl/md5.h>
 
 static SSL_METHOD *ssl3_get_client_method(int ver);

ssl/s3_srvr.c

@@ -121,9 +121,7 @@
 #include <openssl/x509.h>
 #include <openssl/krb5_asn.h>
 #include "ssl_locl.h"
-#ifndef OPENSSL_NO_KRB5
 #include "kssl_lcl.h"
-#endif /* OPENSSL_NO_KRB5 */
 #include <openssl/md5.h>
 
 static SSL_METHOD *ssl3_get_server_method(int ver);

ssl/ssl.h

@@ -70,9 +70,7 @@
 #ifndef OPENSSL_NO_X509
 #include <openssl/x509.h>
 #endif
-#ifndef OPENSSL_NO_KRB5
 #include <openssl/kssl.h>
-#endif
 #include <openssl/safestack.h>
 #include <openssl/symhacks.h>