From 709cd1a624be940ebd92e6ca46ce04eed949e3b1 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 6 Jan 2014 21:03:41 +0000
Subject: [PATCH] [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     | 2 ++
 reactos/base/applications/mscutils/devmgmt/enumdevices.c | 5 +++++
 reactos/base/applications/mscutils/devmgmt/mainwnd.c     | 2 ++
 reactos/base/applications/mscutils/devmgmt/precomp.h     | 7 +------
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/reactos/base/applications/mscutils/devmgmt/devmgmt.c b/reactos/base/applications/mscutils/devmgmt/devmgmt.c
index 406a304f5b4..8c1147f16d1 100644
--- a/reactos/base/applications/mscutils/devmgmt/devmgmt.c
+++ b/reactos/base/applications/mscutils/devmgmt/devmgmt.c
@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <winnls.h>
+
 HINSTANCE hInstance;
 HANDLE ProcessHeap;
 HANDLE hMutex;
diff --git a/reactos/base/applications/mscutils/devmgmt/enumdevices.c b/reactos/base/applications/mscutils/devmgmt/enumdevices.c
index bf9e34fc2c8..9f5b3a305e2 100644
--- a/reactos/base/applications/mscutils/devmgmt/enumdevices.c
+++ b/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;
 
diff --git a/reactos/base/applications/mscutils/devmgmt/mainwnd.c b/reactos/base/applications/mscutils/devmgmt/mainwnd.c
index 63218d97088..e08341a9a52 100644
--- a/reactos/base/applications/mscutils/devmgmt/mainwnd.c
+++ b/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");
diff --git a/reactos/base/applications/mscutils/devmgmt/precomp.h b/reactos/base/applications/mscutils/devmgmt/precomp.h
index 83966705624..6dcf1b96bb8 100644
--- a/reactos/base/applications/mscutils/devmgmt/precomp.h
+++ b/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"