diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
index 008eef1b5a3..90e50c6b17e 100644
--- a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
+++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
@@ -23,11 +23,8 @@
 #include <winreg.h>
 #include <winnls.h>
 #include <winuser.h>
-#include <ws2tcpip.h>
 #include <ws2spi.h>
-//#include <ndk/umtypes.h>
 #include <ndk/rtlfuncs.h>
-//#include <svcguid.h>
 
 /* Winsock Helper Header */
 #include <ws2help.h>
diff --git a/reactos/dll/win32/ws2_32_new/src/addrconv.c b/reactos/dll/win32/ws2_32_new/src/addrconv.c
index 4e6d269edfc..7e111a10453 100644
--- a/reactos/dll/win32/ws2_32_new/src/addrconv.c
+++ b/reactos/dll/win32/ws2_32_new/src/addrconv.c
@@ -7,11 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
-     
+
 /* DEFINES *******************************************************************/
 
 #ifndef BE
diff --git a/reactos/dll/win32/ws2_32_new/src/addrinfo.c b/reactos/dll/win32/ws2_32_new/src/addrinfo.c
index 8e0b3aa3505..1ee48fbd849 100644
--- a/reactos/dll/win32/ws2_32_new/src/addrinfo.c
+++ b/reactos/dll/win32/ws2_32_new/src/addrinfo.c
@@ -7,8 +7,11 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
+#include <ws2tcpip.h>
+
 //#define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/dll/win32/ws2_32_new/src/async.c b/reactos/dll/win32/ws2_32_new/src/async.c
index dff4f40c446..9aa9742c049 100644
--- a/reactos/dll/win32/ws2_32_new/src/async.c
+++ b/reactos/dll/win32/ws2_32_new/src/async.c
@@ -7,9 +7,11 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* DATA **********************************************************************/
+
 BOOLEAN WsAsyncThreadInitialized;
 LONG WsAsyncTaskHandle;
 PLIST_ENTRY WsAsyncQueue;
diff --git a/reactos/dll/win32/ws2_32_new/src/bhook.c b/reactos/dll/win32/ws2_32_new/src/bhook.c
index eeaf740610d..9e0458de855 100644
--- a/reactos/dll/win32/ws2_32_new/src/bhook.c
+++ b/reactos/dll/win32/ws2_32_new/src/bhook.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/dcatalog.c b/reactos/dll/win32/ws2_32_new/src/dcatalog.c
index 4722958ddec..d163a139f56 100644
--- a/reactos/dll/win32/ws2_32_new/src/dcatalog.c
+++ b/reactos/dll/win32/ws2_32_new/src/dcatalog.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* DATA **********************************************************************/
diff --git a/reactos/dll/win32/ws2_32_new/src/dcatitem.c b/reactos/dll/win32/ws2_32_new/src/dcatitem.c
index eca447016ee..c85e0a6004d 100644
--- a/reactos/dll/win32/ws2_32_new/src/dcatitem.c
+++ b/reactos/dll/win32/ws2_32_new/src/dcatitem.c
@@ -7,9 +7,8 @@
  */
 
 /* INCLUDES ******************************************************************/
-#include <ws2_32.h>
 
-/* DATA **********************************************************************/
+#include <ws2_32.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/dll/win32/ws2_32_new/src/dllmain.c b/reactos/dll/win32/ws2_32_new/src/dllmain.c
index 369d88f9c0c..884b4fb0fe3 100644
--- a/reactos/dll/win32/ws2_32_new/src/dllmain.c
+++ b/reactos/dll/win32/ws2_32_new/src/dllmain.c
@@ -13,6 +13,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* DATA **********************************************************************/
diff --git a/reactos/dll/win32/ws2_32_new/src/dprocess.c b/reactos/dll/win32/ws2_32_new/src/dprocess.c
index 745db5e8137..06b9fac7a08 100644
--- a/reactos/dll/win32/ws2_32_new/src/dprocess.c
+++ b/reactos/dll/win32/ws2_32_new/src/dprocess.c
@@ -7,9 +7,11 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* DATA **********************************************************************/
+
 PWSPROCESS CurrentWsProcess;
 
 #define WsProcLock()      EnterCriticalSection((LPCRITICAL_SECTION)&Process->ThreadLock);
