From 508999fa7d5bf5f06eeb5deb8912ad723e42bec9 Mon Sep 17 00:00:00 2001
From: Geoff Thorpe <geoff@openssl.org>
Date: Mon, 17 May 2004 18:49:06 +0000
Subject: [PATCH] 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    | 4 +++-
 crypto/store/str_lib.c  | 2 ++
 crypto/store/str_locl.h | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/store/store.h b/crypto/store/store.h
index 40fb38fc43..b2e7e198f9 100644
--- a/crypto/store/store.h
+++ b/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" {
diff --git a/crypto/store/str_lib.c b/crypto/store/str_lib.c
index eb9e6426be..7e59ee1d06 100644
--- a/crypto/store/str_lib.c
+++ b/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] =
diff --git a/crypto/store/str_locl.h b/crypto/store/str_locl.h
index c8decfa87d..3f8cb75619 100644
--- a/crypto/store/str_locl.h
+++ b/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