diff --git a/librb/include/commio-int.h b/librb/include/commio-int.h
index f89f499fb..6a4bfb874 100644
--- a/librb/include/commio-int.h
+++ b/librb/include/commio-int.h
@@ -33,15 +33,6 @@
 
 #define FD_DESC_SZ 128		/* hostlen + comment */
 
-
-#ifdef _WIN32
-#define rb_get_errno() do { errno = WSAGetLastError(); WSASetLastError(errno); } while(0)
-typedef SOCKET rb_platform_fd_t;
-#else
-#define rb_get_errno()
-typedef int rb_platform_fd_t;
-#endif
-
 #define rb_hash_fd(x) ((x ^ (x >> RB_FD_HASH_BITS) ^ (x >> (RB_FD_HASH_BITS * 2))) & RB_FD_HASH_MASK)
 
 #ifdef HAVE_WRITEV
diff --git a/librb/include/rb_lib.h b/librb/include/rb_lib.h
index 75b3f1bc9..626fc78e8 100644
--- a/librb/include/rb_lib.h
+++ b/librb/include/rb_lib.h
@@ -66,7 +66,13 @@ char *alloca();
 #define rb_unlikely(x)	(x)
 #endif
 
-
+#ifdef _WIN32
+#define rb_get_errno() do { errno = WSAGetLastError(); WSASetLastError(errno); } while(0)
+typedef SOCKET rb_platform_fd_t;
+#else
+#define rb_get_errno()
+typedef int rb_platform_fd_t;
+#endif
 
 #ifdef _WIN32
 #include <process.h>