api: remove old protocol headers

31 files changed, 39 insertions, 214 deletions

diff --git a/docs/ref/migrate/nng1.md b/docs/ref/migrate/nng1.md
index 74350ec0..964bba50 100644
--- a/docs/ref/migrate/nng1.md
+++ b/docs/ref/migrate/nng1.md
@@ -13,6 +13,29 @@ See the [Migrating From libnanomsg](nanomsg.md) chapter for details.
 It is now required for applications to initialize the library explicitly before using it.
 This is done using the [`nng_init`] function.
 
+## Removed Headers
+
+The following header files are removed, and the declarations they provided are now provided by including `<nng/nng.h>`.
+Simply remove any references to them.
+
+- `nng/protocol/bus0/bus.h`
+- `nng/protocol/pair0/pair.h`
+- `nng/protocol/pair1/pair.h`
+- `nng/protocol/pipeline0/pull.h`
+- `nng/protocol/pipeline0/push.h`
+- `nng/protocol/pubsub0/pub.h`
+- `nng/protocol/pubsub0/sub.h`
+- `nng/protocol/reqrep0/rep.h`
+- `nng/protocol/reqrep0/req.h`
+- `nng/protocol/survey0/respond.h`
+- `nng/protocol/survey0/survey.h`
+- `nng/transport/inproc/inproc.h`
+- `nng/transport/ipc/ipc.h`
+- `nng/transport/tcp/tcp.h`
+- `nng/transport/tls/tls.h`
+- `nng/transport/ws/websocket.h`
+- `nng/transport/zerotier/zerotier.h`
+
 ## Renamed Functions
 
 The following functions have been renamed as described by the following table.
@@ -42,9 +65,6 @@ The following macro aliases are removed, unless `NNG1_TRANSITION` is defined in
 Just add either `0` or `1` (in the case of PAIRv1) to get the protocol desired. (Forcing the version number to
 be supplied should avoid surprises later as new versions of protocols are added.)
 
-Additionally, the header files for protocols are now empty, as all of their content has been moved to `nng/nng.h`.
-Please remove `#include` references to protocol headers as we anticipate removing them in the future.
-
 ## NNG_FLAG_ALLOC Removed
 
 The `NNG_FLAG_ALLOC` flag that allowed a zero copy semantic with [`nng_send`] and [`nng_recv`] is removed.
