Only import cryptlib.h in the four source files that actually need it.

Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@

2 files changed, 8 insertions, 12 deletions

diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c
index fa171b4d21..c2fe62df33 100644
--- a/src/lib/libcrypto/ui/ui_lib.c
+++ b/src/lib/libcrypto/ui/ui_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui_lib.c,v 1.24 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: ui_lib.c,v 1.25 2014/07/11 08:44:49 jsing Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
@@ -60,11 +60,10 @@
 
 #include <openssl/opensslconf.h>
 
-#include "cryptlib.h"
-
 #include <openssl/buffer.h>
-#include <openssl/ui.h>
 #include <openssl/err.h>
+#include <openssl/ui.h>
+
 #include "ui_locl.h"
 
 IMPLEMENT_STACK_OF(UI_STRING_ST) static const UI_METHOD *default_UI_meth = NULL;
diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c
index 32298625ca..f7f01bb4f1 100644
--- a/src/lib/libcrypto/ui/ui_openssl.c
+++ b/src/lib/libcrypto/ui/ui_openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui_openssl.c,v 1.21 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: ui_openssl.c,v 1.22 2014/07/11 08:44:49 jsing Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) and others
  * for the OpenSSL project 2001.
  */
@@ -114,26 +114,23 @@
  * [including the GNU Public Licence.]
  */
 
+#include <sys/ioctl.h>
+
 #include <openssl/opensslconf.h>
 
+#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
-
-#include <unistd.h>
 #include <termios.h>
+#include <unistd.h>
 
 #include "ui_locl.h"
-#include "cryptlib.h"
-
-#include <sys/ioctl.h>
 
 #ifndef NX509_SIG
 #define NX509_SIG 32
 #endif
 
-
 /* Define globals.  They are protected by a lock */
 static struct sigaction savsig[NX509_SIG];