[PATCH 4/6] do not include public headers as though they are local

[busterb]

From: Brent Cook <bust...@gmail.com>

Avoid having to use -I trickery to find public header files included as
though they are private.
---
 src/crypto/bn/bn_const.c     | 2 +-
 src/crypto/chacha/chacha.c   | 2 +-
 src/crypto/o_init.c          | 2 +-
 src/crypto/pqueue/pqueue.c   | 2 +-
 src/crypto/ts/ts_lib.c       | 2 +-
 src/crypto/ts/ts_rsp_print.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/crypto/bn/bn_const.c b/src/crypto/bn/bn_const.c
index 1c8bc9b..2ba2bbd 100644
--- a/src/crypto/bn/bn_const.c
+++ b/src/crypto/bn/bn_const.c
@@ -1,7 +1,7 @@
 /* crypto/bn/knownprimes.c */
 /* Insert boilerplate */
 
-#include "bn.h"
+#include <openssl/bn.h>
 
 /* "First Oakley Default Group" from RFC2409, section 6.1.
  *
diff --git a/src/crypto/chacha/chacha.c b/src/crypto/chacha/chacha.c
index 1bc95f5..f0e818e 100644
--- a/src/crypto/chacha/chacha.c
+++ b/src/crypto/chacha/chacha.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "chacha.h"
+#include <openssl/chacha.h>
 #include "chacha-merged.c"
 
 void
diff --git a/src/crypto/o_init.c b/src/crypto/o_init.c
index 09c9820..2c95a9e 100644
--- a/src/crypto/o_init.c
+++ b/src/crypto/o_init.c
@@ -1,5 +1,5 @@
 /* Ted Unangst places this file in the public domain. */
-#include <crypto.h>
+#include <openssl/crypto.h>
 
 void
 OPENSSL_init(void)
diff --git a/src/crypto/pqueue/pqueue.c b/src/crypto/pqueue/pqueue.c
index fc68ae1..3239abf 100644
--- a/src/crypto/pqueue/pqueue.c
+++ b/src/crypto/pqueue/pqueue.c
@@ -59,7 +59,7 @@
 
 #include "cryptlib.h"
 #include <openssl/bn.h>
-#include "pqueue.h"
+#include <openssl/pqueue.h>
 
 typedef struct _pqueue {
        pitem *items;
diff --git a/src/crypto/ts/ts_lib.c b/src/crypto/ts/ts_lib.c
index 81a5f23..152320f 100644
--- a/src/crypto/ts/ts_lib.c
+++ b/src/crypto/ts/ts_lib.c
@@ -61,7 +61,7 @@
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
-#include "ts.h"
+#include <openssl/ts.h>
 
 /* Local function declarations. */
 
diff --git a/src/crypto/ts/ts_rsp_print.c b/src/crypto/ts/ts_rsp_print.c
index 248674f..6615e20 100644
--- a/src/crypto/ts/ts_rsp_print.c
+++ b/src/crypto/ts/ts_rsp_print.c
@@ -61,7 +61,7 @@
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
-#include "ts.h"
+#include <openssl/ts.h>
 
 struct status_map_st {
        int bit;
-- 
1.9.2