diff --git a/reactos/dll/win32/ws2_32_new/src/dprovide.c b/reactos/dll/win32/ws2_32_new/src/dprovide.c
index ae64aaf59aa..729d7bf2e77 100644
--- a/reactos/dll/win32/ws2_32_new/src/dprovide.c
+++ b/reactos/dll/win32/ws2_32_new/src/dprovide.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/dll/win32/ws2_32_new/src/dsocket.c b/reactos/dll/win32/ws2_32_new/src/dsocket.c
index d8418d0257d..04dabe7211a 100644
--- a/reactos/dll/win32/ws2_32_new/src/dsocket.c
+++ b/reactos/dll/win32/ws2_32_new/src/dsocket.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* DATA **********************************************************************/
diff --git a/reactos/dll/win32/ws2_32_new/src/dthread.c b/reactos/dll/win32/ws2_32_new/src/dthread.c
index 62718c0c604..5e8a3bc53aa 100644
--- a/reactos/dll/win32/ws2_32_new/src/dthread.c
+++ b/reactos/dll/win32/ws2_32_new/src/dthread.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/dll/win32/ws2_32_new/src/dupsock.c b/reactos/dll/win32/ws2_32_new/src/dupsock.c
index c22f44bec1a..3f59f172c6a 100644
--- a/reactos/dll/win32/ws2_32_new/src/dupsock.c
+++ b/reactos/dll/win32/ws2_32_new/src/dupsock.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/enumprot.c b/reactos/dll/win32/ws2_32_new/src/enumprot.c
index 88fffba422f..a2584e5074d 100644
--- a/reactos/dll/win32/ws2_32_new/src/enumprot.c
+++ b/reactos/dll/win32/ws2_32_new/src/enumprot.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 BOOL
diff --git a/reactos/dll/win32/ws2_32_new/src/event.c b/reactos/dll/win32/ws2_32_new/src/event.c
index 6b96bfbe220..46a1fc1a40a 100644
--- a/reactos/dll/win32/ws2_32_new/src/event.c
+++ b/reactos/dll/win32/ws2_32_new/src/event.c
@@ -7,11 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
-                   
+
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/getproto.c b/reactos/dll/win32/ws2_32_new/src/getproto.c
index ed21acbd122..48b41c144ce 100644
--- a/reactos/dll/win32/ws2_32_new/src/getproto.c
+++ b/reactos/dll/win32/ws2_32_new/src/getproto.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 HANDLE
diff --git a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c
index dcf9bac73fc..32557b8315e 100644
--- a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c
+++ b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
diff --git a/reactos/dll/win32/ws2_32_new/src/ioctl.c b/reactos/dll/win32/ws2_32_new/src/ioctl.c
index 8399feed442..1c2be2d5035 100644
--- a/reactos/dll/win32/ws2_32_new/src/ioctl.c
+++ b/reactos/dll/win32/ws2_32_new/src/ioctl.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/nscatalo.c b/reactos/dll/win32/ws2_32_new/src/nscatalo.c
index ce82efb530d..769d0260c36 100644
--- a/reactos/dll/win32/ws2_32_new/src/nscatalo.c
+++ b/reactos/dll/win32/ws2_32_new/src/nscatalo.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* DATA **********************************************************************/
diff --git a/reactos/dll/win32/ws2_32_new/src/nscatent.c b/reactos/dll/win32/ws2_32_new/src/nscatent.c
index ebb74a18758..8c1b0750fc0 100644
--- a/reactos/dll/win32/ws2_32_new/src/nscatent.c
+++ b/reactos/dll/win32/ws2_32_new/src/nscatent.c
@@ -7,9 +7,8 @@
  */
 
 /* INCLUDES ******************************************************************/
-#include <ws2_32.h>
 
