From b41d73f8351223fe8c544ce4dbb5503a231b2009 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 25 Jan 2014 10:45:26 +0000
Subject: [PATCH] [NETCFGX] * Remove one time inclusions from the main header
 and put them back where they belong. CORE-7716

svn path=/trunk/; revision=61798
---
 reactos/dll/win32/netcfgx/netcfgx.c          |  6 ++++
 reactos/dll/win32/netcfgx/precomp.h          | 30 +++++++-------------
 reactos/dll/win32/netcfgx/tcpipconf_notify.c |  6 ++++
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/reactos/dll/win32/netcfgx/netcfgx.c b/reactos/dll/win32/netcfgx/netcfgx.c
index dfe665be705..3ae083a5b26 100644
--- a/reactos/dll/win32/netcfgx/netcfgx.c
+++ b/reactos/dll/win32/netcfgx/netcfgx.c
@@ -9,6 +9,12 @@
 
 #include "precomp.h"
 
+#include <olectl.h>
+
+#define NTOS_MODE_USER
+#include <ndk/iofuncs.h>
+#include <ndk/rtlfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/dll/win32/netcfgx/precomp.h b/reactos/dll/win32/netcfgx/precomp.h
index a5000fd6b4e..22e86236a90 100644
--- a/reactos/dll/win32/netcfgx/precomp.h
+++ b/reactos/dll/win32/netcfgx/precomp.h
@@ -1,37 +1,27 @@
 #ifndef _PRECOMP_H__
 #define _PRECOMP_H__
 
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#include <stdarg.h>
 #include <windef.h>
-#include <winreg.h>
 #include <winbase.h>
-#include <winnls.h>
+#include <winreg.h>
 #include <objbase.h>
-#include <winsock2.h>
-#define NTOS_MODE_USER
-#include <ndk/iofuncs.h>
-#include <ndk/rtlfuncs.h>
 #include <netcfgx.h>
 #include <setupapi.h>
-#include <stdio.h>
-#include <iphlpapi.h>
-#include <dhcpcsdk.h>
-#include <dhcpcapi.h>
-#include <olectl.h>
 #include <netcfgn.h>
-#include "resource.h"
-//#include <prsht.h>
-
-//#include <initguid.h>
 #include <devguid.h>
 
+#include "resource.h"
+
 typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
 typedef struct {
     REFIID riid;
@@ -72,4 +62,4 @@ HRESULT WINAPI TcpipConfigNotify_Constructor (IUnknown * pUnkOuter, REFIID riid,
 
 extern const GUID CLSID_TcpipConfigNotifyObject;
 
-#endif
+#endif /* _PRECOMP_H__ */
diff --git a/reactos/dll/win32/netcfgx/tcpipconf_notify.c b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
index cf4966d1b00..7f53c298f5f 100644
--- a/reactos/dll/win32/netcfgx/tcpipconf_notify.c
+++ b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
@@ -1,5 +1,11 @@
 #include "precomp.h"
 
+#include <winnls.h>
+#include <winsock.h>
+#include <iphlpapi.h>
+#include <dhcpcsdk.h>
+#include <dhcpcapi.h>
+
 typedef struct
 {
     DWORD EnableSecurityFilters;