Liberally apply some UWYI (use what you include) to header files

22 files changed, 78 insertions, 34 deletions

diff --git a/src/core/dialer.h b/src/core/dialer.h
index f3fac7f1..bd987866 100644
--- a/src/core/dialer.h
+++ b/src/core/dialer.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 // Copyright 2018 Devolutions <info@devolutions.net>
 //
@@ -12,6 +12,9 @@
 #ifndef CORE_DIALER_H
 #define CORE_DIALER_H
 
+#include "defs.h"
+#include "stats.h"
+
 extern int      nni_dialer_find(nni_dialer **, uint32_t);
 extern int      nni_dialer_hold(nni_dialer *);
 extern void     nni_dialer_rele(nni_dialer *);
diff --git a/src/core/file.h b/src/core/file.h
index 3baa1ccd..f89b1729 100644
--- a/src/core/file.h
+++ b/src/core/file.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,6 +11,8 @@
 #ifndef CORE_FILE_H
 #define CORE_FILE_H
 
+#include "defs.h"
+
 // File/Store Support
 //
 // Some transports require a persistent storage for things like configs,
diff --git a/src/core/listener.h b/src/core/listener.h
index 5902d4bc..e1f83685 100644
--- a/src/core/listener.h
+++ b/src/core/listener.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 // Copyright 2018 Devolutions <info@devolutions.net>
 //
@@ -12,6 +12,9 @@
 #ifndef CORE_LISTENER_H
 #define CORE_LISTENER_H
 
+#include "core/defs.h"
+#include "core/stats.h"
+
 extern int      nni_listener_find(nni_listener **, uint32_t);
 extern int      nni_listener_hold(nni_listener *);
 extern void     nni_listener_rele(nni_listener *);
diff --git a/src/core/lmq.h b/src/core/lmq.h
index e38a7441..c44ca24c 100644
--- a/src/core/lmq.h
+++ b/src/core/lmq.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -10,7 +10,7 @@
 #ifndef CORE_LMQ_H
 #define CORE_LMQ_H
 
-#include "nng_impl.h"
+#include "core/defs.h"
 
 // nni_lmq is a very lightweight message queue.  Defining it this way allows
 // us to share some common code.  Locking must be supplied by the caller.
diff --git a/src/core/message.h b/src/core/message.h
index 9f88cbe8..9940dc9e 100644
--- a/src/core/message.h
+++ b/src/core/message.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,6 +11,8 @@
 #ifndef CORE_MESSAGE_H
 #define CORE_MESSAGE_H
 
+#include "core/defs.h"
+
 // Internally used message API.  Again, this is not part of our public API.
 // "trim" operations work from the front, and "chop" work from the end.
 
diff --git a/src/core/msgqueue.h b/src/core/msgqueue.h
index d264ee3f..f0bf0b71 100644
--- a/src/core/msgqueue.h
+++ b/src/core/msgqueue.h
@@ -11,7 +11,7 @@
 #ifndef CORE_MSGQUEUE_H
 #define CORE_MSGQUEUE_H
 
-#include "nng_impl.h"
+#include "defs.h"
 #include "pollable.h"
 
 // Message queues.  Message queues work in some ways like Go channels;
@@ -33,7 +33,6 @@ extern int nni_msgq_init(nni_msgq **, unsigned);
 // messages that may be in the queue.
 extern void nni_msgq_fini(nni_msgq *);
 
-
 extern void nni_msgq_aio_put(nni_msgq *, nni_aio *);
 extern void nni_msgq_aio_get(nni_msgq *, nni_aio *);
 
diff --git a/src/core/options.h b/src/core/options.h
index 8aa7fce7..71fa4d36 100644
--- a/src/core/options.h
+++ b/src/core/options.h
@@ -12,6 +12,8 @@
 #ifndef CORE_OPTIONS_H
 #define CORE_OPTIONS_H
 
+#include "defs.h"
+
 // Integer limits.
 #define NNI_MAXINT (2147483647)
 // the -1 trick works around a compiler warning on some compilers (MSVC)
diff --git a/src/core/pipe.h b/src/core/pipe.h
index 71e07a9f..dcdca418 100644
--- a/src/core/pipe.h
+++ b/src/core/pipe.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -15,9 +15,10 @@
 // OUTSIDE of the core is STRICTLY VERBOTEN.  NO DIRECT ACCESS BY PROTOCOLS OR
 // TRANSPORTS.
 
