diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api
index 20bea757f70..854ef32564b 100644
--- a/tools/winapi/win16.api
+++ b/tools/winapi/win16.api
@@ -1484,7 +1484,7 @@ HWND16
 BOOL
 INT
 LONG
-u_long
+WS_u_long
 
 %ptr
 
@@ -1520,7 +1520,7 @@ HWND16
 INT16
 SOCKET16
 UINT16
-u_short
+WS_u_short
 
 %%wintab.dll
 
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index ee615dd2c3a..f7d9236803e 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -5589,6 +5589,10 @@ void
 
 %%ws2_32.dll
 
+%short
+
+WS_u_short
+
 %long
 
 BOOL
@@ -5600,13 +5604,12 @@ INT
 SOCKET
 UINT
 WORD
+WS_socklen_t
+WS_u_long
 WSAESETSERVICEOP
 WSAEVENT
 int
 long
-socklen_t
-u_long
-u_short
 
 %ptr
 
@@ -5638,6 +5641,8 @@ LPWSASERVICECLASSINFOW
 PADDRINFOW *
 SOCKADDR *
 WS_fd_set *
+WS_u_long *
+WS_u_short *
 int *
 struct WS_addrinfo *
 struct WS_addrinfo **
@@ -5646,8 +5651,6 @@ struct WS_protoent *
 struct WS_servent *
 struct WS_sockaddr *
 struct WS_timeval *
-u_long *
-u_short *
 
 %str