[ros-diffs] [akhaldi] 61812: [SHELL32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Sat Jan 25 17:24:24 2014
New Revision: 61812

URL: http://svn.reactos.org/svn/reactos?rev=61812&view=rev
Log:
[SHELL32]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/dll/win32/shell32/CMenuBand.cpp
    trunk/reactos/dll/win32/shell32/CMenuBand.h
    trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp
    trunk/reactos/dll/win32/shell32/CMenuDeskBar.h
    trunk/reactos/dll/win32/shell32/authors.cpp
    trunk/reactos/dll/win32/shell32/autocomplete.h
    trunk/reactos/dll/win32/shell32/brsfolder.cpp
    trunk/reactos/dll/win32/shell32/changenotify.cpp
    trunk/reactos/dll/win32/shell32/control.cpp
    trunk/reactos/dll/win32/shell32/dialogs.cpp
    trunk/reactos/dll/win32/shell32/dragdrophelper.h
    trunk/reactos/dll/win32/shell32/drvdefext.cpp
    trunk/reactos/dll/win32/shell32/drvdefext.h
    trunk/reactos/dll/win32/shell32/enumidlist.h
    trunk/reactos/dll/win32/shell32/filedefext.h
    trunk/reactos/dll/win32/shell32/folder_options.cpp
    trunk/reactos/dll/win32/shell32/folders/admintools.cpp
    trunk/reactos/dll/win32/shell32/folders/admintools.h
    trunk/reactos/dll/win32/shell32/folders/cpanel.h
    trunk/reactos/dll/win32/shell32/folders/desktop.h
    trunk/reactos/dll/win32/shell32/folders/fonts.h
    trunk/reactos/dll/win32/shell32/folders/fs.h
    trunk/reactos/dll/win32/shell32/folders/mycomp.h
    trunk/reactos/dll/win32/shell32/folders/mydocuments.h
    trunk/reactos/dll/win32/shell32/folders/netplaces.h
    trunk/reactos/dll/win32/shell32/folders/printers.cpp
    trunk/reactos/dll/win32/shell32/folders/printers.h
    trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp
    trunk/reactos/dll/win32/shell32/folders/recyclebin.h
    trunk/reactos/dll/win32/shell32/newmenu.h
    trunk/reactos/dll/win32/shell32/openwithmenu.h
    trunk/reactos/dll/win32/shell32/pidl.h
    trunk/reactos/dll/win32/shell32/precomp.h
    trunk/reactos/dll/win32/shell32/shell32_main.cpp
    trunk/reactos/dll/win32/shell32/shell32_main.h
    trunk/reactos/dll/win32/shell32/shell32_version.h
    trunk/reactos/dll/win32/shell32/shellitem.h
    trunk/reactos/dll/win32/shell32/shelllink.cpp
    trunk/reactos/dll/win32/shell32/shelllink.h
    trunk/reactos/dll/win32/shell32/shellord.cpp
    trunk/reactos/dll/win32/shell32/shellpath.cpp
    trunk/reactos/dll/win32/shell32/shfldr.h
    trunk/reactos/dll/win32/shell32/shlfileop.cpp
    trunk/reactos/dll/win32/shell32/shlview.cpp
    trunk/reactos/dll/win32/shell32/startmenu.h
    trunk/reactos/dll/win32/shell32/xdg.h

Modified: trunk/reactos/dll/win32/shell32/CMenuBand.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMenuBand.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMenuBand.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -7,6 +7,7 @@
  */
 
 #include "precomp.h"
+
 #include <windowsx.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);

Modified: trunk/reactos/dll/win32/shell32/CMenuBand.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMenuBand.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMenuBand.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -1,3 +1,4 @@
+#pragma once
 
 class CMenuBand;
 
@@ -160,4 +161,4 @@
     COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc)
 END_COM_MAP()
 
-};
+};

Modified: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -1,4 +1,3 @@
-
 #include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);

Modified: trunk/reactos/dll/win32/shell32/CMenuDeskBar.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMenuDeskBar.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -1,3 +1,4 @@
+#pragma once
 
 class CMenuDeskBar:
     public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>,

Modified: trunk/reactos/dll/win32/shell32/authors.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/authors.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/authors.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/authors.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -1,2 +1 @@
-
 const char * const SHELL_Authors[] = { "Copyright 1993-2012 WINE team",
"Copyright 1998-2012 ReactOS Team", 0 };

