9 files changed, 6 insertions, 27 deletions
diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c
index 6bf4445b..a54c7853 100644
--- a/src/sp/transport/ipc/ipc.c
+++ b/src/sp/transport/ipc/ipc.c
@@ -11,10 +11,9 @@
 
 #include <stdio.h>
 
-#include "core/defs.h"
-#include "core/nng_impl.h"
-#include "core/pipe.h"
-#include "nng/nng.h"
+#include "../../../core/defs.h"
+#include "../../../core/nng_impl.h"
+#include "../../../core/pipe.h"
 
 // IPC transport.   Platform specific IPC operations must be
 // supplied as well.  Normally the IPC is UNIX domain sockets or
diff --git a/src/sp/transport/ipc/ipc_test.c b/src/sp/transport/ipc/ipc_test.c
index 4d3f2a5e..30ac6fb3 100644
--- a/src/sp/transport/ipc/ipc_test.c
+++ b/src/sp/transport/ipc/ipc_test.c
@@ -8,8 +8,7 @@
 // found online at https://opensource.org/licenses/MIT.
 //
 
-#include <nng/nng.h>
-#include <nuts.h>
+#include "../../../testing/nuts.h"
 
 #ifdef NNG_PLATFORM_POSIX
 #include <sys/stat.h>
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c
index c2e9093b..3084d3be 100644
--- a/src/sp/transport/tcp/tcp.c
+++ b/src/sp/transport/tcp/tcp.c
@@ -13,7 +13,6 @@
 #include <string.h>
 
 #include "../../../core/nng_impl.h"
-#include "nng/nng.h"
 
 // TCP transport.   Platform specific TCP operations must be
 // supplied as well.
diff --git a/src/sp/transport/tcp/tcp_test.c b/src/sp/transport/tcp/tcp_test.c
index 31379db6..9d3d70f3 100644
--- a/src/sp/transport/tcp/tcp_test.c
+++ b/src/sp/transport/tcp/tcp_test.c
@@ -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>
 // Copyright 2018 Cody Piersall <cody.piersall@gmail.com>
@@ -10,8 +10,6 @@
 // found online at https://opensource.org/licenses/MIT.
 //
 
-#include "nng/nng.h"
-
 #include "../../../testing/nuts.h"
 
 // TCP tests.
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index 528b05ec..ae613278 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -14,8 +14,6 @@
 
 #include "../../../core/nng_impl.h"
 
-#include "nng/nng.h"
-
 // TLS over TCP transport.   Platform specific TCP operations must be
 // supplied as well, and uses the supplemental TLS v1.2 code.  It is not
 // an accident that this very closely resembles the TCP transport itself.
diff --git a/src/sp/transport/tls/tls_tran_test.c b/src/sp/transport/tls/tls_tran_test.c
index 1b69c65f..3a5e6805 100644
--- a/src/sp/transport/tls/tls_tran_test.c
+++ b/src/sp/transport/tls/tls_tran_test.c
@@ -10,8 +10,6 @@
 // found online at https://opensource.org/licenses/MIT.
 //
 
-#include "nng/nng.h"
-
 #include "../../../testing/nuts.h"
 
 // TLS tests.
diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c
index b0945737..242ca481 100644
--- a/src/sp/transport/udp/udp.c
+++ b/src/sp/transport/udp/udp.c
@@ -5,17 +5,7 @@
 // file was obtained (LICENSE.txt).  A copy of the license may also be
 // found online at https://opensource.org/licenses/MIT.
 //
-#include <stdio.h>
-
-#include "core/aio.h"
-#include "core/defs.h"
-#include "core/idhash.h"
-#include "core/message.h"
-#include "core/nng_impl.h"
-#include "core/options.h"
-#include "core/pipe.h"
-#include "core/platform.h"
-#include "nng/nng.h"
+#include "../../../core/nng_impl.h"
 
 #include <string.h>
 
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index f9c13afe..fe6794c1 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -15,7 +15,6 @@
 
 #include "../../../core/nng_impl.h"
 #include "../../../supplemental/websocket/websocket.h"
-#include "nng/nng.h"
 
 typedef struct ws_dialer   ws_dialer;
 typedef struct ws_listener ws_listener;
diff --git a/src/sp/transport/ws/ws_test.c b/src/sp/transport/ws/ws_test.c
index 0ebc91ac..4f41b150 100644
--- a/src/sp/transport/ws/ws_test.c
+++ b/src/sp/transport/ws/ws_test.c
@@ -9,7 +9,6 @@
 //
 
 #include "../../../testing/nuts.h"
-#include "nng/nng.h"
 
 static void
 test_ws_url_path_filters(void)