diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp
index a30acaf9..ba24649f 100644
--- a/src/net/common/clientstate.cpp
+++ b/src/net/common/clientstate.cpp
@@ -22,6 +22,7 @@
 #include <net/clientdata.h>
 #include <net/resolverthread.h>
 #include <net/clientexception.h>
+#include <net/socket_helper.h>
 #include <net/socket_msg.h>
 
 #include <stdexcept>
@@ -319,7 +320,7 @@ ClientStateFinal::~ClientStateFinal()
 int
 ClientStateFinal::Process(ClientThread &client)
 {
-	Thread::Msleep(10);
+	Thread::Msleep(CLIENT_WAIT_TIMEOUT_MSEC;
 
 	return MSG_SOCK_INTERNAL_PENDING;
 }
diff --git a/src/net/socket_helper.h b/src/net/socket_helper.h
index 97cdd720..742e83d5 100644
--- a/src/net/socket_helper.h
+++ b/src/net/socket_helper.h
@@ -32,6 +32,11 @@
 #define IOCTLSOCKET				ioctlsocket
 #define SOCKET_ERRNO()			WSAGetLastError()
 #define SOCKET_ERR_WOULDBLOCK	WSAEWOULDBLOCK
+
+typedef unsigned __int16		u_int16_t;
+typedef unsigned __int32		u_int32_t;
+typedef unsigned char			u_char;
+
 #else
 #define SOCKET					int
 #define SOCKET_ERROR			-1