From 93a84eb12de02f37cee4d510373748b2a10c8616 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 23 Jan 2014 11:13:16 +0000
Subject: [PATCH] [DEVMGR] * Remove one time inclusions from the main header
 and put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61760
---
 reactos/dll/win32/devmgr/advprop.c    |  3 +++
 reactos/dll/win32/devmgr/devprblm.c   |  2 +-
 reactos/dll/win32/devmgr/hwpage.c     |  1 +
 reactos/dll/win32/devmgr/hwresource.c |  2 +-
 reactos/dll/win32/devmgr/misc.c       |  2 +-
 reactos/dll/win32/devmgr/precomp.h    | 12 +++++++-----
 reactos/dll/win32/devmgr/stubs.c      |  1 +
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/reactos/dll/win32/devmgr/advprop.c b/reactos/dll/win32/devmgr/advprop.c
index 2baa99154a3..821cbb9542a 100644
--- a/reactos/dll/win32/devmgr/advprop.c
+++ b/reactos/dll/win32/devmgr/advprop.c
@@ -26,8 +26,11 @@
  * UPDATE HISTORY:
  *      04-04-2004  Created
  */
+
 #include "precomp.h"
 
+#include <winver.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/dll/win32/devmgr/devprblm.c b/reactos/dll/win32/devmgr/devprblm.c
index 15912b68840..90a5406b4da 100644
--- a/reactos/dll/win32/devmgr/devprblm.c
+++ b/reactos/dll/win32/devmgr/devprblm.c
@@ -24,12 +24,12 @@
  * UPDATE HISTORY:
  *      04-04-2004  Created
  */
+
 #include "precomp.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 BOOL
 ShowDeviceProblemWizard(IN HWND hWndParent  OPTIONAL,
                         IN HDEVINFO hDevInfo,
diff --git a/reactos/dll/win32/devmgr/hwpage.c b/reactos/dll/win32/devmgr/hwpage.c
index 82ee053340c..f46749092ed 100644
--- a/reactos/dll/win32/devmgr/hwpage.c
+++ b/reactos/dll/win32/devmgr/hwpage.c
@@ -24,6 +24,7 @@
  * UPDATE HISTORY:
  *      04-04-2004  Created
  */
+
 #include "precomp.h"
 
 #define NDEBUG
diff --git a/reactos/dll/win32/devmgr/hwresource.c b/reactos/dll/win32/devmgr/hwresource.c
index b3c73ef0545..f874a0ce76e 100644
--- a/reactos/dll/win32/devmgr/hwresource.c
+++ b/reactos/dll/win32/devmgr/hwresource.c
@@ -6,8 +6,8 @@
  * UPDATE HISTORY:
  *      2005/11/24  Created
  */
-#include "precomp.h"
 
+#include "precomp.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/dll/win32/devmgr/misc.c b/reactos/dll/win32/devmgr/misc.c
index 550ea9f21fe..002a079e7c2 100644
--- a/reactos/dll/win32/devmgr/misc.c
+++ b/reactos/dll/win32/devmgr/misc.c
@@ -24,6 +24,7 @@
  * UPDATE HISTORY:
  *      2005/11/24  Created
  */
+
 #include "precomp.h"
 
 #define NDEBUG
@@ -31,7 +32,6 @@
 
 HINSTANCE hDllInstance = NULL;
 
-
 INT
 LengthOfStrResource(IN HINSTANCE hInst,
                     IN UINT uID)
diff --git a/reactos/dll/win32/devmgr/precomp.h b/reactos/dll/win32/devmgr/precomp.h
index 1a3072635f6..ff48d5deb45 100644
--- a/reactos/dll/win32/devmgr/precomp.h
+++ b/reactos/dll/win32/devmgr/precomp.h
@@ -1,14 +1,18 @@
 #ifndef __DEVMGR_H
 #define __DEVMGR_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <winnls.h>
+#include <winuser.h>
 #include <wchar.h>
 #include <regstr.h>
 #include <setupapi.h>
 #include <cfgmgr32.h>
-#include <newdev.h>
 #include <dll/devmgr/devmgr.h>
 
 #include "resource.h"
@@ -221,5 +225,3 @@ FindCurrentDriver(IN HDEVINFO DeviceInfoSet,
                   OUT PSP_DRVINFO_DATA DriverInfoData);
 
 #endif /* __DEVMGR_H */
-
-/* EOF */
diff --git a/reactos/dll/win32/devmgr/stubs.c b/reactos/dll/win32/devmgr/stubs.c
index f70acbd2549..c05a89a0e2b 100644
--- a/reactos/dll/win32/devmgr/stubs.c
+++ b/reactos/dll/win32/devmgr/stubs.c
@@ -15,6 +15,7 @@
  * UPDATE HISTORY:
  *      04-04-2004  Created
  */
+
 #include <windef.h>
 
 #define NDEBUG