diff --git a/src/lib.rs b/src/lib.rs
index 13f2176..434f1fe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -88,10 +88,6 @@ pub extern crate tokio_proto;
 #[doc(hidden)]
 pub extern crate tokio_service;
 
-#[doc(hidden)]
-pub use client::Client;
-#[doc(hidden)]
-pub use client::future::ConnectFuture;
 pub use errors::Error;
 #[doc(hidden)]
 pub use errors::WireError;
@@ -119,8 +115,7 @@ use tokio_core::reactor;
 
 lazy_static! {
     /// The `Remote` for the default reactor core.
-    #[doc(hidden)]
-    pub static ref REMOTE: reactor::Remote = {
+    static ref REMOTE: reactor::Remote = {
         spawn_core()
     };
 }
diff --git a/src/macros.rs b/src/macros.rs
index fff5c44..768e345 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -558,14 +558,14 @@ macro_rules! service {
 
         #[allow(non_camel_case_types)]
         type __tarpc_service_Client =
-            $crate::Client<__tarpc_service_Request,
+            $crate::client::Client<__tarpc_service_Request,
                            __tarpc_service_Response,
                            __tarpc_service_Error>;
 
         #[allow(non_camel_case_types)]
         /// Implementation detail: Pending connection.
         pub struct __tarpc_service_ConnectFuture<T> {
-            inner: $crate::futures::Map<$crate::ConnectFuture<__tarpc_service_Request,
+            inner: $crate::futures::Map<$crate::client::future::ConnectFuture<__tarpc_service_Request,
                                                               __tarpc_service_Response,
                                                               __tarpc_service_Error>,
                                         fn(__tarpc_service_Client) -> T>,
diff --git a/src/server.rs b/src/server.rs
index 35f5d05..29e34a7 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -72,9 +72,9 @@ pub fn listen<S, Req, Resp, E>(new_service: S, addr: SocketAddr, options: Option
         }
     }
 }
+
 /// Spawns a service that binds to the given address using the given handle.
-#[doc(hidden)]
-pub fn listen_with<S, Req, Resp, E>(new_service: S,
+fn listen_with<S, Req, Resp, E>(new_service: S,
                                     addr: SocketAddr,
                                     handle: Handle)
                                     -> io::Result<SocketAddr>