diff --git a/crypto/engine/hw_openbsd_dev_crypto.c b/crypto/engine/hw_openbsd_dev_crypto.c
index f88a21b6319e952060040576f24606c8f81a0604..2e4b3de1e4d13d3bc5762524a31f6b64eee7a573 100644
--- a/crypto/engine/hw_openbsd_dev_crypto.c
+++ b/crypto/engine/hw_openbsd_dev_crypto.c
@@ -53,29 +53,30 @@
  *
  */
 
-#ifndef OPENSSL_OPENBSD_DEV_CRYPTO
-
-void ENGINE_load_openbsd_dev_crypto(void)
-	{
-	/* This is a NOP unless OPENSSL_OPENBSD_DEV_CRYPTO is defined */
-	return;
-	}
-
-#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"
 
+#ifndef OPENSSL_OPENBSD_DEV_CRYPTO
+
+void ENGINE_load_openbsd_dev_crypto(void)
+	{
+	/* This is a NOP unless OPENSSL_OPENBSD_DEV_CRYPTO is defined */
+	return;
+	}
+
+#else /* OPENSSL_OPENBSD_DEV_CRYPTO */
+
+#include <crypto/cryptodev.h>
+
 /****************************************************/
 /* Declare the normal generic ENGINE stuff here ... */
 
diff --git a/ssl/kssl.c b/ssl/kssl.c
index f1733048edeb0e293175dc3299a8e67eaef79e96..e61b698062c0c06ced5cd5ec2db3c82b46507c08 100644
--- a/ssl/kssl.c
+++ b/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
diff --git a/ssl/kssl.h b/ssl/kssl.h
index 50480f6a3109d445035cb255cb548433e1feeb11..cf7ebdd168ed9094c312e9258ee5fb4b29d585ef 100644
--- a/ssl/kssl.h
+++ b/ssl/kssl.h
@@ -63,6 +63,8 @@
 #ifndef	KSSL_H
 #define	KSSL_H
 
+#include <openssl/opensslconf.h>
+
 #ifndef OPENSSL_NO_KRB5
 
 #include <stdio.h>
diff --git a/ssl/kssl_lcl.h b/ssl/kssl_lcl.h
index 37c2157d888b73d79f7b0073e6fb7f9f3ef77ba6..4cd8dd2d7fe4c970ebcd34d2f853bf572505f770 100644
--- a/ssl/kssl_lcl.h
+++ b/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
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 36068780e7f5044f5d1074c0dbfb5ea833b3cb2c..67dc5b05d5b30e76310d6968c46840ae0d9f333e 100644
--- a/ssl/s3_clnt.c
+++ b/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);
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 304f217b047e3bc2e161e4477b2298ad324b5e4d..8b55f835edc4be67797614c44477b922a5334b8e 100644
--- a/ssl/s3_srvr.c
+++ b/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);
diff --git a/ssl/ssl.h b/ssl/ssl.h
index bae5f70f571c9af3a8a35f1d7df72b421d895aff..c1c467480dd82ebb8d15f542192fc40fb664be4a 100644
--- a/ssl/ssl.h
+++ b/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>