diff --git a/reactos/include/winsock2.h b/reactos/include/winsock2.h
index 8fbb9347ec2..759f12bb724 100644
--- a/reactos/include/winsock2.h
+++ b/reactos/include/winsock2.h
@@ -10,7 +10,14 @@
 #ifndef __WINSOCK2_H
 #define __WINSOCK2_H
 
+#ifdef __USE_W32API
+
+#include_next <winsock2.h>
+
+#else /* __USE_W32API */
+
 #include <windows.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -1824,6 +1831,8 @@ WSARecvEx(SOCKET s,LPSTR buf,INT len,LPINT flags);
 };
 #endif /* __cplusplus */
 
+#endif /* !__USE_W32API */
+
 #endif /* __WINSOCK2_H */
 
 /* EOF */
diff --git a/reactos/include/wsahelp.h b/reactos/include/wsahelp.h
index 188a43031a5..e1e1b4d4297 100644
--- a/reactos/include/wsahelp.h
+++ b/reactos/include/wsahelp.h
@@ -8,7 +8,6 @@
 #ifndef __WSAHELP_H
 #define __WSAHELP_H
 
-#include <stddef.h>
 #include <winsock2.h>
 
 #ifdef __cplusplus
diff --git a/reactos/lib/packet/include/packet32.h b/reactos/lib/packet/include/packet32.h
index 004a1c9aa46..862cc372555 100644
--- a/reactos/lib/packet/include/packet32.h
+++ b/reactos/lib/packet/include/packet32.h
@@ -33,7 +33,6 @@
 #ifndef __PACKET32
 #define __PACKET32
 
-#include <stddef.h>
 #include <winsock2.h>
 
 // Working modes