-#include "core/defs.h"
-#include "core/thread.h"
-#include "nng/nng.h"
+#include "defs.h"
+#include "stats.h"
+#include "thread.h"
+
 #include "sp/transport.h"
 
 // AIO
diff --git a/src/core/platform.h b/src/core/platform.h
index aced3675..4ca6a2f4 100644
--- a/src/core/platform.h
+++ b/src/core/platform.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 // Copyright 2018 Devolutions <info@devolutions.net>
 //
@@ -21,6 +21,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "defs.h"
+
 // These are the APIs that a platform must implement to support nng.
 
 // A word about fork-safety: This library is *NOT* fork safe, in that
diff --git a/src/core/pollable.h b/src/core/pollable.h
index 2dcce0a1..099ab8b7 100644
--- a/src/core/pollable.h
+++ b/src/core/pollable.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -10,8 +10,9 @@
 #ifndef CORE_POLLABLE_H
 #define CORE_POLLABLE_H
 
-#include "core/defs.h"
-#include "core/list.h"
+#include "defs.h"
+#include "list.h"
+#include "platform.h"
 
 typedef struct nni_pollable nni_pollable;
 
diff --git a/src/core/refcnt.h b/src/core/refcnt.h
index 9878ba50..29a91ea0 100644
--- a/src/core/refcnt.h
+++ b/src/core/refcnt.h
@@ -1,4 +1,4 @@
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -9,10 +9,8 @@
 #ifndef CORE_REFCNT_H
 #define CORE_REFCNT_H
 