Modified: trunk/reactos/dll/win32/shell32/autocomplete.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp…
==============================================================================
--- trunk/reactos/dll/win32/shell32/autocomplete.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/autocomplete.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -63,4 +63,4 @@
 END_COM_MAP()
 };
 
-#endif // _AUTOCOMPLETE_H_
+#endif /* _AUTOCOMPLETE_H_ */

Modified: trunk/reactos/dll/win32/shell32/brsfolder.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde…
==============================================================================
--- trunk/reactos/dll/win32/shell32/brsfolder.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/brsfolder.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -24,7 +24,6 @@
  */
 
 #include "precomp.h"
-
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

Modified: trunk/reactos/dll/win32/shell32/changenotify.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno…
==============================================================================
--- trunk/reactos/dll/win32/shell32/changenotify.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/changenotify.cpp	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -19,7 +19,6 @@
  */
 
 #include "precomp.h"
-
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

Modified: trunk/reactos/dll/win32/shell32/control.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/control.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/control.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -16,7 +16,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
 
 #include "precomp.h"
 

Modified: trunk/reactos/dll/win32/shell32/dialogs.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/dialogs.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/dialogs.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -19,7 +19,6 @@
  */
 
 #include "precomp.h"
-
 
 typedef struct
 {

Modified: trunk/reactos/dll/win32/shell32/dragdrophelper.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dragdrop…
==============================================================================
--- trunk/reactos/dll/win32/shell32/dragdrophelper.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/dragdrophelper.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -50,4 +50,4 @@
 END_COM_MAP()
 };
 
-#endif // _DRAGDROPHELPER_H_
+#endif /* _DRAGDROPHELPER_H_ */

Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex…
==============================================================================
--- trunk/reactos/dll/win32/shell32/drvdefext.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/drvdefext.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -19,8 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "precomp.h"
+
 #define _USE_MATH_DEFINES
-#include "precomp.h"
 #include <math.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);

Modified: trunk/reactos/dll/win32/shell32/drvdefext.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex…
==============================================================================
--- trunk/reactos/dll/win32/shell32/drvdefext.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/drvdefext.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -19,7 +19,7 @@
  */
 
 #ifndef _DRV_DEF_EXT_H_
-#define _FILE_DEF_EXT_H_
+#define _DRV_DEF_EXT_H_
 
 class CDrvDefExt :
 	public CComCoClass<CDrvDefExt, &CLSID_ShellDrvDefExt>,
@@ -72,5 +72,4 @@
 END_COM_MAP()
 };
 
-#endif // _FILE_DEF_EXT_H_
-
+#endif /* _DRV_DEF_EXT_H_ */

Modified: trunk/reactos/dll/win32/shell32/enumidlist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli…
==============================================================================
--- trunk/reactos/dll/win32/shell32/enumidlist.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/enumidlist.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -13,6 +13,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #ifndef __ENUMIDLIST_H__
 #define __ENUMIDLIST_H__
 
@@ -49,4 +50,4 @@
 END_COM_MAP()
 };
 
-#endif /* ndef __ENUMIDLIST_H__ */
+#endif /* __ENUMIDLIST_H__ */

Modified: trunk/reactos/dll/win32/shell32/filedefext.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe…
==============================================================================
--- trunk/reactos/dll/win32/shell32/filedefext.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/filedefext.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -116,4 +116,4 @@
 END_COM_MAP()
 };
 
-#endif // _FILE_DEF_EXT_H_
+#endif /* _FILE_DEF_EXT_H_ */

Modified: trunk/reactos/dll/win32/shell32/folder_options.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folder_options.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folder_options.cpp	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -20,8 +20,8 @@
 
 #include "precomp.h"
 
-
 WINE_DEFAULT_DEBUG_CHANNEL (fprop);
+
 #define MAX_PROPERTY_SHEET_PAGE (32)
 
 /// Folder Options:

Modified: trunk/reactos/dll/win32/shell32/folders/admintools.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/admintools.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/admintools.cpp	[iso-8859-1] Sat Jan 25
17:24:24 2014
@@ -22,7 +22,6 @@
 #include <precomp.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL (shell);