-/* DATA **********************************************************************/
+#include <ws2_32.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/dll/win32/ws2_32_new/src/nspinstl.c b/reactos/dll/win32/ws2_32_new/src/nspinstl.c
index ef75f7c4316..846dde6c926 100644
--- a/reactos/dll/win32/ws2_32_new/src/nspinstl.c
+++ b/reactos/dll/win32/ws2_32_new/src/nspinstl.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/nsprovid.c b/reactos/dll/win32/ws2_32_new/src/nsprovid.c
index 2d5ef48a32d..6a4762b1e5e 100644
--- a/reactos/dll/win32/ws2_32_new/src/nsprovid.c
+++ b/reactos/dll/win32/ws2_32_new/src/nsprovid.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/dll/win32/ws2_32_new/src/nsquery.c b/reactos/dll/win32/ws2_32_new/src/nsquery.c
index 788fa29e4b6..3c7811d1ce0 100644
--- a/reactos/dll/win32/ws2_32_new/src/nsquery.c
+++ b/reactos/dll/win32/ws2_32_new/src/nsquery.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 /* DATA **********************************************************************/
diff --git a/reactos/dll/win32/ws2_32_new/src/qos.c b/reactos/dll/win32/ws2_32_new/src/qos.c
index 24a28f53304..29866a6fdd1 100644
--- a/reactos/dll/win32/ws2_32_new/src/qos.c
+++ b/reactos/dll/win32/ws2_32_new/src/qos.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/qshelpr.c b/reactos/dll/win32/ws2_32_new/src/qshelpr.c
index 07292c7ce70..35e36ddb792 100644
--- a/reactos/dll/win32/ws2_32_new/src/qshelpr.c
+++ b/reactos/dll/win32/ws2_32_new/src/qshelpr.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 LPSTR
diff --git a/reactos/dll/win32/ws2_32_new/src/rasdial.c b/reactos/dll/win32/ws2_32_new/src/rasdial.c
index c856e6f6f3f..b664db70c90 100644
--- a/reactos/dll/win32/ws2_32_new/src/rasdial.c
+++ b/reactos/dll/win32/ws2_32_new/src/rasdial.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
diff --git a/reactos/dll/win32/ws2_32_new/src/recv.c b/reactos/dll/win32/ws2_32_new/src/recv.c
index 9c4467b3dfb..013c5755ba2 100644
--- a/reactos/dll/win32/ws2_32_new/src/recv.c
+++ b/reactos/dll/win32/ws2_32_new/src/recv.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/rnr.c b/reactos/dll/win32/ws2_32_new/src/rnr.c
index 9a8c081fe6c..228858fd0ac 100644
--- a/reactos/dll/win32/ws2_32_new/src/rnr.c
+++ b/reactos/dll/win32/ws2_32_new/src/rnr.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/scihlpr.c b/reactos/dll/win32/ws2_32_new/src/scihlpr.c
index f16f1108726..244d77733c5 100644
--- a/reactos/dll/win32/ws2_32_new/src/scihlpr.c
+++ b/reactos/dll/win32/ws2_32_new/src/scihlpr.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
diff --git a/reactos/dll/win32/ws2_32_new/src/select.c b/reactos/dll/win32/ws2_32_new/src/select.c
index 54c8128994c..be389c7987d 100644
--- a/reactos/dll/win32/ws2_32_new/src/select.c
+++ b/reactos/dll/win32/ws2_32_new/src/select.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/send.c b/reactos/dll/win32/ws2_32_new/src/send.c
index f4a32c79776..52d3d122d98 100644
--- a/reactos/dll/win32/ws2_32_new/src/send.c
+++ b/reactos/dll/win32/ws2_32_new/src/send.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/sockctrl.c b/reactos/dll/win32/ws2_32_new/src/sockctrl.c
index 76441a9bd8d..9f81cca7e1d 100644
--- a/reactos/dll/win32/ws2_32_new/src/sockctrl.c
+++ b/reactos/dll/win32/ws2_32_new/src/sockctrl.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/socklife.c b/reactos/dll/win32/ws2_32_new/src/socklife.c
index c393a6cd661..999d334d550 100644
--- a/reactos/dll/win32/ws2_32_new/src/socklife.c
+++ b/reactos/dll/win32/ws2_32_new/src/socklife.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/spinstal.c b/reactos/dll/win32/ws2_32_new/src/spinstal.c
index d0cfb6d2d55..ed593ff25bd 100644
--- a/reactos/dll/win32/ws2_32_new/src/spinstal.c
+++ b/reactos/dll/win32/ws2_32_new/src/spinstal.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/sputil.c b/reactos/dll/win32/ws2_32_new/src/sputil.c
index 7f840183234..82cb4368151 100644
--- a/reactos/dll/win32/ws2_32_new/src/sputil.c
+++ b/reactos/dll/win32/ws2_32_new/src/sputil.c
@@ -7,13 +7,12 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/ws2_32_new/src/startup.c b/reactos/dll/win32/ws2_32_new/src/startup.c
index 5aa72f769f3..32de9484c1b 100644
--- a/reactos/dll/win32/ws2_32_new/src/startup.c
+++ b/reactos/dll/win32/ws2_32_new/src/startup.c
@@ -7,6 +7,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include <ws2_32.h>
 
 //#define NDEBUG
diff --git a/reactos/dll/win32/ws2_32_new/src/wsautil.c b/reactos/dll/win32/ws2_32_new/src/wsautil.c
index e2d14c0be0d..4d7b1ebdbc8 100644
--- a/reactos/dll/win32/ws2_32_new/src/wsautil.c
+++ b/reactos/dll/win32/ws2_32_new/src/wsautil.c
@@ -7,9 +7,8 @@
  */
 
 /* INCLUDES ******************************************************************/
-#include <ws2_32.h>
 
-/* DATA **********************************************************************/
+#include <ws2_32.h>
 
 /* FUNCTIONS *****************************************************************/