diff --git a/include/nng/protocol/bus0/bus.h b/include/nng/protocol/bus0/bus.h
deleted file mode 100644
index 6d579dc7..00000000
--- a/include/nng/protocol/bus0/bus.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_BUS0_BUS_H
-#define NNG_PROTOCOL_BUS0_BUS_H
-#endif
diff --git a/include/nng/protocol/pair0/pair.h b/include/nng/protocol/pair0/pair.h
deleted file mode 100644
index ec9c39ae..00000000
--- a/include/nng/protocol/pair0/pair.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_PAIR0_PAIR_H
-#define NNG_PROTOCOL_PAIR0_PAIR_H
-#endif
diff --git a/include/nng/protocol/pair1/pair.h b/include/nng/protocol/pair1/pair.h
deleted file mode 100644
index 4450c280..00000000
--- a/include/nng/protocol/pair1/pair.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_PAIR1_PAIR_H
-#define NNG_PROTOCOL_PAIR1_PAIR_H
-#endif
diff --git a/include/nng/protocol/pipeline0/pull.h b/include/nng/protocol/pipeline0/pull.h
deleted file mode 100644
index 6f1c4621..00000000
--- a/include/nng/protocol/pipeline0/pull.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_PIPELINE0_PULL_H
-#define NNG_PROTOCOL_PIPELINE0_PULL_H
-#endif
diff --git a/include/nng/protocol/pipeline0/push.h b/include/nng/protocol/pipeline0/push.h
deleted file mode 100644
index 25e37fd7..00000000
--- a/include/nng/protocol/pipeline0/push.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_PIPELINE0_PUSH_H
-#define NNG_PROTOCOL_PIPELINE0_PUSH_H
-#endif
diff --git a/include/nng/protocol/pubsub0/pub.h b/include/nng/protocol/pubsub0/pub.h
deleted file mode 100644
index 3a23e43b..00000000
--- a/include/nng/protocol/pubsub0/pub.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_PUBSUB0_PUB_H
-#define NNG_PROTOCOL_PUBSUB0_PUB_H
-#endif
diff --git a/include/nng/protocol/pubsub0/sub.h b/include/nng/protocol/pubsub0/sub.h
deleted file mode 100644
index 5c03ca58..00000000
--- a/include/nng/protocol/pubsub0/sub.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_PUBSUB0_SUB_H
-#define NNG_PROTOCOL_PUBSUB0_SUB_H
-#endif
diff --git a/include/nng/protocol/reqrep0/rep.h b/include/nng/protocol/reqrep0/rep.h
deleted file mode 100644
index ec689067..00000000
--- a/include/nng/protocol/reqrep0/rep.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_REQREP0_REP_H
-#define NNG_PROTOCOL_REQREP0_REP_H
-#endif
diff --git a/include/nng/protocol/reqrep0/req.h b/include/nng/protocol/reqrep0/req.h
deleted file mode 100644
index 987ae4c2..00000000
--- a/include/nng/protocol/reqrep0/req.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// 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
-// copy of which should be located in the distribution where this
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_REQREP0_REQ_H
-#define NNG_PROTOCOL_REQREP0_REQ_H
-#endif
diff --git a/include/nng/protocol/survey0/respond.h b/include/nng/protocol/survey0/respond.h
deleted file mode 100644
index 57dc9704..00000000
--- a/include/nng/protocol/survey0/respond.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_SURVEY0_RESPOND_H
-#define NNG_PROTOCOL_SURVEY0_RESPOND_H
-#endif
diff --git a/include/nng/protocol/survey0/survey.h b/include/nng/protocol/survey0/survey.h
deleted file mode 100644
index 33c271ea..00000000
--- a/include/nng/protocol/survey0/survey.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// 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
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-// Content moved to nng/nng.h
-#ifndef NNG_PROTOCOL_SURVEY0_SURVEY_H
-#define NNG_PROTOCOL_SURVEY0_SURVEY_H
-#endif
diff --git a/src/sp/device_test.c b/src/sp/device_test.c
index 6d2ff1fb..7d25aaa5 100644
--- a/src/sp/device_test.c
+++ b/src/sp/device_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>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,8 +11,6 @@
 #include <string.h>
 
 #include <nng/nng.h>
-#include <nng/protocol/pair0/pair.h>
-#include <nng/protocol/pair1/pair.h>
 
 #include <nuts.h>
 
diff --git a/src/sp/multistress_test.c b/src/sp/multistress_test.c
index 5ffc4c4f..394835e5 100644
--- a/src/sp/multistress_test.c
+++ b/src/sp/multistress_test.c
@@ -13,17 +13,6 @@
 #include <time.h>
 
 #include <nng/nng.h>
-#include <nng/protocol/bus0/bus.h>
-#include <nng/protocol/pair0/pair.h>
-#include <nng/protocol/pair1/pair.h>
-#include <nng/protocol/pipeline0/pull.h>
-#include <nng/protocol/pipeline0/push.h>
-#include <nng/protocol/pubsub0/pub.h>
-#include <nng/protocol/pubsub0/sub.h>
-#include <nng/protocol/reqrep0/rep.h>
-#include <nng/protocol/reqrep0/req.h>
-#include <nng/protocol/survey0/respond.h>
-#include <nng/protocol/survey0/survey.h>
 
 #include <nuts.h>
 
diff --git a/src/sp/nonblock_test.c b/src/sp/nonblock_test.c
index c06fa64d..cb87f0af 100644
--- a/src/sp/nonblock_test.c
+++ b/src/sp/nonblock_test.c
@@ -23,8 +23,6 @@
 #endif
 
 #include <nng/nng.h>
-#include <nng/protocol/reqrep0/rep.h>
-#include <nng/protocol/reqrep0/req.h>
 
 #include <nuts.h>
 
