[EXPLORER]

* Remove one time shlwapi.h inclusion from the main header and put them back where it belongs.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61610

diff --git a/reactos/base/shell/explorer/explorer.cpp b/reactos/base/shell/explorer/explorer.cpp
index be15d96..db931cb 100644 (file)
--- a/reactos/base/shell/explorer/explorer.cpp
+++ b/reactos/base/shell/explorer/explorer.cpp
@@ -30,6 +30,7 @@
 
 #include <precomp.h>    // <precomp.h> instead of "precomp.h" because the ROS build system needs this to find the precompiled header file (*.gch) in the output directory tree
 
+#include <shlwapi.h>
 #include <locale.h>    // for setlocale()
 
 #ifndef __WINE__

diff --git a/reactos/base/shell/explorer/precomp.h b/reactos/base/shell/explorer/precomp.h
index 0d05450..cb8b740 100644 (file)
--- a/reactos/base/shell/explorer/precomp.h
+++ b/reactos/base/shell/explorer/precomp.h
@@ -28,10 +28,12 @@
 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES                        1
 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT  1
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
@@ -39,7 +41,6 @@
 #include <winnls.h>
 #include <wincon.h>
 #include <ole2.h>
-#include <shlwapi.h>
 
 #include "utility/utility.h"