Duplicate includes

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1475)

diff --git a/apps/apps.h b/apps/apps.h
index fc7330537e604ff83cf6ed03da26ddb9ff19a4a7..85b65191bd24fc2b24ad027843211d4857180e49 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -25,7 +25,6 @@
 # include <openssl/txt_db.h>
 # include <openssl/engine.h>
 # include <openssl/ocsp.h>
 # include <openssl/txt_db.h>
 # include <openssl/engine.h>
 # include <openssl/ocsp.h>

-# include <openssl/ossl_typ.h>

 # include <signal.h>
 
 # if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
 # include <signal.h>
 
 # if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 8aa968dbc5b5785992dc9612642f03cfdb818204..80bb24eabb6ea6e69c94d81feb44fc7c32bf835a 100644 (file)
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -34,7 +34,6 @@
 # endif
 
 # include <openssl/sha.h>
 # endif
 
 # include <openssl/sha.h>

-# include <openssl/ossl_typ.h>

 
 #ifdef  __cplusplus
 extern "C" {
 
 #ifdef  __cplusplus
 extern "C" {