diff --git a/src/sp/pipe_test.c b/src/sp/pipe_test.c
index 7a50c133..8f668d8c 100644
--- a/src/sp/pipe_test.c
+++ b/src/sp/pipe_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>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -12,9 +12,6 @@
 #include <string.h>
 
 #include <nng/nng.h>
-#include <nng/protocol/pipeline0/pull.h>
-#include <nng/protocol/pipeline0/push.h>
-
 #include <nuts.h>
 
 struct testcase {
diff --git a/src/sp/protocol/bus0/CMakeLists.txt b/src/sp/protocol/bus0/CMakeLists.txt
index ca7ee9bc..b235204c 100644
--- a/src/sp/protocol/bus0/CMakeLists.txt
+++ b/src/sp/protocol/bus0/CMakeLists.txt
@@ -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
@@ -12,7 +12,6 @@
 nng_directory(bus0)
 
 nng_sources_if(NNG_PROTO_BUS0 bus.c)
-nng_headers_if(NNG_PROTO_BUS0 nng/protocol/bus0/bus.h)
 nng_defines_if(NNG_PROTO_BUS0 NNG_HAVE_BUS0)
 
-nng_test(bus_test)
\ No newline at end of file
+nng_test(bus_test)
diff --git a/src/sp/protocol/bus0/bus_test.c b/src/sp/protocol/bus0/bus_test.c
index d8b71c63..b1141d93 100644
--- a/src/sp/protocol/bus0/bus_test.c
+++ b/src/sp/protocol/bus0/bus_test.c
@@ -10,8 +10,6 @@
 #include "nng/nng.h"
 #include <nuts.h>
 
-#include <nng/protocol/bus0/bus.h>
-
 #define SECOND 1000
 
 #define BUS0_SELF 0x70
diff --git a/src/sp/protocol/pair0/CMakeLists.txt b/src/sp/protocol/pair0/CMakeLists.txt
index 2f74e139..af5a43da 100644
--- a/src/sp/protocol/pair0/CMakeLists.txt
+++ b/src/sp/protocol/pair0/CMakeLists.txt
@@ -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
@@ -12,6 +12,5 @@
 nng_directory(pair0)
 
 nng_sources_if(NNG_PROTO_PAIR0 pair.c)
-nng_headers_if(NNG_PROTO_PAIR0 nng/protocol/pair0/pair.h)
 nng_defines_if(NNG_PROTO_PAIR0 NNG_HAVE_PAIR0)
 nng_test(pair0_test)
diff --git a/src/sp/protocol/pair1/CMakeLists.txt b/src/sp/protocol/pair1/CMakeLists.txt
index 12e12607..06d764a0 100644
--- a/src/sp/protocol/pair1/CMakeLists.txt
+++ b/src/sp/protocol/pair1/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Staysail Systems, Inc. <info@staystail.tech>
+# Copyright 2025 Staysail Systems, Inc. <info@staystail.tech>
 # Copyright 2018 Capitar IT Group BV <info@capitar.com>
 #
 # This software is supplied under the terms of the MIT License, a
@@ -11,10 +11,8 @@
 #  PAIRv1 protocol
 nng_directory(pair1)
 
-# XXX: break pair1_poly into an ifdef.
 nng_sources_if(NNG_PROTO_PAIR1 pair.c pair1_poly.c)
-nng_headers_if(NNG_PROTO_PAIR1 nng/protocol/pair1/pair.h)
 nng_defines_if(NNG_PROTO_PAIR1 NNG_HAVE_PAIR1)
 
 nng_test(pair1_test)
-nng_test(pair1_poly_test)
\ No newline at end of file
+nng_test(pair1_poly_test)
diff --git a/src/sp/protocol/pipeline0/CMakeLists.txt b/src/sp/protocol/pipeline0/CMakeLists.txt
index 8a10eab7..4838067a 100644
--- a/src/sp/protocol/pipeline0/CMakeLists.txt
+++ b/src/sp/protocol/pipeline0/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 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
@@ -12,11 +12,9 @@
 nng_directory(pipeline0)
 
 nng_sources_if(NNG_PROTO_PUSH0 push.c)
-nng_headers_if(NNG_PROTO_PUSH0 nng/protocol/pipeline0/push.h)
 nng_defines_if(NNG_PROTO_PUSH0 NNG_HAVE_PUSH0)
 
 nng_sources_if(NNG_PROTO_PULL0 pull.c)
-nng_headers_if(NNG_PROTO_PULL0 nng/protocol/pipeline0/pull.h)
 nng_defines_if(NNG_PROTO_PULL0 NNG_HAVE_PULL0)
 
 nng_test(pull_test)
diff --git a/src/sp/protocol/pubsub0/CMakeLists.txt b/src/sp/protocol/pubsub0/CMakeLists.txt
index 160b7462..46c37995 100644
--- a/src/sp/protocol/pubsub0/CMakeLists.txt
+++ b/src/sp/protocol/pubsub0/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 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
@@ -12,11 +12,9 @@
 nng_directory(pubsub0)
 
 nng_sources_if(NNG_PROTO_PUB0 pub.c)
-nng_headers_if(NNG_PROTO_PUB0 nng/protocol/pubsub0/pub.h)
 nng_defines_if(NNG_PROTO_PUB0 NNG_HAVE_PUB0)
 
 nng_sources_if(NNG_PROTO_SUB0 sub.c xsub.c)
-nng_headers_if(NNG_PROTO_SUB0 nng/protocol/pubsub0/sub.h)
 nng_defines_if(NNG_PROTO_SUB0 NNG_HAVE_SUB0)
 
 nng_test(pub_test)
diff --git a/src/sp/protocol/pubsub0/sub_test.c b/src/sp/protocol/pubsub0/sub_test.c
index 5c72b8bd..13fc07bf 100644
--- a/src/sp/protocol/pubsub0/sub_test.c
+++ b/src/sp/protocol/pubsub0/sub_test.c
@@ -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
@@ -8,7 +8,6 @@
 //
 
 #include "nng/nng.h"
-#include "nng/protocol/pubsub0/sub.h"
 #include <nuts.h>
 
 static void
diff --git a/src/sp/protocol/pubsub0/xsub_test.c b/src/sp/protocol/pubsub0/xsub_test.c
index 618703b5..859ab532 100644
--- a/src/sp/protocol/pubsub0/xsub_test.c
+++ b/src/sp/protocol/pubsub0/xsub_test.c
@@ -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
@@ -8,7 +8,6 @@
 //
 
 #include <nng/nng.h>
-#include <nng/protocol/pubsub0/sub.h>
 #include <nuts.h>
 
 static void
diff --git a/src/sp/protocol/reqrep0/CMakeLists.txt b/src/sp/protocol/reqrep0/CMakeLists.txt
index b5d44759..f6ad34b1 100644
--- a/src/sp/protocol/reqrep0/CMakeLists.txt
+++ b/src/sp/protocol/reqrep0/CMakeLists.txt
@@ -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>
 #
 # This software is supplied under the terms of the MIT License, a
@@ -12,11 +12,9 @@
 nng_directory(reqrep0)
 
 nng_sources_if(NNG_PROTO_REQ0 req.c xreq.c)
-nng_headers_if(NNG_PROTO_REQ0 nng/protocol/reqrep0/req.h)
 nng_defines_if(NNG_PROTO_REQ0 NNG_HAVE_REQ0)
 
 nng_sources_if(NNG_PROTO_REP0 rep.c xrep.c)
-nng_headers_if(NNG_PROTO_REP0 nng/protocol/reqrep0/rep.h)
 nng_defines_if(NNG_PROTO_REP0 NNG_HAVE_REP0)
 
 nng_test(req_test)
diff --git a/src/sp/protocol/survey0/CMakeLists.txt b/src/sp/protocol/survey0/CMakeLists.txt
index b5daca41..9397da9f 100644
--- a/src/sp/protocol/survey0/CMakeLists.txt
+++ b/src/sp/protocol/survey0/CMakeLists.txt
@@ -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>
 #
 # This software is supplied under the terms of the MIT License, a
@@ -12,14 +12,12 @@
 nng_directory(survey0)
 
 nng_sources_if(NNG_PROTO_SURVEYOR0 survey.c xsurvey.c)
-nng_headers_if(NNG_PROTO_SURVEYOR0 nng/protocol/survey0/survey.h)
 nng_defines_if(NNG_PROTO_SURVEYOR0 NNG_HAVE_SURVEYOR0)
 
 nng_sources_if(NNG_PROTO_RESPONDENT0 respond.c xrespond.c)
-nng_headers_if(NNG_PROTO_RESPONDENT0 nng/protocol/survey0/respond.h)
 nng_defines_if(NNG_PROTO_RESPONDENT0 NNG_HAVE_RESPONDENT0)
 
 nng_test(respond_test)
 nng_test(survey_test)
 nng_test(xrespond_test)
-nng_test(xsurvey_test)
\ No newline at end of file
+nng_test(xsurvey_test)
diff --git a/src/sp/transport/socket/sockfd_test.c b/src/sp/transport/socket/sockfd_test.c
index e5d62f5d..ccd67587 100644
--- a/src/sp/transport/socket/sockfd_test.c
+++ b/src/sp/transport/socket/sockfd_test.c
@@ -10,7 +10,6 @@
 // found online at https://opensource.org/licenses/MIT.
 //
 
-#include "nng/protocol/pubsub0/sub.h"
 #include <nng/nng.h>
 #include <nuts.h>
 
diff --git a/src/tools/nngcat/nngcat.c b/src/tools/nngcat/nngcat.c
index 6f0d7d97..29a8d928 100644
--- a/src/tools/nngcat/nngcat.c
+++ b/src/tools/nngcat/nngcat.c
@@ -18,17 +18,6 @@
 #include <string.h>
 
 #include <nng/nng.h>
-#include <nng/protocol/bus0/bus.h>
-#include <nng/protocol/pair0/pair.h>
-#include <nng/protocol/pair1/pair.h>
-#include <nng/protocol/pipeline0/pull.h>
-#include <nng/protocol/pipeline0/push.h>
-#include <nng/protocol/pubsub0/pub.h>
-#include <nng/protocol/pubsub0/sub.h>
-#include <nng/protocol/reqrep0/rep.h>
-#include <nng/protocol/reqrep0/req.h>
-#include <nng/protocol/survey0/respond.h>
-#include <nng/protocol/survey0/survey.h>
 #include <nng/supplemental/tls/tls.h>
 #include <nng/supplemental/util/options.h>
 
diff --git a/src/tools/perf/pubdrop.c b/src/tools/perf/pubdrop.c
index 6f0e5553..1788a3cf 100644
--- a/src/tools/perf/pubdrop.c
+++ b/src/tools/perf/pubdrop.c
@@ -21,9 +21,6 @@
 // etc.  It actually uses a wild card subscription for now.
 
 #if defined(NNG_HAVE_PUB0) && defined(NNG_HAVE_SUB0)
-#include <nng/protocol/pubsub0/pub.h>
-#include <nng/protocol/pubsub0/sub.h>
-
 #else
 
 #define NNG_OPT_SUB_SUBSCRIBE "sub:subscribe"
diff --git a/tests/cplusplus_pair.cc b/tests/cplusplus_pair.cc
index 2a3cc20d..1148aaae 100644
--- a/tests/cplusplus_pair.cc
+++ b/tests/cplusplus_pair.cc
@@ -1,5 +1,5 @@
 //
-//  Copyright 2024 Staysail Systems, Inc.
+//  Copyright 2025 Staysail Systems, Inc.
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -8,7 +8,6 @@
 //
 
 #include "nng/nng.h"
-#include "nng/protocol/pair1/pair.h"
 
 #include <cstdio>
 #include <cstring>
diff --git a/tests/wss.c b/tests/wss.c
index 331b9a97..670d8a55 100644
--- a/tests/wss.c
+++ b/tests/wss.c
@@ -1,5 +1,5 @@
 //
-// Copyright 2022 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
@@ -13,7 +13,6 @@
 #endif
 
 #include <nng/nng.h>
-#include <nng/protocol/pair1/pair.h>
 #include <nng/supplemental/tls/tls.h>
 
 #include "convey.h"