diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 933aff9a99c..6324fc742e0 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -33,6 +33,8 @@
 WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
+#define TIMEOUT_INFINITE _I64_MAX
+
 const struct unix_funcs *unix_funcs = NULL;
 
 static const WSAPROTOCOL_INFOW supported_protocols[] =
@@ -718,7 +720,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len )
 {
     IO_STATUS_BLOCK io;
     NTSTATUS status;
-    obj_handle_t accept_handle;
+    ULONG accept_handle;
     HANDLE sync_event;
     SOCKET ret;
 
@@ -740,7 +742,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len )
         return INVALID_SOCKET;
     }
 
-    ret = HANDLE2SOCKET(wine_server_ptr_handle( accept_handle ));
+    ret = accept_handle;
     if (!socket_list_add( ret ))
     {
         CloseHandle( SOCKET2HANDLE(ret) );
@@ -3138,8 +3140,8 @@ int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask )
 
     TRACE( "socket %#lx, window %p, message %#x, mask %#x\n", s, window, message, mask );
 
-    params.handle = wine_server_obj_handle( (HANDLE)s );
-    params.window = wine_server_user_handle( window );
+    params.handle = s;
+    params.window = HandleToULong( window );
     params.message = message;
     params.mask = afd_poll_flag_from_win32( mask );
 
@@ -3500,7 +3502,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen,
 
     case CF_DEFER:
     {
-        obj_handle_t server_handle = cs;
+        ULONG server_handle = cs;
         IO_STATUS_BLOCK io;
         NTSTATUS status;
 
diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h
index 6c04785b258..f417c8975f4 100644
--- a/dlls/ws2_32/ws2_32_private.h
+++ b/dlls/ws2_32/ws2_32_private.h
@@ -48,7 +48,6 @@
 #include "iphlpapi.h"
 #include "ip2string.h"
 #include "wine/afd.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 #include "wine/exception.h"
 #include "wine/heap.h"
diff --git a/include/wine/afd.h b/include/wine/afd.h
index caa86eabf83..3936dbd87b1 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -24,7 +24,6 @@
 #include <winternl.h>
 #include <winioctl.h>
 #include <mswsock.h>
-#include "wine/server_protocol.h"
 
 #ifdef USE_WS_PREFIX
 # define WS(x)    WS_##x
@@ -241,7 +240,7 @@ struct afd_create_params
 
 struct afd_accept_into_params
 {
-    obj_handle_t accept_handle;
+    ULONG accept_handle;
     unsigned int recv_len, local_len;
 };
 
@@ -286,8 +285,8 @@ struct afd_transmit_params
 
 struct afd_message_select_params
 {
-    obj_handle_t handle;
-    user_handle_t window;
+    ULONG handle;
+    ULONG window;
     unsigned int message;
     int mask;
 };