diff --git a/reactos/dll/win32/ws2_32/include/ws2_32.h b/reactos/dll/win32/ws2_32/include/ws2_32.h
index 7272a14098a..f21f7677274 100644
--- a/reactos/dll/win32/ws2_32/include/ws2_32.h
+++ b/reactos/dll/win32/ws2_32/include/ws2_32.h
@@ -7,6 +7,7 @@
 #ifndef __WS2_32_H
 #define __WS2_32_H
 
+#include <ctype.h>
 #include <stdlib.h>
 
 #define WIN32_NO_STATUS
@@ -23,6 +24,12 @@
 #include <debug.h>
 #include <windns.h> // DNS_A_DATA
 
+#include <w32api.h>
+
+#include "catalog.h"
+#include "handle.h"
+#include "upcall.h"
+
 #define EXPORT WINAPI
 
 extern HINSTANCE g_hInstDll;
diff --git a/reactos/dll/win32/ws2_32/misc/bsd.c b/reactos/dll/win32/ws2_32/misc/bsd.c
index 2e39c24b5e9..80cbef22911 100644
--- a/reactos/dll/win32/ws2_32/misc/bsd.c
+++ b/reactos/dll/win32/ws2_32/misc/bsd.c
@@ -7,7 +7,8 @@
  * REVISIONS:
  *   CSH 15/06-2001 Created
  */
-#include <ws2_32.h>
+
+#include "ws2_32.h"
 
 /*
  * @implemented
diff --git a/reactos/dll/win32/ws2_32/misc/catalog.c b/reactos/dll/win32/ws2_32/misc/catalog.c
index 53de8b5e970..987dc56887c 100644
--- a/reactos/dll/win32/ws2_32/misc/catalog.c
+++ b/reactos/dll/win32/ws2_32/misc/catalog.c
@@ -7,9 +7,8 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#include <ws2_32.h>
-#include <catalog.h>
 
+#include "ws2_32.h"
 
 LIST_ENTRY CatalogListHead;
 CRITICAL_SECTION CatalogLock;
diff --git a/reactos/dll/win32/ws2_32/misc/dllmain.c b/reactos/dll/win32/ws2_32/misc/dllmain.c
index 6eeb37efcac..bb365e06b0f 100644
--- a/reactos/dll/win32/ws2_32/misc/dllmain.c
+++ b/reactos/dll/win32/ws2_32/misc/dllmain.c
@@ -8,11 +8,7 @@
  *   CSH 01/09-2000 Created
  */
 
-#include <w32api.h>
-#include <ws2_32.h>
-#include <catalog.h>
-#include <handle.h>
-#include <upcall.h>
+#include "ws2_32.h"
 
 #if DBG
 
diff --git a/reactos/dll/win32/ws2_32/misc/event.c b/reactos/dll/win32/ws2_32/misc/event.c
index dcc541682d1..58d4e647243 100644
--- a/reactos/dll/win32/ws2_32/misc/event.c
+++ b/reactos/dll/win32/ws2_32/misc/event.c
@@ -7,9 +7,8 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#include <ws2_32.h>
-#include <handle.h>
 
+#include "ws2_32.h"
 
 /*
  * @implemented
diff --git a/reactos/dll/win32/ws2_32/misc/handle.c b/reactos/dll/win32/ws2_32/misc/handle.c
index d5b54e3fb28..f22b5e415f6 100644
--- a/reactos/dll/win32/ws2_32/misc/handle.c
+++ b/reactos/dll/win32/ws2_32/misc/handle.c
@@ -7,9 +7,8 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#include <ws2_32.h>
-#include <handle.h>
-#include <catalog.h>
+
+#include "ws2_32.h"
 
 PPROVIDER_HANDLE_BLOCK ProviderHandleTable;
 CRITICAL_SECTION ProviderHandleTableLock;
diff --git a/reactos/dll/win32/ws2_32/misc/ns.c b/reactos/dll/win32/ws2_32/misc/ns.c
index b98c628a0c4..6d765fd3580 100644
--- a/reactos/dll/win32/ws2_32/misc/ns.c
+++ b/reactos/dll/win32/ws2_32/misc/ns.c
@@ -7,9 +7,8 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#include <ctype.h>
-#include <ws2_32.h>
-#include <winbase.h>
+
+#include "ws2_32.h"
 
 #ifndef BUFSIZ
 #define BUFSIZ 1024
diff --git a/reactos/dll/win32/ws2_32/misc/sndrcv.c b/reactos/dll/win32/ws2_32/misc/sndrcv.c
index 8fb4186933e..0ee077d056a 100644
--- a/reactos/dll/win32/ws2_32/misc/sndrcv.c
+++ b/reactos/dll/win32/ws2_32/misc/sndrcv.c
@@ -8,11 +8,7 @@
  *   CSH 01/09-2000 Created
  */
 
-#include <w32api.h>
-#include <ws2_32.h>
-#include <catalog.h>
-#include <handle.h>
-
+#include "ws2_32.h"
 
 /*
  * @implemented
diff --git a/reactos/dll/win32/ws2_32/misc/stubs.c b/reactos/dll/win32/ws2_32/misc/stubs.c
index 10dd98e1ded..1d2b3f49d10 100644
--- a/reactos/dll/win32/ws2_32/misc/stubs.c
+++ b/reactos/dll/win32/ws2_32/misc/stubs.c
@@ -7,9 +7,8 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#include <ws2_32.h>
-#include <catalog.h>
-#include <handle.h>
+
+#include "ws2_32.h"
 
 /*
  * @implemented
diff --git a/reactos/dll/win32/ws2_32/misc/upcall.c b/reactos/dll/win32/ws2_32/misc/upcall.c
index ad0ce94963a..2bf92315926 100644
--- a/reactos/dll/win32/ws2_32/misc/upcall.c
+++ b/reactos/dll/win32/ws2_32/misc/upcall.c
@@ -7,9 +7,8 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#include <ws2_32.h>
-#include <catalog.h>
-#include <handle.h>
+
+#include "ws2_32.h"
 
 /*
  * @implemented