-#include <nng/nng.h>
-
-#include <core/nng_impl.h>
-#include <core/platform.h>
+#include "defs.h"
+#include "platform.h"
 
 typedef struct {
 	nni_atomic_int rc_cnt;
diff --git a/src/core/socket.h b/src/core/socket.h
index af8fd97d..d84f22c2 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,6 +11,10 @@
 #ifndef CORE_SOCKET_H
 #define CORE_SOCKET_H
 
+#include "defs.h"
+#include "msgqueue.h"
+#include "stats.h"
+
 extern int         nni_sock_find(nni_sock **, uint32_t);
 extern void        nni_sock_hold(nni_sock *);
 extern void        nni_sock_rele(nni_sock *);
diff --git a/src/core/sockimpl.h b/src/core/sockimpl.h
index 92c0bb69..5d41e8d7 100644
--- a/src/core/sockimpl.h
+++ b/src/core/sockimpl.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,6 +11,20 @@
 #ifndef CORE_SOCKIMPL_H
 #define CORE_SOCKIMPL_H
 
+#include "defs.h"
+
+#include "aio.h"
+#include "dialer.h"
+#include "list.h"
+#include "listener.h"
+#include "protocol.h"
+#include "reap.h"
+#include "refcnt.h"
+#include "stats.h"
+#include "url.h"
+
+#include "sp/transport.h"
+
 // This file contains stuff shared within the core between sockets, endpoints,
 // and pipes.  This must not be exposed to other subsystems -- these internals
 // are subject to change at any time.
diff --git a/src/core/stream.h b/src/core/stream.h
index e09dc9e5..ebc13b26 100644
--- a/src/core/stream.h
+++ b/src/core/stream.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -13,7 +13,7 @@
 // This provides an abstraction for byte streams, allowing polymorphic
 // use of them in rather flexible contexts.
 
-#include "core/nng_impl.h"
+#include "defs.h"
 
 // Private property operations (these include the types.)
 extern int nni_stream_get(
diff --git a/src/core/strs.h b/src/core/strs.h
index 697b4763..8321054c 100644
--- a/src/core/strs.h
+++ b/src/core/strs.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -13,11 +13,13 @@
 
 // Safe string functions, in case the platform misses these.
 
-extern char * nni_strdup(const char *);
+#include "defs.h"
+
+extern char  *nni_strdup(const char *);
 extern void   nni_strfree(char *);
 extern size_t nni_strlcpy(char *, const char *, size_t);
 extern size_t nni_strnlen(const char *, size_t);
-extern char * nni_strcasestr(const char *, const char *);
+extern char  *nni_strcasestr(const char *, const char *);
 extern int    nni_strncasecmp(const char *, const char *, size_t);
 extern int    nni_strcasecmp(const char *, const char *);
 extern int    nni_asprintf(char **, const char *, ...);
diff --git a/src/platform/posix/posix_impl.h b/src/platform/posix/posix_impl.h
index f8d8965e..a0bb3217 100644
--- a/src/platform/posix/posix_impl.h
+++ b/src/platform/posix/posix_impl.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -32,7 +32,9 @@
 #define NNG_PLATFORM_POSIX_SOCKADDR
 #define NNG_PLATFORM_POSIX_UDP
 
-#include "platform/posix/posix_config.h"
+#include "core/defs.h"
+
+#include "posix_config.h"
 #endif
 
 #ifdef NNG_PLATFORM_POSIX_SOCKADDR
diff --git a/src/platform/posix/posix_ipc.h b/src/platform/posix/posix_ipc.h
index 09cae865..f1aa412d 100644
--- a/src/platform/posix/posix_ipc.h
+++ b/src/platform/posix/posix_ipc.h
@@ -16,7 +16,7 @@
 #include "core/stream.h"
 
 #ifdef NNG_PLATFORM_POSIX
-#include "platform/posix/posix_aio.h"
+#include "posix_aio.h"
 
 #include <sys/types.h> // For mode_t
 
diff --git a/src/platform/posix/posix_sockfd.c b/src/platform/posix/posix_sockfd.c
index 0bdee2d6..bc397fc6 100644
--- a/src/platform/posix/posix_sockfd.c
+++ b/src/platform/posix/posix_sockfd.c
@@ -18,8 +18,10 @@
 #include <unistd.h>
 
 #include "core/sockfd.h"
-#include "platform/posix/posix_aio.h"
-#include "platform/posix/posix_peerid.h"
+#include "posix_impl.h"
+
+#include "posix_aio.h"
+#include "posix_peerid.h"
 
 struct nni_sfd_conn {
 	nng_stream    stream;
diff --git a/src/sp/transport.h b/src/sp/transport.h
index 28f1535b..976068c8 100644
--- a/src/sp/transport.h
+++ b/src/sp/transport.h
@@ -13,6 +13,7 @@
 #define PROTOCOL_SP_TRANSPORT_H
 
 #include "core/defs.h"
+#include "core/list.h"
 #include "core/options.h"
 
 // Endpoint operations are called by the socket in a
diff --git a/src/supplemental/tls/tls_api.h b/src/supplemental/tls/tls_api.h
index afb8661c..83256593 100644
--- a/src/supplemental/tls/tls_api.h
+++ b/src/supplemental/tls/tls_api.h
@@ -12,6 +12,8 @@
 #ifndef NNG_SUPPLEMENTAL_TLS_TLS_API_H
 #define NNG_SUPPLEMENTAL_TLS_TLS_API_H
 
+#include "core/stream.h"
+
 // The implementation supplies this function to create the TLS connection
 // object.  All fields will be zeroed.
 extern int nni_tls_dialer_alloc(nng_stream_dialer **, const nng_url *);
diff --git a/src/supplemental/websocket/sha1.h b/src/supplemental/websocket/sha1.h
index 43b6f20d..b061e884 100644
--- a/src/supplemental/websocket/sha1.h
+++ b/src/supplemental/websocket/sha1.h
@@ -11,6 +11,8 @@
 #ifndef NNG_SUPPLEMENTAL_WEBSOCKET_SHA1_H
 #define NNG_SUPPLEMENTAL_WEBSOCKET_SHA1_H
 
+#include "core/defs.h"
+
 typedef struct {
 	uint32_t digest[5]; // resulting digest
 	uint64_t len;       // length in bits
diff --git a/src/supplemental/websocket/websocket.h b/src/supplemental/websocket/websocket.h
index fab716bf..36e8dba5 100644
--- a/src/supplemental/websocket/websocket.h
+++ b/src/supplemental/websocket/websocket.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 // Copyright 2019 Devolutions <info@devolutions.net>
 //
@@ -14,6 +14,8 @@
 
 #include <stdbool.h>
 
+#include "core/stream.h"
+
 typedef struct nni_ws          nni_ws;
 typedef struct nni_ws_listener nni_ws_listener;
 typedef struct nni_ws_dialer   nni_ws_dialer;