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

svn path=/trunk/; revision=61799
---
 reactos/dll/win32/netshell/enumlist.h       |  2 ++
 reactos/dll/win32/netshell/lanconnectui.cpp |  3 +++
 reactos/dll/win32/netshell/lanstatusui.cpp  |  2 ++
 reactos/dll/win32/netshell/netshell.cpp     |  2 ++
 reactos/dll/win32/netshell/precomp.h        | 12 ++++--------
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/reactos/dll/win32/netshell/enumlist.h b/reactos/dll/win32/netshell/enumlist.h
index 3d6ff3709c3..8557e6413c1 100644
--- a/reactos/dll/win32/netshell/enumlist.h
+++ b/reactos/dll/win32/netshell/enumlist.h
@@ -1,3 +1,5 @@
+#pragma once
+
 typedef struct tagGUIDStruct
 {
     BYTE dummy; /* offset 01 is unknown */
diff --git a/reactos/dll/win32/netshell/lanconnectui.cpp b/reactos/dll/win32/netshell/lanconnectui.cpp
index 691b40e010f..0fe78fa8c99 100644
--- a/reactos/dll/win32/netshell/lanconnectui.cpp
+++ b/reactos/dll/win32/netshell/lanconnectui.cpp
@@ -1,5 +1,8 @@
 #include "precomp.h"
 
+#include <netcfgx.h>
+#include <netcfgn.h>
+
 /// CLASSID
 /// {7007ACC5-3202-11D1-AAD2-00805FC1270E}
 /// open network properties and wlan properties
diff --git a/reactos/dll/win32/netshell/lanstatusui.cpp b/reactos/dll/win32/netshell/lanstatusui.cpp
index 334927d8725..ca4f0d4b77d 100644
--- a/reactos/dll/win32/netshell/lanstatusui.cpp
+++ b/reactos/dll/win32/netshell/lanstatusui.cpp
@@ -1,5 +1,7 @@
 #include "precomp.h"
 
+#include <winsock.h>
+
 /// CLSID
 /// HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{7007ACCF-3202-11D1-AAD2-00805FC1270E}
 // IID B722BCCB-4E68-101B-A2BC-00AA00404770
diff --git a/reactos/dll/win32/netshell/netshell.cpp b/reactos/dll/win32/netshell/netshell.cpp
index 8da0dc2e254..f40a8655780 100644
--- a/reactos/dll/win32/netshell/netshell.cpp
+++ b/reactos/dll/win32/netshell/netshell.cpp
@@ -1,5 +1,7 @@
 #include "precomp.h"
 
+#include <olectl.h>
+
 HINSTANCE netshell_hInstance;
 const GUID CLSID_LANConnectUI            = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}};
 const GUID CLSID_NetworkConnections      = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}};
diff --git a/reactos/dll/win32/netshell/precomp.h b/reactos/dll/win32/netshell/precomp.h
index f156176d3b3..00e33838386 100644
--- a/reactos/dll/win32/netshell/precomp.h
+++ b/reactos/dll/win32/netshell/precomp.h
@@ -1,26 +1,23 @@
 #ifndef _PRECOMP_H__
 #define _PRECOMP_H__
 
+#include <stdio.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdio.h>
 #include <windef.h>
-#include <winreg.h>
 #include <winbase.h>
+#include <winreg.h>
 #include <winnls.h>
-#include <winsock2.h>
 #include <shlwapi.h>
 #include <shlobj.h>
 #include <shellapi.h>
-#include <olectl.h>
 #include <iphlpapi.h>
 #include <setupapi.h>
 #include <devguid.h>
 #include <netcon.h>
-#include <netcfgx.h>
-#include <netcfgn.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
@@ -60,7 +57,6 @@ extern HINSTANCE netshell_hInstance;
 extern const GUID CLSID_NetworkConnections;
 extern const GUID CLSID_LANConnectUI;
 extern const GUID CLSID_LanConnectStatusUI;
-extern const GUID GUID_DEVCLASS_NET;
 
 /* shfldr_netconnect.c */
 HRESULT ShowNetConnectionProperties(INetConnection * pNetConnect, HWND hwnd);
@@ -91,4 +87,4 @@ HRESULT WINAPI LanConnectStatusUI_Constructor(IUnknown *pUnkOuter, REFIID riid,
 
 #include "enumlist.h"
 
-#endif
+#endif /* _PRECOMP_H__ */