diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 1b4ed14f2..f3efb6b9d 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -67,8 +67,6 @@
 /*
  * error codes for inet_ntop/inet_pton 
  */
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-
 typedef SOCKET rk_socket_t;
 
 #define rk_closesocket(x) closesocket(x)
@@ -79,23 +77,6 @@ typedef SOCKET rk_socket_t;
 
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL rk_SOCK_IOCTL(SOCKET s, long cmd, int * argp);
 
-/* Microsoft VC 2010 POSIX definitions */
-#ifndef ENOTSOCK
-#define ENOTSOCK		128
-#endif
-#ifndef ENOTSUP
-#define ENOTSUP                 129
-#endif
-#ifndef EOVERFLOW
-#define EOVERFLOW               132
-#endif
-#ifndef ETIMEDOUT
-#define ETIMEDOUT               138
-#endif
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK             140
-#endif
-
 #define rk_SOCK_INIT() rk_WSAStartup()
 #define rk_SOCK_EXIT() rk_WSACleanup()
 
@@ -116,6 +97,26 @@ typedef int rk_socket_t;
 #define rk_SOCK_INIT() 0
 #define rk_SOCK_EXIT() do { } while(0)
 
+#endif  /* WinSock */
+
+/* Microsoft VC 2010 POSIX definitions */
+#ifndef EAFNOSUPPORT
+#define EAFNOSUPPORT            102
+#endif
+#ifndef ENOTSOCK
+#define ENOTSOCK		128
+#endif
+#ifndef ENOTSUP
+#define ENOTSUP                 129
+#endif
+#ifndef EOVERFLOW
+#define EOVERFLOW               132
+#endif
+#ifndef ETIMEDOUT
+#define ETIMEDOUT               138
+#endif
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK             140
 #endif
 
 #ifndef IN_LOOPBACKNET