From 01bc36c1f49b55058b4a5cfa541bd60d69bed86d Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 22 Nov 2017 10:33:15 +0300
Subject: [PATCH] Add missing includes into openssl-compat.h

Before it depends from the caller #include appropriate headers (at least
for OPENSSL_VERSION_NUMBER), but let's make it independent.

Fixes: #574
(cherry picked from commit c2c08e0203da93938fe35234fa3a1be4d1c3c2e1)
---
 bufferevent_openssl.c | 1 -
 openssl-compat.h      | 3 +++
 sample/le-proxy.c     | 1 -
 test/regress_ssl.c    | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
index f7f5c0f1..6a803a63 100644
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@ -63,7 +63,6 @@
 #include "bufferevent-internal.h"
 #include "log-internal.h"
 
-#include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include "openssl-compat.h"
diff --git a/openssl-compat.h b/openssl-compat.h
index 0f2dcb75..bffd2593 100644
--- a/openssl-compat.h
+++ b/openssl-compat.h
@@ -1,6 +1,9 @@
 #ifndef OPENSSL_COMPAT_H
 #define OPENSSL_COMPAT_H
 
+#include <openssl/bio.h>
+#include "util-internal.h"
+
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 
 static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
diff --git a/sample/le-proxy.c b/sample/le-proxy.c
index c764afc7..4e1cf033 100644
--- a/sample/le-proxy.c
+++ b/sample/le-proxy.c
@@ -31,7 +31,6 @@
 #include <event2/util.h>
 
 #include "util-internal.h"
-#include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
diff --git a/test/regress_ssl.c b/test/regress_ssl.c
index 490853fc..5004f7e8 100644
--- a/test/regress_ssl.c
+++ b/test/regress_ssl.c
@@ -53,7 +53,6 @@
 #include "tinytest.h"
 #include "tinytest_macros.h"
 
-#include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include "openssl-compat.h"