diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj
index 95db1df6..6dea77c2 100644
--- a/builds/msvc/libzmq/libzmq.vcproj
+++ b/builds/msvc/libzmq/libzmq.vcproj
@@ -170,11 +170,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\src\app_thread.cpp"
+				RelativePath="..\..\..\src\command.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\command.cpp"
+				RelativePath="..\..\..\src\connect_session.cpp"
 				>
 			</File>
 			<File
@@ -185,10 +185,6 @@
 				RelativePath="..\..\..\src\devpoll.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\push.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\epoll.cpp"
 				>
@@ -229,6 +225,10 @@
 				RelativePath="..\..\..\src\msg_store.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\named_session.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\object.cpp"
 				>
@@ -238,7 +238,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\owned.cpp"
+				RelativePath="..\..\..\src\own.cpp"
 				>
 			</File>
 			<File
@@ -273,6 +273,14 @@
 				RelativePath="..\..\..\src\pub.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\pull.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\push.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\queue.cpp"
 				>
@@ -326,7 +334,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\pull.cpp"
+				RelativePath="..\..\..\src\transient_session.cpp"
 				>
 			</File>
 			<File
@@ -375,10 +383,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath="..\..\..\src\app_thread.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\atomic_counter.hpp"
 				>
@@ -395,6 +399,10 @@
 				RelativePath="..\..\..\src\config.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\connect_session.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\ctx.hpp"
 				>
@@ -407,10 +415,6 @@
 				RelativePath="..\..\..\src\devpoll.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\push.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\encoder.hpp"
 				>
@@ -483,6 +487,10 @@
 				RelativePath="..\..\..\src\mutex.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\named_session.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\object.hpp"
 				>
@@ -492,7 +500,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\owned.hpp"
+				RelativePath="..\..\..\src\own.hpp"
 				>
 			</File>
 			<File
@@ -531,6 +539,14 @@
 				RelativePath="..\..\..\src\pub.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\pull.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\push.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\queue.hpp"
 				>
@@ -588,7 +604,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\pull.hpp"
+				RelativePath="..\..\..\src\transient_session.hpp"
 				>
 			</File>
 			<File
diff --git a/src/pipe.hpp b/src/pipe.hpp
index 12b0dfe2..421ebc93 100644
--- a/src/pipe.hpp
+++ b/src/pipe.hpp
@@ -32,6 +32,11 @@
 namespace zmq
 {
 
+    //  Creates a pipe. Returns pointer to reader and writer objects.
+    void create_pipe (object_t *reader_parent_, object_t *writer_parent_,
+        uint64_t hwm_, int64_t swap_size_, class reader_t **reader_,
+        class writer_t **writer_);
+
     //  The shutdown mechanism for pipe works as follows: Either endpoint
     //  (or even both of them) can ask pipe to terminate by calling 'terminate'
     //  method. Pipe then terminates in asynchronous manner. When the part of
@@ -197,10 +202,6 @@ namespace zmq
         void operator = (const writer_t&);
     };
 
-    //  Creates a pipe. Returns pointer to reader and writer objects.
-    void create_pipe (object_t *reader_parent_, object_t *writer_parent_,
-        uint64_t hwm_, int64_t swap_size_, reader_t **reader_,
-        writer_t **writer_);
 }
 
 #endif
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 76dfc46f..f575c0af 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -307,6 +307,7 @@ int zmq::socket_base_t::bind (const char *addr_)
     }
 
     zmq_assert (false);
+    return -1;
 }
 
 int zmq::socket_base_t::connect (const char *addr_)