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

svn path=/trunk/; revision=61699
---
 reactos/dll/cpl/sysdm/environment.c |  1 -
 reactos/dll/cpl/sysdm/general.c     |  4 +++-
 reactos/dll/cpl/sysdm/hardprof.c    |  1 +
 reactos/dll/cpl/sysdm/precomp.h     | 14 +++++---------
 reactos/dll/cpl/sysdm/startrec.c    |  3 +++
 reactos/dll/cpl/sysdm/sysdm.c       |  3 +++
 reactos/dll/cpl/sysdm/userprofile.c |  1 -
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/reactos/dll/cpl/sysdm/environment.c b/reactos/dll/cpl/sysdm/environment.c
index 9a4b192c834..ba59a1c948e 100644
--- a/reactos/dll/cpl/sysdm/environment.c
+++ b/reactos/dll/cpl/sysdm/environment.c
@@ -9,7 +9,6 @@
 
 #include "precomp.h"
 
-
 typedef struct _VARIABLE_DATA
 {
     DWORD dwType;
diff --git a/reactos/dll/cpl/sysdm/general.c b/reactos/dll/cpl/sysdm/general.c
index 4502142c6ee..3060314d390 100644
--- a/reactos/dll/cpl/sysdm/general.c
+++ b/reactos/dll/cpl/sysdm/general.c
@@ -9,9 +9,11 @@
  *
  */
 
-
 #include "precomp.h"
 
+#include <winnls.h>
+#include <powrprof.h>
+
 #define ANIM_STEP 2
 #define ANIM_TIME 50
 
diff --git a/reactos/dll/cpl/sysdm/hardprof.c b/reactos/dll/cpl/sysdm/hardprof.c
index 75fe0717229..007acb1ef90 100644
--- a/reactos/dll/cpl/sysdm/hardprof.c
+++ b/reactos/dll/cpl/sysdm/hardprof.c
@@ -8,6 +8,7 @@
  */
 
 #include "precomp.h"
+
 #include <debug.h>
 
 typedef struct _PROFILE
diff --git a/reactos/dll/cpl/sysdm/precomp.h b/reactos/dll/cpl/sysdm/precomp.h
index 279167cedb9..4b5151f6698 100644
--- a/reactos/dll/cpl/sysdm/precomp.h
+++ b/reactos/dll/cpl/sysdm/precomp.h
@@ -1,25 +1,21 @@
 #ifndef __CPL_PRECOMP_H
 #define __CPL_PRECOMP_H
 
-#include <ntstatus.h>
-#define WIN32_NO_STATUS
+#include <stdarg.h>
+
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
-#include <winnls.h>
 #include <wincon.h>
-#include <powrprof.h>
 #include <tchar.h>
-#include <cpl.h>
 #include <shellapi.h>
-#include <shlwapi.h>
 #include <shlobj.h>
-#include <regstr.h>
-#include <setupapi.h>
 
 #include "resource.h"
 
diff --git a/reactos/dll/cpl/sysdm/startrec.c b/reactos/dll/cpl/sysdm/startrec.c
index 309e01de3d0..33ca6826b2c 100644
--- a/reactos/dll/cpl/sysdm/startrec.c
+++ b/reactos/dll/cpl/sysdm/startrec.c
@@ -10,6 +10,9 @@
 
 #include "precomp.h"
 
+#include <shlwapi.h>
+#include <setupapi.h>
+
 typedef struct _STARTINFO
 {
     WCHAR szFreeldrIni[MAX_PATH + 15];
diff --git a/reactos/dll/cpl/sysdm/sysdm.c b/reactos/dll/cpl/sysdm/sysdm.c
index b03a0eebd37..b9af4698f74 100644
--- a/reactos/dll/cpl/sysdm/sysdm.c
+++ b/reactos/dll/cpl/sysdm/sysdm.c
@@ -9,6 +9,9 @@
 
 #include "precomp.h"
 
+#include <cpl.h>
+#include <regstr.h>
+
 LONG CALLBACK SystemApplet(VOID);
 HINSTANCE hApplet = 0;
 HWND hCPLWindow;
diff --git a/reactos/dll/cpl/sysdm/userprofile.c b/reactos/dll/cpl/sysdm/userprofile.c
index cd0da0e1a17..29cab5a4a58 100644
--- a/reactos/dll/cpl/sysdm/userprofile.c
+++ b/reactos/dll/cpl/sysdm/userprofile.c
@@ -10,7 +10,6 @@
 
 #include "precomp.h"
 
-
 static VOID
 SetListViewColumns(HWND hwndListView)
 {