Stop pulling pqueue.h into ssl_locl.h since only a small part of libssl

actually needs it. Instead, just include it in the files where it is
actually necessary.

Also remove standard includes from pqueue.h so that they are not available
as a side effect. Just add the two includes that are needed to pqueue.c.

ok miod@

12 files changed, 16 insertions, 12 deletions

diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index 10b62cd410..0e32825695 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -123,6 +123,8 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
+#include "pqueue.h"
+
 #define RSMBLY_BITMASK_SIZE(msg_len) (((msg_len) + 7) / 8)
 
 #define RSMBLY_BITMASK_MARK(bitmask, start, end) { \
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index b6b765634d..a2500ee0bf 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/lib/libssl/d1_lib.c
@@ -64,6 +64,8 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
+
+#include "pqueue.h"
 #include "ssl_locl.h"
 
 const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index df18e5bae3..a9ccc6d349 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -121,6 +121,8 @@
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 
+#include "pqueue.h"
+
 /* mod 128 saturating subtract of two 64-bit values in big-endian order */
 static int
 satsub64be(const unsigned char *v1, const unsigned char *v2)
diff --git a/src/lib/libssl/pqueue.c b/src/lib/libssl/pqueue.c
index daf5e21b3a..af8530064f 100644
--- a/src/lib/libssl/pqueue.c
+++ b/src/lib/libssl/pqueue.c
@@ -57,7 +57,9 @@
  *
  */
 
+#include <stdlib.h>
 #include <string.h>
+
 #include "pqueue.h"
 
 typedef struct _pqueue {
diff --git a/src/lib/libssl/pqueue.h b/src/lib/libssl/pqueue.h
index 6e7df8f35b..4b167871ef 100644
--- a/src/lib/libssl/pqueue.h
+++ b/src/lib/libssl/pqueue.h
@@ -60,10 +60,6 @@
 #ifndef HEADER_PQUEUE_H
 #define HEADER_PQUEUE_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct _pqueue *pqueue;
 
 typedef struct _pitem {
diff --git a/src/lib/libssl/src/ssl/d1_both.c b/src/lib/libssl/src/ssl/d1_both.c
index 10b62cd410..0e32825695 100644
--- a/src/lib/libssl/src/ssl/d1_both.c
+++ b/src/lib/libssl/src/ssl/d1_both.c
@@ -123,6 +123,8 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
+#include "pqueue.h"
+
 #define RSMBLY_BITMASK_SIZE(msg_len) (((msg_len) + 7) / 8)
 
 #define RSMBLY_BITMASK_MARK(bitmask, start, end) { \
diff --git a/src/lib/libssl/src/ssl/d1_lib.c b/src/lib/libssl/src/ssl/d1_lib.c
index b6b765634d..a2500ee0bf 100644
--- a/src/lib/libssl/src/ssl/d1_lib.c
+++ b/src/lib/libssl/src/ssl/d1_lib.c
@@ -64,6 +64,8 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
+
+#include "pqueue.h"
 #include "ssl_locl.h"
 
 const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;
diff --git a/src/lib/libssl/src/ssl/d1_pkt.c b/src/lib/libssl/src/ssl/d1_pkt.c
index df18e5bae3..a9ccc6d349 100644
--- a/src/lib/libssl/src/ssl/d1_pkt.c
+++ b/src/lib/libssl/src/ssl/d1_pkt.c
@@ -121,6 +121,8 @@
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 
+#include "pqueue.h"
+
 /* mod 128 saturating subtract of two 64-bit values in big-endian order */
 static int
 satsub64be(const unsigned char *v1, const unsigned char *v2)
diff --git a/src/lib/libssl/src/ssl/pqueue.c b/src/lib/libssl/src/ssl/pqueue.c
index daf5e21b3a..af8530064f 100644
--- a/src/lib/libssl/src/ssl/pqueue.c
+++ b/src/lib/libssl/src/ssl/pqueue.c
@@ -57,7 +57,9 @@
  *
  */
 
+#include <stdlib.h>
 #include <string.h>
+
 #include "pqueue.h"
 
 typedef struct _pqueue {
diff --git a/src/lib/libssl/src/ssl/pqueue.h b/src/lib/libssl/src/ssl/pqueue.h
index 6e7df8f35b..4b167871ef 100644
--- a/src/lib/libssl/src/ssl/pqueue.h
+++ b/src/lib/libssl/src/ssl/pqueue.h
@@ -60,10 +60,6 @@
 #ifndef HEADER_PQUEUE_H
 #define HEADER_PQUEUE_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct _pqueue *pqueue;
 
 typedef struct _pitem {
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index a0c3017836..012a38cc5c 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -164,8 +164,6 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-#include "pqueue.h"
-
 #define c2l(c,l)        (l = ((unsigned long)(*((c)++)))     , \
                          l|=(((unsigned long)(*((c)++)))<< 8), \
                          l|=(((unsigned long)(*((c)++)))<<16), \
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index a0c3017836..012a38cc5c 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -164,8 +164,6 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-#include "pqueue.h"
-
 #define c2l(c,l)        (l = ((unsigned long)(*((c)++)))     , \
                          l|=(((unsigned long)(*((c)++)))<< 8), \
                          l|=(((unsigned long)(*((c)++)))<<16), \