-
 
 /*
 This folder should not exist. It is just a file system folder...

Modified: trunk/reactos/dll/win32/shell32/folders/admintools.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/admintools.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/admintools.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -84,4 +84,4 @@
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_ADMINTOOLS_H_
+#endif /* _SHFLDR_ADMINTOOLS_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/cpanel.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/cpanel.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -107,4 +107,4 @@
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_CPANEL_H_
+#endif /* _SHFLDR_CPANEL_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/desktop.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/desktop.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/desktop.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -105,4 +105,4 @@
         END_COM_MAP()
 };
 
-#endif // _CDESKTOPFOLDER_H_
+#endif /* _CDESKTOPFOLDER_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/fonts.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/fonts.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/fonts.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -92,4 +92,4 @@
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_FONTS_H_
+#endif /* _SHFLDR_FONTS_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/fs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/fs.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/fs.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -126,4 +126,4 @@
     DWORD pdwEffect;
 };
 
-#endif // _CFSFOLDER_H_
+#endif /* _CFSFOLDER_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/mycomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/mycomp.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -82,4 +82,4 @@
         END_COM_MAP()
 };
 
-#endif // _CDRIVESFOLDER_H_
+#endif /* _CDRIVESFOLDER_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/mydocuments.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/mydocuments.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -81,4 +81,4 @@
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_MYDOCUMENTS_H_
+#endif /* _SHFLDR_MYDOCUMENTS_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/netplaces.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/netplaces.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/netplaces.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -82,4 +82,4 @@
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_NETPLACES_H_
+#endif /* _SHFLDR_NETPLACES_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/printers.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/printers.cpp	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -22,6 +22,8 @@
  */
 
 #include <precomp.h>
+
+#include <winspool.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL (shell);
 

Modified: trunk/reactos/dll/win32/shell32/folders/printers.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/printers.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/printers.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -85,4 +85,4 @@
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_PRINTERS_H_
+#endif /* _SHFLDR_PRINTERS_H_ */

Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp	[iso-8859-1] Sat Jan 25
17:24:24 2014
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <precomp.h>
+
+#include <ntquery.h>
+
 #define MAX_PROPERTY_SHEET_PAGE 32
-
-#include <precomp.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin);
 

Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/recyclebin.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/recyclebin.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -110,4 +110,4 @@
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_RECYCLEBIN_H_
+#endif /* _SHFLDR_RECYCLEBIN_H_ */

Modified: trunk/reactos/dll/win32/shell32/newmenu.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/newmenu.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/newmenu.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -99,4 +99,4 @@
 END_COM_MAP()
 };
 
-#endif // _SHV_ITEM_NEW_H_
+#endif /* _SHV_ITEM_NEW_H_ */

Modified: trunk/reactos/dll/win32/shell32/openwithmenu.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith…
==============================================================================
--- trunk/reactos/dll/win32/shell32/openwithmenu.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/openwithmenu.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -68,4 +68,4 @@
         END_COM_MAP()
 };
 
-#endif // _SHE_OCMENU_H_
+#endif /* _SHE_OCMENU_H_ */

Modified: trunk/reactos/dll/win32/shell32/pidl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r…
==============================================================================
--- trunk/reactos/dll/win32/shell32/pidl.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/pidl.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -302,4 +302,4 @@
 
 BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD
type);
 
-#endif
+#endif /* __WINE_PIDL_H */

Modified: trunk/reactos/dll/win32/shell32/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/precomp.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -12,33 +12,23 @@
 
 #include <windef.h>
 #include <winbase.h>
-#include <wingdi.h>
 #include <winreg.h>
 #include <winuser.h>
 #include <wincon.h>
-#include <shellapi.h>
 #include <commdlg.h>
 #include <ddeml.h>
-#include <mmsystem.h>
-#include <winspool.h>
 #include <shlguid_undoc.h>
 #include <shlwapi.h>
 #include <shlobj.h>
 #include <shlobj_undoc.h>
 #include <shlwapi_undoc.h>
-#include <appmgmt.h>
-#include <ntquery.h>
 #include <recyclebin.h>
 #include <ndk/rtlfuncs.h>
 #include <fmifs/fmifs.h>
-#include <sddl.h>
-#include <commoncontrols.h>
-
 #include <tchar.h>
 #include <strsafe.h>
 #include <atlbase.h>
 #include <atlcom.h>
-#include <atlwin.h>
 
 //#include "base/shell/explorer-new/todo.h"
 //#include "dlgs.h"
@@ -51,8 +41,6 @@
 #include "enumidlist.h"
 #include "shfldr.h"
 #include "shellfolder.h"
-#include "xdg.h"
-
 #include "shellitem.h"
 #include "shelllink.h"
 #include "dragdrophelper.h"
