diff --git a/src/unix/tcp.c b/src/unix/tcp.c
index 5ff39699..8695a980 100644
--- a/src/unix/tcp.c
+++ b/src/unix/tcp.c
@@ -33,10 +33,10 @@ int uv_tcp_init(uv_loop_t* loop, uv_tcp_t* tcp) {
 }
 
 
-static int uv__tcp_bind(uv_tcp_t* tcp,
-                        int domain,
-                        struct sockaddr* addr,
-                        int addrsize) {
+static int uv__bind(uv_tcp_t* tcp,
+                    int domain,
+                    struct sockaddr* addr,
+                    int addrsize) {
   int saved_errno;
   int status;
 
@@ -76,29 +76,19 @@ out:
 }
 
 
-int uv_tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr) {
-  if (handle->type != UV_TCP || addr.sin_family != AF_INET) {
-    uv__set_sys_error(handle->loop, EFAULT);
-    return -1;
-  }
-
-  return uv__tcp_bind(handle,
-                      AF_INET,
-                      (struct sockaddr*)&addr,
-                      sizeof(struct sockaddr_in));
+int uv__tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr) {
+  return uv__bind(handle,
+                  AF_INET,
+                  (struct sockaddr*)&addr,
+                  sizeof(struct sockaddr_in));
 }
 
 
-int uv_tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr) {
-  if (handle->type != UV_TCP || addr.sin6_family != AF_INET6) {
-    uv__set_sys_error(handle->loop, EFAULT);
-    return -1;
-  }
-
-  return uv__tcp_bind(handle,
-                      AF_INET6,
-                      (struct sockaddr*)&addr,
-                      sizeof(struct sockaddr_in6));
+int uv__tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr) {
+  return uv__bind(handle,
+                  AF_INET6,
+                  (struct sockaddr*)&addr,
+                  sizeof(struct sockaddr_in6));
 }
 
 
diff --git a/src/unix/udp.c b/src/unix/udp.c
index e8a772af..0fbd18bc 100644
--- a/src/unix/udp.c
+++ b/src/unix/udp.c
@@ -34,8 +34,6 @@ static void uv__udp_run_pending(uv_udp_t* handle);
 static void uv__udp_recvmsg(uv_udp_t* handle);
 static void uv__udp_sendmsg(uv_udp_t* handle);
 static void uv__udp_io(EV_P_ ev_io* w, int events);
-static int uv__udp_bind(uv_udp_t* handle, int domain, struct sockaddr* addr,
-    socklen_t len, unsigned flags);
 static int uv__udp_maybe_deferred_bind(uv_udp_t* handle, int domain);
 static int uv__udp_send(uv_udp_send_t* req, uv_udp_t* handle, uv_buf_t bufs[],
     int bufcnt, struct sockaddr* addr, socklen_t addrlen, uv_udp_send_cb send_cb);
@@ -289,11 +287,11 @@ static void uv__udp_io(EV_P_ ev_io* w, int events) {
 }
 
 
