From cabd4e530ebd437e58835ce5c673337ec3b364a1 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 21 Jan 2014 17:59:36 +0000
Subject: [PATCH] [COMDLG32] * Remove one time inclusions from the main header
 and put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61746
---
 reactos/dll/win32/comdlg32/cdlg.h     | 8 ++------
 reactos/dll/win32/comdlg32/filedlg.c  | 2 ++
 reactos/dll/win32/comdlg32/printdlg.c | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reactos/dll/win32/comdlg32/cdlg.h b/reactos/dll/win32/comdlg32/cdlg.h
index 72aab02b23c..8d36cf8d6df 100644
--- a/reactos/dll/win32/comdlg32/cdlg.h
+++ b/reactos/dll/win32/comdlg32/cdlg.h
@@ -21,9 +21,8 @@
 #ifndef _WINE_DLL_CDLG_H
 #define _WINE_DLL_CDLG_H
 
-#include <config.h>
+#include <wine/config.h>
 
-#include <stdarg.h>
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -38,18 +37,15 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winuser.h>
-#include <winnls.h>
 #include <wincon.h>
 #include <winternl.h>
-#include <commctrl.h>
 #include <objbase.h>
 #include <commdlg.h>
 #include <shlobj.h>
-#include <shellapi.h>
 #include <dlgs.h>
 #include <cderr.h>
 
-// RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista
+/* RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista */
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
 #include <winreg.h>
diff --git a/reactos/dll/win32/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c
index e61e1fc751f..631b2a6980a 100644
--- a/reactos/dll/win32/comdlg32/filedlg.c
+++ b/reactos/dll/win32/comdlg32/filedlg.c
@@ -47,6 +47,8 @@
 
 #include "cdlg.h"
 
+#include <shellapi.h>
+
 #define UNIMPLEMENTED_FLAGS \
 (OFN_DONTADDTORECENT |\
 OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\
diff --git a/reactos/dll/win32/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c
index 8ef077a9d39..237bb965fe0 100644
--- a/reactos/dll/win32/comdlg32/printdlg.c
+++ b/reactos/dll/win32/comdlg32/printdlg.c
@@ -23,6 +23,7 @@
  */
 
 #include "cdlg.h"
+
 #include <assert.h>
 #include <winspool.h>