[DEVMGMT]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61553

reactos/base/applications/mscutils/devmgmt/devmgmt.c

@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <winnls.h>
+
 HINSTANCE hInstance;
 HANDLE ProcessHeap;
 HANDLE hMutex;

reactos/base/applications/mscutils/devmgmt/enumdevices.c

@@ -9,6 +9,11 @@
 
 #include "precomp.h"
 
+#include <cfgmgr32.h>
+#include <dll/devmgr/devmgr.h>
+#include <initguid.h>
+#include <devguid.h>
+
 static SP_CLASSIMAGELIST_DATA ImageListData;
 static HDEVINFO hDevInfo;
 

reactos/base/applications/mscutils/devmgmt/mainwnd.c

@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <windowsx.h>
+
 static BOOL pCreateToolbar(PMAIN_WND_INFO Info);
 
 static const TCHAR szMainWndClass[] = TEXT("DevMgmtWndClass");

reactos/base/applications/mscutils/devmgmt/precomp.h

@@ -2,19 +2,14 @@
 #define __DEVMGMT_PRECOMP_H
 
 #include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
 #include <winreg.h>
 #include <wingdi.h>
-#include <winnls.h>
-#include <windowsx.h>
 #include <tchar.h>
 #include <setupapi.h>
-#include <cfgmgr32.h>
-#include <dll/devmgr/devmgr.h>
-#include <initguid.h>
-#include <devguid.h>
 
 #include "resource.h"