diff --git a/reactos/dll/win32/ws2_32/include/catalog.h b/reactos/dll/win32/ws2_32/include/catalog.h
index f36513e3a86..19ed0d25e3e 100644
--- a/reactos/dll/win32/ws2_32/include/catalog.h
+++ b/reactos/dll/win32/ws2_32/include/catalog.h
@@ -4,6 +4,7 @@
  * FILE:        include/catalog.h
  * PURPOSE:     Service Provider Catalog definitions
  */
+
 #ifndef __CATALOG_H
 #define __CATALOG_H
 
@@ -54,5 +55,3 @@ VOID CreateCatalog(VOID);
 VOID DestroyCatalog(VOID);
 
 #endif /* __CATALOG_H */
-
-/* EOF */
diff --git a/reactos/dll/win32/ws2_32/include/debug.h b/reactos/dll/win32/ws2_32/include/debug.h
index 369aa289d94..aa6d9704fac 100644
--- a/reactos/dll/win32/ws2_32/include/debug.h
+++ b/reactos/dll/win32/ws2_32/include/debug.h
@@ -6,6 +6,7 @@
  * DEFINES:     DBG     - Enable debug output
  *              NASSERT - Disable assertions
  */
+
 #ifndef __DEBUG_H
 #define __DEBUG_H
 
@@ -62,5 +63,3 @@ extern DWORD DebugTraceLevel;
 #define CP CHECKPOINT
 
 #endif /* __DEBUG_H */
-
-/* EOF */
diff --git a/reactos/dll/win32/ws2_32/include/handle.h b/reactos/dll/win32/ws2_32/include/handle.h
index 28818d7d862..52ed0d160cb 100644
--- a/reactos/dll/win32/ws2_32/include/handle.h
+++ b/reactos/dll/win32/ws2_32/include/handle.h
@@ -4,11 +4,10 @@
  * FILE:        include/handle.h
  * PURPOSE:     Provider handle definitions
  */
+
 #ifndef __HANDLE_H
 #define __HANDLE_H
 
-//#include <catalog.h>
-
 typedef struct _PROVIDER_HANDLE
 {
     HANDLE Handle;
@@ -44,5 +43,3 @@ VOID
 FreeProviderHandleTable(VOID);
 
 #endif /* __HANDLE_H */
-
-/* EOF */
diff --git a/reactos/dll/win32/ws2_32/include/upcall.h b/reactos/dll/win32/ws2_32/include/upcall.h
index 25404f4b9e5..ede3051ec79 100644
--- a/reactos/dll/win32/ws2_32/include/upcall.h
+++ b/reactos/dll/win32/ws2_32/include/upcall.h
@@ -4,6 +4,7 @@
  * FILE:        include/upcall.h
  * PURPOSE:     Upcall function defintions
  */
+
 #ifndef __UPCALL_H
 #define __UPCALL_H
 
@@ -100,5 +101,3 @@ WPUSetEvent(
     OUT LPINT lpErrno);
 
 #endif /* __UPCALL_H */
-
-/* EOF */
diff --git a/reactos/dll/win32/ws2_32/include/ws2_32.h b/reactos/dll/win32/ws2_32/include/ws2_32.h
index 43edf3079ff..149a0e852f9 100644
--- a/reactos/dll/win32/ws2_32/include/ws2_32.h
+++ b/reactos/dll/win32/ws2_32/include/ws2_32.h
@@ -4,22 +4,20 @@
  * FILE:        include/ws2_32.h
  * PURPOSE:     WinSock 2 DLL header
  */
+
 #ifndef __WS2_32_H
 #define __WS2_32_H
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <stdarg.h>
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include <winnls.h>
 #include <winuser.h>
 #include <ws2spi.h>
-#include <ws2tcpip.h>
 #define NTOS_MODE_USER
 #include <ndk/rtlfuncs.h>
 
@@ -31,7 +29,6 @@
 
 #include "catalog.h"
 #include "handle.h"
-//#include "upcall.h"
 
 #define EXPORT WINAPI
 
@@ -129,5 +126,3 @@ void free_servent(struct servent* s);
 #endif /* LE */
 
 #endif /* __WS2_32_H */
-
-/* EOF */
diff --git a/reactos/dll/win32/ws2_32/misc/async.c b/reactos/dll/win32/ws2_32/misc/async.c
index 6a37cb81c68..40fa6356f24 100644
--- a/reactos/dll/win32/ws2_32/misc/async.c
+++ b/reactos/dll/win32/ws2_32/misc/async.c
@@ -39,15 +39,12 @@
 #define COM_NO_WINDOWS_H
 
 #include <wine/config.h>
-//#include "wine/port.h"
 
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
-//#include "wingdi.h"
 #include <winuser.h>
 #include <winsock2.h>
-//#include "ws2spi.h"
 
 #include <wine/debug.h>
 
diff --git a/reactos/dll/win32/ws2_32/misc/ns.c b/reactos/dll/win32/ws2_32/misc/ns.c
index 3fbcc871c4c..7d18341d21f 100644
--- a/reactos/dll/win32/ws2_32/misc/ns.c
+++ b/reactos/dll/win32/ws2_32/misc/ns.c
@@ -10,6 +10,10 @@
 
 #include "ws2_32.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <winnls.h>
+
 #ifndef BUFSIZ
 #define BUFSIZ 1024
 #endif/*BUFSIZ*/
diff --git a/reactos/dll/win32/ws2_32/misc/stubs.c b/reactos/dll/win32/ws2_32/misc/stubs.c
index 1d2b3f49d10..de16a1c2125 100644
--- a/reactos/dll/win32/ws2_32/misc/stubs.c
+++ b/reactos/dll/win32/ws2_32/misc/stubs.c
@@ -10,6 +10,8 @@
 
 #include "ws2_32.h"
 
+#include <ws2tcpip.h>
+
 /*
  * @implemented
  */