From 034d812701757f51c85ee97bdeacf8d3fcfddc49 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 19 Jan 2014 10:21:10 +0000
Subject: [PATCH] [DESK] * 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=61692
---
 reactos/dll/cpl/desk/appearance.h |  2 ++
 reactos/dll/cpl/desk/background.c |  2 ++
 reactos/dll/cpl/desk/desk.c       |  2 ++
 reactos/dll/cpl/desk/desk.h       | 14 ++++----------
 reactos/dll/cpl/desk/devsett.c    |  2 ++
 reactos/dll/cpl/desk/draw.h       |  3 ++-
 reactos/dll/cpl/desk/monslctl.c   |  1 -
 reactos/dll/cpl/desk/preview.h    |  2 ++
 reactos/dll/cpl/desk/theme.c      |  6 +++++-
 9 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/reactos/dll/cpl/desk/appearance.h b/reactos/dll/cpl/desk/appearance.h
index 8e8b6c57b85..2274c89975b 100644
--- a/reactos/dll/cpl/desk/appearance.h
+++ b/reactos/dll/cpl/desk/appearance.h
@@ -1,3 +1,5 @@
+#pragma once
+
 /* Some definitions for theme */
 #define SIZE_BORDER_WIDTH       0
 #define SIZE_SCROLL_WIDTH       1
diff --git a/reactos/dll/cpl/desk/background.c b/reactos/dll/cpl/desk/background.c
index 891164a4af5..0f1ec61f3dd 100644
--- a/reactos/dll/cpl/desk/background.c
+++ b/reactos/dll/cpl/desk/background.c
@@ -10,6 +10,8 @@
 
 #include "desk.h"
 
+#include <shellapi.h>
+
 #define MAX_BACKGROUNDS     100
 
 #define PLACEMENT_CENTER    0
diff --git a/reactos/dll/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c
index bc19cef17a1..0bbfa2556c8 100644
--- a/reactos/dll/cpl/desk/desk.c
+++ b/reactos/dll/cpl/desk/desk.c
@@ -9,6 +9,8 @@
 
 #include "desk.h"
 
+#include <cplext.h>
+
 #define NUM_APPLETS    (1)
 
 static LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
diff --git a/reactos/dll/cpl/desk/desk.h b/reactos/dll/cpl/desk/desk.h
index c714b4182e1..36844ebadaf 100644
--- a/reactos/dll/cpl/desk/desk.h
+++ b/reactos/dll/cpl/desk/desk.h
@@ -1,30 +1,24 @@
-#define COBJMACROS
+#include <stdarg.h>
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
+#define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
 #include <winuser.h>
 #include <wincon.h>
-#include <shellapi.h>
 #include <commdlg.h>
 #include <cpl.h>
 #include <tchar.h>
 #include <setupapi.h>
-#include <assert.h>
-#include <shlwapi.h>
 #include <shlobj.h>
 #include <regstr.h>
-#include <cplext.h>
 #include <dll/desk/deskcplx.h>
-#include <cfgmgr32.h>
-#include <uxtheme.h>
-#include <uxundoc.h>
-#include <vssym32.h>
 
 #include "appearance.h"
 #include "preview.h"
diff --git a/reactos/dll/cpl/desk/devsett.c b/reactos/dll/cpl/desk/devsett.c
index 1d541e2fdb7..72e2ae35c11 100644
--- a/reactos/dll/cpl/desk/devsett.c
+++ b/reactos/dll/cpl/desk/devsett.c
@@ -7,6 +7,8 @@
 
 #include "desk.h"
 
+#include <cfgmgr32.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/dll/cpl/desk/draw.h b/reactos/dll/cpl/desk/draw.h
index 25abefb5bf8..7c9745de55b 100644
--- a/reactos/dll/cpl/desk/draw.h
+++ b/reactos/dll/cpl/desk/draw.h
@@ -1,3 +1,5 @@
+#pragma once
+
 BOOL
 MyDrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState, COLOR_SCHEME *scheme);
 BOOL
@@ -13,4 +15,3 @@ MyDrawMenuBarTemp(HWND Wnd, HDC DC, LPRECT Rect, HMENU Menu, HFONT Font, COLOR_S
 
 #define MY_BF_ACTIVEBORDER 0x1000000
 #define MY_BF_INACTIVEBORDER 0x2000000
-
diff --git a/reactos/dll/cpl/desk/monslctl.c b/reactos/dll/cpl/desk/monslctl.c
index ea96760633e..b7be54a9959 100644
--- a/reactos/dll/cpl/desk/monslctl.c
+++ b/reactos/dll/cpl/desk/monslctl.c
@@ -1,4 +1,3 @@
-
 #include "desk.h"
 
 static const TCHAR szMonitorSelWndClass[] = TEXT("MONITORSELWNDCLASS");
diff --git a/reactos/dll/cpl/desk/preview.h b/reactos/dll/cpl/desk/preview.h
index b4363c404ae..c98fdf4badc 100644
--- a/reactos/dll/cpl/desk/preview.h
+++ b/reactos/dll/cpl/desk/preview.h
@@ -6,6 +6,8 @@
  * COPYRIGHT:   Copyright 2006, 2007 Eric Kohl
  */
 
+#pragma once
+
 #define IDX_DESKTOP           0
 #define IDX_INACTIVE_CAPTION  1
 #define IDX_INACTIVE_BORDER   2
diff --git a/reactos/dll/cpl/desk/theme.c b/reactos/dll/cpl/desk/theme.c
index bded82d76b7..5a26b361318 100644
--- a/reactos/dll/cpl/desk/theme.c
+++ b/reactos/dll/cpl/desk/theme.c
@@ -9,6 +9,11 @@
 
 #include "desk.h"
 
+#include <shlwapi.h>
+#include <uxtheme.h>
+#include <uxundoc.h>
+#include <vssym32.h>
+
 static const WCHAR g_CPColors[] = L"Control Panel\\Colors";
 static const WCHAR g_CPANewSchemes[] = L"Control Panel\\Appearance\\New Schemes";
 static const WCHAR g_CPMetrics[] = L"Control Panel\\Desktop\\WindowMetrics";
@@ -890,4 +895,3 @@ DrawThemePreview(IN HDC hdcMem, IN PCOLOR_SCHEME scheme, IN PTHEME_SELECTION pSe
 
     return SUCCEEDED(hres);
 }
-