@@ -76,6 +64,7 @@
 #include "CMenuDeskBar.h"
 
 #include <wine/debug.h>
+#include <wine/unicode.h>
 
 extern const GUID CLSID_AdminFolderShortcut;
 extern const GUID CLSID_FontsFolderShortcut;
@@ -87,4 +76,4 @@
 extern const GUID SHELL32_AdvtShortcutProduct;
 extern const GUID SHELL32_AdvtShortcutComponent;
 
-#endif
+#endif /* _PRECOMP_H__ */

Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.cpp	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -20,6 +20,7 @@
  */
 
 #include "precomp.h"
+
 #include "shell32_version.h"
 #include <reactos/version.h>
 

Modified: trunk/reactos/dll/win32/shell32/shell32_main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -21,9 +21,6 @@
 
 #ifndef __WINE_SHELL_MAIN_H
 #define __WINE_SHELL_MAIN_H
-
-#include <wine/unicode.h>
-
 
 /*******************************************
 *  global SHELL32.DLL variables
@@ -205,4 +202,4 @@
 EXTERN_C HRESULT WINAPI DoRegisterServer(void);
 EXTERN_C HRESULT WINAPI DoUnregisterServer(void);
 
-#endif
+#endif /* __WINE_SHELL_MAIN_H */

Modified: trunk/reactos/dll/win32/shell32/shell32_version.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_version.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_version.h	[iso-8859-1] Sat Jan 25 17:24:24
2014
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 #define WINE_FILEVERSION_MAJOR         5
 #define WINE_FILEVERSION_MINOR         0
 #define WINE_FILEVERSION_BUILD      3900

Modified: trunk/reactos/dll/win32/shell32/shellitem.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellite…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellitem.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellitem.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -60,4 +60,4 @@
 END_COM_MAP()
 };
 
-#endif // _SHELLITEM_H_
+#endif /* _SHELLITEM_H_ */

Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shelllink.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shelllink.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -36,6 +36,8 @@
 
 #include "precomp.h"
 
+#include <appmgmt.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 #define SHLINK_LOCAL  0

Modified: trunk/reactos/dll/win32/shell32/shelllink.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shelllink.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shelllink.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -179,4 +179,4 @@
 END_COM_MAP()
 };
 
-#endif // _SHELLLINK_H_
+#endif /* _SHELLLINK_H_ */

Modified: trunk/reactos/dll/win32/shell32/shellord.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellord.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellord.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -21,6 +21,9 @@
  */
 
 #include "precomp.h"
+
+#include <mmsystem.h>
+#include <commoncontrols.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 WINE_DECLARE_DEBUG_CHANNEL(pidl);

Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellpath.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellpath.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -25,6 +25,8 @@
  */
 
 #include "precomp.h"
+
+#include <sddl.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

Modified: trunk/reactos/dll/win32/shell32/shfldr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shfldr.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -75,4 +75,4 @@
 void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags);
 BOOL SHELL_FS_HideExtension(LPWSTR pwszPath);
 
-#endif // _SHFLDR_H_
+#endif /* _SHFLDR_H_ */

Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlfileop.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlfileop.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -21,8 +21,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#define NO_SHLWAPI_STREAM
 #include "precomp.h"
+
+#include "xdg.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

Modified: trunk/reactos/dll/win32/shell32/shlview.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlview.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlview.cpp	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -49,6 +49,8 @@
 */
 
 #include "precomp.h"
+
+#include <atlwin.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

Modified: trunk/reactos/dll/win32/shell32/startmenu.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/startmen…
==============================================================================
--- trunk/reactos/dll/win32/shell32/startmenu.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/startmenu.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -152,4 +152,4 @@
 END_COM_MAP()
 };
 
-#endif // _STARTMENU_H_
+#endif /* _STARTMENU_H_ */

Modified: trunk/reactos/dll/win32/shell32/xdg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/xdg.h?re…
==============================================================================
--- trunk/reactos/dll/win32/shell32/xdg.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/xdg.h	[iso-8859-1] Sat Jan 25 17:24:24 2014
@@ -13,6 +13,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #ifndef __XDG_H__
 #define __XDG_H__
 
@@ -48,4 +49,4 @@
 void TRASH_DisposeElement(TRASH_ELEMENT *element);
 
 
-#endif /* ndef __XDG_H__ */
+#endif /* __XDG_H__ */