6 files changed, 7 insertions, 4 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 459e5f23..040df7f4 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -73,8 +73,6 @@ nng_sources(
         thread.h
         timer.c
         timer.h
-        transport.c
-        transport.h
         url.c
         url.h
 )
diff --git a/src/core/nng_impl.h b/src/core/nng_impl.h
index cfcd0e08..a9e5560d 100644
--- a/src/core/nng_impl.h
+++ b/src/core/nng_impl.h
@@ -50,7 +50,7 @@
 #include "core/url.h"
 
 // transport needs to come after url
-#include "core/transport.h"
+#include "sp/transport.h"
 
 // These have to come after the others - particularly transport.h
 
diff --git a/src/core/pipe.h b/src/core/pipe.h
index 79c48500..fe908936 100644
--- a/src/core/pipe.h
+++ b/src/core/pipe.h
@@ -17,7 +17,7 @@
 
 #include "core/defs.h"
 #include "core/thread.h"
-#include "core/transport.h"
+#include "sp/transport.h"
 
 extern int  nni_pipe_sys_init(void);
 extern void nni_pipe_sys_fini(void);
diff --git a/src/sp/CMakeLists.txt b/src/sp/CMakeLists.txt
index b84952ee..aa790c09 100644
--- a/src/sp/CMakeLists.txt
+++ b/src/sp/CMakeLists.txt
@@ -11,3 +11,8 @@ nng_directory(sp)
 
 add_subdirectory(protocol)
 add_subdirectory(transport)
+
+nng_sources(
+        transport.c
+        transport.h
+)
diff --git a/src/core/transport.c b/src/sp/transport.c
index 78859078..78859078 100644
--- a/src/core/transport.c
+++ b/src/sp/transport.c
diff --git a/src/core/transport.h b/src/sp/transport.h
index b2da2c7a..b2da2c7a 100644
--- a/src/core/transport.h
+++ b/src/sp/transport.h