-static int uv__udp_bind(uv_udp_t* handle,
-                        int domain,
-                        struct sockaddr* addr,
-                        socklen_t len,
-                        unsigned flags) {
+static int uv__bind(uv_udp_t* handle,
+                    int domain,
+                    struct sockaddr* addr,
+                    socklen_t len,
+                    unsigned flags) {
   int saved_errno;
   int status;
   int yes;
@@ -389,7 +387,7 @@ static int uv__udp_maybe_deferred_bind(uv_udp_t* handle, int domain) {
     abort();
   }
 
-  return uv__udp_bind(handle, domain, (struct sockaddr*)&taddr, addrlen, 0);
+  return uv__bind(handle, domain, (struct sockaddr*)&taddr, addrlen, 0);
 }
 
 
@@ -443,31 +441,21 @@ int uv_udp_init(uv_loop_t* loop, uv_udp_t* handle) {
 }
 
 
-int uv_udp_bind(uv_udp_t* handle, struct sockaddr_in addr, unsigned flags) {
-  if (handle->type != UV_UDP || addr.sin_family != AF_INET) {
-    uv__set_sys_error(handle->loop, EFAULT);
-    return -1;
-  }
-
-  return uv__udp_bind(handle,
-                      AF_INET,
-                      (struct sockaddr*)&addr,
-                      sizeof addr,
-                      flags);
+int uv__udp_bind(uv_udp_t* handle, struct sockaddr_in addr, unsigned flags) {
+  return uv__bind(handle,
+                  AF_INET,
+                  (struct sockaddr*)&addr,
+                  sizeof addr,
+                  flags);
 }
 
 
-int uv_udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr, unsigned flags) {
-  if (handle->type != UV_UDP || addr.sin6_family != AF_INET6) {
-    uv__set_sys_error(handle->loop, EFAULT);
-    return -1;
-  }
-
-  return uv__udp_bind(handle,
-                      AF_INET6,
-                      (struct sockaddr*)&addr,
-                      sizeof addr,
-                      flags);
+int uv__udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr, unsigned flags) {
+  return uv__bind(handle,
+                  AF_INET6,
+                  (struct sockaddr*)&addr,
+                  sizeof addr,
+                  flags);
 }
 
 
diff --git a/src/uv-common.c b/src/uv-common.c
index d5e2a546..b97aac3b 100644
--- a/src/uv-common.c
+++ b/src/uv-common.c
@@ -207,6 +207,44 @@ int uv_ares_handles_empty(uv_loop_t* loop) {
   return loop->uv_ares_handles_ ? 0 : 1;
 }
 
+int uv_tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr) {
+  if (handle->type != UV_TCP || addr.sin_family != AF_INET) {
+    uv__set_artificial_error(handle->loop, UV_EFAULT);
+    return -1;
+  }
+
+  return uv__tcp_bind(handle, addr);
+}
+
+int uv_tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr) {
+  if (handle->type != UV_TCP || addr.sin6_family != AF_INET6) {
+    uv__set_artificial_error(handle->loop, UV_EFAULT);
+    return -1;
+  }
+
+  return uv__tcp_bind6(handle, addr);
+}
+
+int uv_udp_bind(uv_udp_t* handle, struct sockaddr_in addr,
+    unsigned int flags) {
+  if (handle->type != UV_UDP || addr.sin_family != AF_INET) {
+    uv__set_artificial_error(handle->loop, UV_EFAULT);
+    return -1;
+  }
+
+  return uv__udp_bind(handle, addr, flags);
+}
+
+int uv_udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr,
+    unsigned int flags) {
+  if (handle->type != UV_UDP || addr.sin6_family != AF_INET6) {
+    uv__set_artificial_error(handle->loop, UV_EFAULT);
+    return -1;
+  }
+
+  return uv__udp_bind6(handle, addr, flags);
+}
+
 int uv_tcp_connect(uv_connect_t* req,
                    uv_tcp_t* handle,
                    struct sockaddr_in address,
diff --git a/src/uv-common.h b/src/uv-common.h
index e803812f..ff81e0dc 100644
--- a/src/uv-common.h
+++ b/src/uv-common.h
@@ -53,6 +53,12 @@ void uv__set_error(uv_loop_t* loop, uv_err_code code, int sys_error);
 void uv__set_sys_error(uv_loop_t* loop, int sys_error);
 void uv__set_artificial_error(uv_loop_t* loop, uv_err_code code);
 
+int uv__tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr);
+int uv__tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr);
+
+int uv__udp_bind(uv_udp_t* handle, struct sockaddr_in addr, unsigned flags);
+int uv__udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr, unsigned flags);
+
 int uv__tcp_connect(uv_connect_t* req,
                    uv_tcp_t* handle,
                    struct sockaddr_in address,
diff --git a/src/win/tcp.c b/src/win/tcp.c
index 0fa93020..ee95aa11 100644
--- a/src/win/tcp.c
+++ b/src/win/tcp.c
@@ -154,8 +154,10 @@ void uv_tcp_endgame(uv_loop_t* loop, uv_tcp_t* handle) {
 }
 
 
-static int uv__bind(uv_loop_t* loop, uv_tcp_t* handle, int domain,
-    struct sockaddr* addr, int addrsize) {
+static int uv__bind(uv_tcp_t* handle,
+                    int domain,
+                    struct sockaddr* addr,
+                    int addrsize) {
   DWORD err;
   int r;
   SOCKET sock;
@@ -163,11 +165,11 @@ static int uv__bind(uv_loop_t* loop, uv_tcp_t* handle, int domain,
   if (handle->socket == INVALID_SOCKET) {
     sock = socket(domain, SOCK_STREAM, 0);
     if (sock == INVALID_SOCKET) {
-      uv__set_sys_error(loop, WSAGetLastError());
+      uv__set_sys_error(handle->loop, WSAGetLastError());
       return -1;
     }
 
-    if (uv_tcp_set_socket(loop, handle, sock) == -1) {
+    if (uv_tcp_set_socket(handle->loop, handle, sock) == -1) {
       closesocket(sock);
       return -1;
     }
@@ -182,7 +184,7 @@ static int uv__bind(uv_loop_t* loop, uv_tcp_t* handle, int domain,
       handle->bind_error = err;
       handle->flags |= UV_HANDLE_BIND_ERROR;
     } else {
-      uv__set_sys_error(loop, err);
+      uv__set_sys_error(handle->loop, err);
       return -1;
     }
   }
@@ -193,40 +195,24 @@ static int uv__bind(uv_loop_t* loop, uv_tcp_t* handle, int domain,
 }
 
 
-int uv_tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr) {
-  uv_loop_t* loop = handle->loop;
-
-  if (handle->type != UV_TCP || addr.sin_family != AF_INET) {
-    uv__set_sys_error(loop, WSAEFAULT);
-    return -1;
-  }
-
-  return uv__bind(loop,
-                  handle,
+int uv__tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr) {
+  return uv__bind(handle,
                   AF_INET,
                   (struct sockaddr*)&addr,
                   sizeof(struct sockaddr_in));
 }
 
 
-int uv_tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr) {
-  uv_loop_t* loop = handle->loop;
-
-  if (handle->type != UV_TCP || addr.sin6_family != AF_INET6) {
-    uv__set_sys_error(loop, WSAEFAULT);
-    return -1;
-  }
-
+int uv__tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr) {
   if (uv_allow_ipv6) {
     handle->flags |= UV_HANDLE_IPV6;
-    return uv__bind(loop,
-                    handle,
+    return uv__bind(handle,
                     AF_INET6,
                     (struct sockaddr*)&addr,
                     sizeof(struct sockaddr_in6));
 
   } else {
-    uv__set_sys_error(loop, WSAEAFNOSUPPORT);
+    uv__set_sys_error(handle->loop, WSAEAFNOSUPPORT);
     return -1;
   }
 }
diff --git a/src/win/udp.c b/src/win/udp.c
index dc641bc8..815b8b38 100644
--- a/src/win/udp.c
+++ b/src/win/udp.c
@@ -139,27 +139,29 @@ void uv_udp_endgame(uv_loop_t* loop, uv_udp_t* handle) {
 }
 
 
-static int uv__bind(uv_udp_t* handle, int domain, struct sockaddr* addr,
-    int addrsize, unsigned int flags) {
-  uv_loop_t* loop = handle->loop;
+static int uv__bind(uv_udp_t* handle,
+                    int domain,
+                    struct sockaddr* addr,
+                    int addrsize,
+                    unsigned int flags) {
   DWORD err;
   int r;
   SOCKET sock;
 
   if ((flags & UV_UDP_IPV6ONLY) && domain != AF_INET6) {
     /* UV_UDP_IPV6ONLY is supported only for IPV6 sockets */
-    uv__set_artificial_error(loop, UV_EINVAL);
+    uv__set_artificial_error(handle->loop, UV_EINVAL);
     return -1;
   }
 
   if (handle->socket == INVALID_SOCKET) {
     sock = socket(domain, SOCK_DGRAM, 0);
     if (sock == INVALID_SOCKET) {
-      uv__set_sys_error(loop, WSAGetLastError());
+      uv__set_sys_error(handle->loop, WSAGetLastError());
       return -1;
     }
 
-    if (uv_udp_set_socket(loop, handle, sock) == -1) {
+    if (uv_udp_set_socket(handle->loop, handle, sock) == -1) {
       closesocket(sock);
       return -1;
     }
@@ -184,7 +186,7 @@ static int uv__bind(uv_udp_t* handle, int domain, struct sockaddr* addr,
 
   if (r == SOCKET_ERROR) {
     err = WSAGetLastError();
-    uv__set_sys_error(loop, WSAGetLastError());
+    uv__set_sys_error(handle->loop, WSAGetLastError());
     return -1;
   }
 
@@ -194,15 +196,8 @@ static int uv__bind(uv_udp_t* handle, int domain, struct sockaddr* addr,
 }
 
 
-int uv_udp_bind(uv_udp_t* handle, struct sockaddr_in addr,
+int uv__udp_bind(uv_udp_t* handle, struct sockaddr_in addr,
     unsigned int flags) {
-  uv_loop_t* loop = handle->loop;
-
-  if (handle->type != UV_UDP || addr.sin_family != AF_INET) {
-    uv__set_sys_error(loop, WSAEFAULT);
-    return -1;
-  }
-
   return uv__bind(handle,
                   AF_INET,
                   (struct sockaddr*) &addr,
@@ -211,15 +206,8 @@ int uv_udp_bind(uv_udp_t* handle, struct sockaddr_in addr,
 }
 
 
-int uv_udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr,
+int uv__udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr,
     unsigned int flags) {
-  uv_loop_t* loop = handle->loop;
-
-  if (handle->type != UV_UDP || addr.sin6_family != AF_INET6) {
-    uv__set_sys_error(loop, WSAEFAULT);
-    return -1;
-  }
-
   if (uv_allow_ipv6) {
     handle->flags |= UV_HANDLE_IPV6;
     return uv__bind(handle,
@@ -228,7 +216,7 @@ int uv_udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr,
                     sizeof(struct sockaddr_in6),
                     flags);
   } else {
-    uv__set_sys_error(loop, WSAEAFNOSUPPORT);
+    uv__set_sys_error(handle->loop, WSAEAFNOSUPPORT);
     return -1;
   }
 }