From 8afbde3981ce5ecef9e0addeb74e32986107e48c Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 13 Jan 2014 13:05:47 +0000
Subject: [PATCH] [EXPLORER_NEW] * 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=61611
---
 reactos/base/shell/explorer-new/explorer.c |  2 ++
 reactos/base/shell/explorer-new/precomp.h  | 15 ++++++---------
 reactos/base/shell/explorer-new/tbsite.c   |  4 ++++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/reactos/base/shell/explorer-new/explorer.c b/reactos/base/shell/explorer-new/explorer.c
index e0a31fc561d..395165aef79 100644
--- a/reactos/base/shell/explorer-new/explorer.c
+++ b/reactos/base/shell/explorer-new/explorer.c
@@ -20,6 +20,8 @@
 
 #include "precomp.h"
 
+#include <winver.h>
+
 HINSTANCE hExplorerInstance;
 HMODULE hUser32;
 HANDLE hProcessHeap;
diff --git a/reactos/base/shell/explorer-new/precomp.h b/reactos/base/shell/explorer-new/precomp.h
index 6fc33724fb7..c7e263dc57d 100644
--- a/reactos/base/shell/explorer-new/precomp.h
+++ b/reactos/base/shell/explorer-new/precomp.h
@@ -1,34 +1,31 @@
 #ifndef _EXPLORER_PRECOMP__H_
 #define _EXPLORER_PRECOMP__H_
-#define COBJMACROS
+
+#include <stdio.h>
+#include <tchar.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 <winnls.h>
-#include <winver.h>
 #include <wincon.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <shlobj_undoc.h>
 #include <shlwapi.h>
 #include <shlguid_undoc.h>
-#include <shdeprecated.h>
-#include <tchar.h>
-#include <stdio.h>
 #include <uxtheme.h>
 
 #include "tmschema.h"
 #include "resource.h"
 #include "comcsup.h"
-//#include "todo.h"
-//#include "initguid.h"
-#include "undoc.h"
 
 /* dynamic imports due to lack of support in msvc linker libs */
 typedef INT (APIENTRY *REGSHELLHOOK)(HWND, DWORD);
diff --git a/reactos/base/shell/explorer-new/tbsite.c b/reactos/base/shell/explorer-new/tbsite.c
index d27240b67cc..8a14ffafcc1 100644
--- a/reactos/base/shell/explorer-new/tbsite.c
+++ b/reactos/base/shell/explorer-new/tbsite.c
@@ -20,6 +20,10 @@
 
 #include "precomp.h"
 
+#include <shdeprecated.h>
+
+#include "undoc.h"
+
 /*****************************************************************************
  ** ITrayBandSite ************************************************************
  *****************************************************************************/