Moving opaque definitions to ossl_typ.h lets us reduce header dependencies.

Deprecate inclusion of crypto.h from ui.h.

crypto/ui/ui.h

@@ -59,7 +59,9 @@
 #ifndef HEADER_UI_H
 #define HEADER_UI_H
 
+#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/crypto.h>
+#endif
 #include <openssl/safestack.h>
 #include <openssl/ossl_typ.h>
 

crypto/ui/ui_locl.h

@@ -60,6 +60,7 @@
 #define HEADER_UI_LOCL_H
 
 #include <openssl/ui.h>
+#include <openssl/crypto.h>
 
 struct ui_method_st
 	{

crypto/ui/ui_util.c

@@ -54,7 +54,7 @@
  */
 
 #include <string.h>
-#include <openssl/ui.h>
+#include "ui_locl.h"
 
 int UI_UTIL_read_pw_string(char *buf,int length,const char *prompt,int verify)
 	{