Various header file fixes... also fix compilation errors when HTTP is disabled.v2.0.0-alpha.6

Also, some instances nni_aio are changed to nng_aio.  We think we want to harmonize
some of these types going forward as it will reduce the need to include headers
hopefully letting us get away with just "defs.h" in more places.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/supplemental/tls/tls_stream.h b/src/supplemental/tls/tls_stream.h
index dca439af..4ea4912b 100644
--- a/src/supplemental/tls/tls_stream.h
+++ b/src/supplemental/tls/tls_stream.h
@@ -12,15 +12,15 @@
 #ifndef NNG_TLS_TLS_STREAM_H
 #define NNG_TLS_TLS_STREAM_H
 
-#include "core/nng_impl.h"
+#include "../../core/nng_impl.h"
 #include "tls_common.h"
 
 typedef struct tls_stream_s {
 	nng_stream    stream;
 	size_t        size;
 	nni_reap_node reap;
-	nni_aio       conn_aio;
-	nni_aio      *user_aio;
+	nng_aio       conn_aio;
+	nng_aio      *user_aio;
 	nni_tls_conn  conn; // NB: must be last!
 } tls_stream;