diff --git a/src/core/defs.h b/src/core/defs.h
index d559b490c..2d73f2961 100644
--- a/src/core/defs.h
+++ b/src/core/defs.h
@@ -11,8 +11,10 @@
 #ifndef CORE_DEFS_H
 #define CORE_DEFS_H
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
+
+#include <nng/nng.h>
 
 // C compilers may get unhappy when named arguments are not used.  While
 // there are things like __attribute__((unused)) which are arguably
@@ -24,7 +26,7 @@
 	if (!(x))     \
 	nni_panic("%s: %d: assert err: %s", __FILE__, __LINE__, #x)
 #else
-#define NNI_ASSERT(x) ((void)(0))
+#define NNI_ASSERT(x) ((void) (0))
 #endif
 
 // Returns the size of an array in elements. (Convenience.)
diff --git a/src/core/taskq.h b/src/core/taskq.h
index 2ff449cfd..ccc54f61a 100644
--- a/src/core/taskq.h
+++ b/src/core/taskq.h
@@ -13,6 +13,7 @@
 
 #include "core/defs.h"
 #include "core/list.h"
+#include "core/platform.h"
 
 typedef struct nni_taskq nni_taskq;
 typedef struct nni_task  nni_task;
@@ -51,7 +52,7 @@ extern bool nni_task_busy(nni_task *);
 // work is scheduled on the task then it will not return until that
 // work (or any other work subsequently scheduled) is complete.
 extern void nni_task_wait(nni_task *);
-extern void  nni_task_init(nni_task *, nni_taskq *, nni_cb, void *);
+extern void nni_task_init(nni_task *, nni_taskq *, nni_cb, void *);
 
 // nni_task_fini destroys the task.  It will reap resources asynchronously
 // if the task is currently executing.  Use nni_task_wait() first if the
@@ -67,9 +68,9 @@ extern void nni_taskq_sys_fini(void);
 // consuming structures.
 struct nni_task {
 	nni_list_node task_node;
-	void *        task_arg;
+	void         *task_arg;
 	nni_cb        task_cb;
-	nni_taskq *   task_tq;
+	nni_taskq    *task_tq;
 	unsigned      task_busy;
 	bool          task_prep;
 	nni_mtx       task_mtx;
diff --git a/src/sp/transport/CMakeLists.txt b/src/sp/transport/CMakeLists.txt
index 0de80015d..c7f6dabd4 100644
--- a/src/sp/transport/CMakeLists.txt
+++ b/src/sp/transport/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Staysail Systems, Inc. <info@staystail.tech>
+# Copyright 2024 Staysail Systems, Inc. <info@staystail.tech>
 #
 # This software is supplied under the terms of the MIT License, a
 # copy of which should be located in the distribution where this
@@ -15,6 +15,6 @@ add_subdirectory(inproc)
 add_subdirectory(ipc)
 add_subdirectory(tcp)
 add_subdirectory(tls)
+add_subdirectory(udp)
 add_subdirectory(ws)
 add_subdirectory(zerotier)
-