Deprecate some recursive includes from the store.h API header, and put back

required includes back via the internal header and str_lib.c.

crypto/store/store.h

@@ -60,9 +60,11 @@
 #define HEADER_STORE_H
 
 #include <openssl/ossl_typ.h>
-#include <openssl/x509.h>
+#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/evp.h>
 #include <openssl/bn.h>
+#include <openssl/x509.h>
+#endif
 
 #ifdef  __cplusplus
 extern "C" {

crypto/store/str_lib.c

@@ -60,6 +60,8 @@
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/engine.h>
+#include <openssl/sha.h>
+#include <openssl/x509.h>
 #include "str_locl.h"
 
 const char * const STORE_object_type_string[STORE_OBJECT_TYPE_NUM+1] =

crypto/store/str_locl.h

@@ -59,6 +59,7 @@
 #ifndef HEADER_STORE_LOCL_H
 #define HEADER_STORE_LOCL_H
 
+#include <openssl/crypto.h>
 #include <openssl/store.h>
 
 #ifdef  __cplusplus