From 88daaeca464b22a0ac97fba33389cc299ccbff2a Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 26 Jan 2014 19:57:03 +0000
Subject: [PATCH] [WS2HELP] * Remove one time inclusions from the main header
 and put them back where they belong. CORE-7716

svn path=/trunk/; revision=61840
---
 reactos/dll/win32/ws2help/context.c |  2 ++
 reactos/dll/win32/ws2help/handle.c  |  4 ++++
 reactos/dll/win32/ws2help/precomp.h | 13 ++++---------
 reactos/dll/win32/ws2help/wshdrv.h  |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/reactos/dll/win32/ws2help/context.c b/reactos/dll/win32/ws2help/context.c
index 7e4037fc0e9..876446e344d 100644
--- a/reactos/dll/win32/ws2help/context.c
+++ b/reactos/dll/win32/ws2help/context.c
@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <ws2help.h>
+
 /* DATA **********************************************************************/
 
 CRITICAL_SECTION WshHandleTableLock;
diff --git a/reactos/dll/win32/ws2help/handle.c b/reactos/dll/win32/ws2help/handle.c
index e34de902760..3064bd4e481 100644
--- a/reactos/dll/win32/ws2help/handle.c
+++ b/reactos/dll/win32/ws2help/handle.c
@@ -9,6 +9,10 @@
 
 #include "precomp.h"
 
+#include <ndk/iofuncs.h>
+
+#include "wshdrv.h"
+
 /* DATA **********************************************************************/
 
 typedef struct _WSH_HELPER_CONTEXT
diff --git a/reactos/dll/win32/ws2help/precomp.h b/reactos/dll/win32/ws2help/precomp.h
index d1b8d3a9e59..394a71a009e 100644
--- a/reactos/dll/win32/ws2help/precomp.h
+++ b/reactos/dll/win32/ws2help/precomp.h
@@ -4,6 +4,7 @@
  * FILE:        lib/ws2help/precomp.h
  * PURPOSE:     WinSock 2 Helper DLL
  */
+
 #ifndef __PRECOMP_H
 #define __PRECOMP_H
 
@@ -16,6 +17,7 @@
 #define INCL_WINSOCK_API_TYPEDEFS 1
 
 #include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
@@ -23,12 +25,7 @@
 #include <ws2spi.h>
 
 /* NDK Headers */
-#include <rtlfuncs.h>
-#include <iofuncs.h>
-
-/* Shared Winsock Helper headers */
-#include <ws2help.h>
-#include "wshdrv.h"
+#include <ndk/rtlfuncs.h>
 
 /* Missing definition */
 #define SO_OPENTYPE 0x20
@@ -50,6 +47,4 @@ Ws2helpInitialize(VOID);
 #define WS2HELP_PROLOG() \
     (Ws2helpInitialized? ERROR_SUCCESS : Ws2helpInitialize())
 
-#endif /* __WS2HELP_H */
-
-/* EOF */
+#endif /* __PRECOMP_H */
diff --git a/reactos/dll/win32/ws2help/wshdrv.h b/reactos/dll/win32/ws2help/wshdrv.h
index ad983fc3410..44b67721204 100644
--- a/reactos/dll/win32/ws2help/wshdrv.h
+++ b/reactos/dll/win32/ws2help/wshdrv.h
@@ -25,4 +25,4 @@ typedef struct _WAH_EA_DATA2
 
 #define IOCTL_WS2IFSL_SET_HANDLE 0x12B00
 
-#endif
+#endif /* __WSHDRV_H */