From 1bb3dbb5285bf8367b14e1a680d7ab15e0771fd4 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 25 Jan 2014 17:24:24 +0000
Subject: [PATCH] [SHELL32] * Remove one time inclusions from the main header
 and put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61812
---
 reactos/dll/win32/shell32/CMenuBand.cpp          |  1 +
 reactos/dll/win32/shell32/CMenuBand.h            |  3 ++-
 reactos/dll/win32/shell32/CMenuDeskBar.cpp       |  1 -
 reactos/dll/win32/shell32/CMenuDeskBar.h         |  1 +
 reactos/dll/win32/shell32/authors.cpp            |  1 -
 reactos/dll/win32/shell32/autocomplete.h         |  2 +-
 reactos/dll/win32/shell32/brsfolder.cpp          |  1 -
 reactos/dll/win32/shell32/changenotify.cpp       |  1 -
 reactos/dll/win32/shell32/control.cpp            |  1 -
 reactos/dll/win32/shell32/dialogs.cpp            |  1 -
 reactos/dll/win32/shell32/dragdrophelper.h       |  2 +-
 reactos/dll/win32/shell32/drvdefext.cpp          |  3 ++-
 reactos/dll/win32/shell32/drvdefext.h            |  5 ++---
 reactos/dll/win32/shell32/enumidlist.h           |  3 ++-
 reactos/dll/win32/shell32/filedefext.h           |  2 +-
 reactos/dll/win32/shell32/folder_options.cpp     |  2 +-
 reactos/dll/win32/shell32/folders/admintools.cpp |  1 -
 reactos/dll/win32/shell32/folders/admintools.h   |  2 +-
 reactos/dll/win32/shell32/folders/cpanel.h       |  2 +-
 reactos/dll/win32/shell32/folders/desktop.h      |  2 +-
 reactos/dll/win32/shell32/folders/fonts.h        |  2 +-
 reactos/dll/win32/shell32/folders/fs.h           |  2 +-
 reactos/dll/win32/shell32/folders/mycomp.h       |  2 +-
 reactos/dll/win32/shell32/folders/mydocuments.h  |  2 +-
 reactos/dll/win32/shell32/folders/netplaces.h    |  2 +-
 reactos/dll/win32/shell32/folders/printers.cpp   |  2 ++
 reactos/dll/win32/shell32/folders/printers.h     |  2 +-
 reactos/dll/win32/shell32/folders/recyclebin.cpp |  6 ++++--
 reactos/dll/win32/shell32/folders/recyclebin.h   |  2 +-
 reactos/dll/win32/shell32/newmenu.h              |  2 +-
 reactos/dll/win32/shell32/openwithmenu.h         |  2 +-
 reactos/dll/win32/shell32/pidl.h                 |  2 +-
 reactos/dll/win32/shell32/precomp.h              | 15 ++-------------
 reactos/dll/win32/shell32/shell32_main.cpp       |  1 +
 reactos/dll/win32/shell32/shell32_main.h         |  5 +----
 reactos/dll/win32/shell32/shell32_version.h      |  2 ++
 reactos/dll/win32/shell32/shellitem.h            |  2 +-
 reactos/dll/win32/shell32/shelllink.cpp          |  2 ++
 reactos/dll/win32/shell32/shelllink.h            |  2 +-
 reactos/dll/win32/shell32/shellord.cpp           |  3 +++
 reactos/dll/win32/shell32/shellpath.cpp          |  2 ++
 reactos/dll/win32/shell32/shfldr.h               |  2 +-
 reactos/dll/win32/shell32/shlfileop.cpp          |  3 ++-
 reactos/dll/win32/shell32/shlview.cpp            |  2 ++
 reactos/dll/win32/shell32/startmenu.h            |  2 +-
 reactos/dll/win32/shell32/xdg.h                  |  3 ++-
 46 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/reactos/dll/win32/shell32/CMenuBand.cpp b/reactos/dll/win32/shell32/CMenuBand.cpp
index 9239fbffbba..c2d75b64aa3 100644
--- a/reactos/dll/win32/shell32/CMenuBand.cpp
+++ b/reactos/dll/win32/shell32/CMenuBand.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "precomp.h"
+
 #include <windowsx.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
diff --git a/reactos/dll/win32/shell32/CMenuBand.h b/reactos/dll/win32/shell32/CMenuBand.h
index b0dae637d1c..208d0640214 100644
--- a/reactos/dll/win32/shell32/CMenuBand.h
+++ b/reactos/dll/win32/shell32/CMenuBand.h
@@ -1,3 +1,4 @@
+#pragma once
 
 class CMenuBand;
 
@@ -160,4 +161,4 @@ BEGIN_COM_MAP(CMenuBand)
     COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc)
 END_COM_MAP()
 
-};
\ No newline at end of file
+};
diff --git a/reactos/dll/win32/shell32/CMenuDeskBar.cpp b/reactos/dll/win32/shell32/CMenuDeskBar.cpp
index 4d58b4ba24a..140b663794a 100644
--- a/reactos/dll/win32/shell32/CMenuDeskBar.cpp
+++ b/reactos/dll/win32/shell32/CMenuDeskBar.cpp
@@ -1,4 +1,3 @@
-
 #include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/reactos/dll/win32/shell32/CMenuDeskBar.h b/reactos/dll/win32/shell32/CMenuDeskBar.h
index 939cd1bafd6..68ee2f0118f 100644
--- a/reactos/dll/win32/shell32/CMenuDeskBar.h
+++ b/reactos/dll/win32/shell32/CMenuDeskBar.h
@@ -1,3 +1,4 @@
+#pragma once
 
 class CMenuDeskBar:
     public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>,
diff --git a/reactos/dll/win32/shell32/authors.cpp b/reactos/dll/win32/shell32/authors.cpp
index 76f71dbb716..d37927eda68 100644
--- a/reactos/dll/win32/shell32/authors.cpp
+++ b/reactos/dll/win32/shell32/authors.cpp
@@ -1,2 +1 @@
-
 const char * const SHELL_Authors[] = { "Copyright 1993-2012 WINE team", "Copyright 1998-2012 ReactOS Team", 0 };
diff --git a/reactos/dll/win32/shell32/autocomplete.h b/reactos/dll/win32/shell32/autocomplete.h
index 5e72ff6d5f0..c1c2ebd110f 100644
--- a/reactos/dll/win32/shell32/autocomplete.h
+++ b/reactos/dll/win32/shell32/autocomplete.h
@@ -63,4 +63,4 @@ BEGIN_COM_MAP(CAutoComplete)
 END_COM_MAP()
 };
 
-#endif // _AUTOCOMPLETE_H_
+#endif /* _AUTOCOMPLETE_H_ */
diff --git a/reactos/dll/win32/shell32/brsfolder.cpp b/reactos/dll/win32/shell32/brsfolder.cpp
index 3c62304a7ae..ace33088257 100644
--- a/reactos/dll/win32/shell32/brsfolder.cpp
+++ b/reactos/dll/win32/shell32/brsfolder.cpp
@@ -25,7 +25,6 @@
 
 #include "precomp.h"
 
-
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /* original margins and control size */
diff --git a/reactos/dll/win32/shell32/changenotify.cpp b/reactos/dll/win32/shell32/changenotify.cpp
index c0706a8cf00..e776158e3b2 100644
--- a/reactos/dll/win32/shell32/changenotify.cpp
+++ b/reactos/dll/win32/shell32/changenotify.cpp
@@ -20,7 +20,6 @@
 
 #include "precomp.h"
 
-
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 namespace
diff --git a/reactos/dll/win32/shell32/control.cpp b/reactos/dll/win32/shell32/control.cpp
index 0082ff36877..855c1f86f4d 100644
--- a/reactos/dll/win32/shell32/control.cpp
+++ b/reactos/dll/win32/shell32/control.cpp
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 #include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shlctrl);
diff --git a/reactos/dll/win32/shell32/dialogs.cpp b/reactos/dll/win32/shell32/dialogs.cpp
index ed94a4d55c6..d47832ee124 100644
--- a/reactos/dll/win32/shell32/dialogs.cpp
+++ b/reactos/dll/win32/shell32/dialogs.cpp
@@ -20,7 +20,6 @@
 
 #include "precomp.h"
 
-
 typedef struct
 {
     HWND hwndOwner ;
diff --git a/reactos/dll/win32/shell32/dragdrophelper.h b/reactos/dll/win32/shell32/dragdrophelper.h
index 52909bdb9f3..a520ed655f0 100644
--- a/reactos/dll/win32/shell32/dragdrophelper.h
+++ b/reactos/dll/win32/shell32/dragdrophelper.h
@@ -50,4 +50,4 @@ BEGIN_COM_MAP(CDropTargetHelper)
 END_COM_MAP()
 };
 
-#endif // _DRAGDROPHELPER_H_
+#endif /* _DRAGDROPHELPER_H_ */
diff --git a/reactos/dll/win32/shell32/drvdefext.cpp b/reactos/dll/win32/shell32/drvdefext.cpp
index 08b03e2aff5..2379c058ff5 100644
--- a/reactos/dll/win32/shell32/drvdefext.cpp
+++ b/reactos/dll/win32/shell32/drvdefext.cpp
@@ -19,8 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define _USE_MATH_DEFINES
 #include "precomp.h"
+
+#define _USE_MATH_DEFINES
 #include <math.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/reactos/dll/win32/shell32/drvdefext.h b/reactos/dll/win32/shell32/drvdefext.h
index efb91066006..4611f88f9a2 100644
--- a/reactos/dll/win32/shell32/drvdefext.h
+++ b/reactos/dll/win32/shell32/drvdefext.h
@@ -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 @@ BEGIN_COM_MAP(CDrvDefExt)
 END_COM_MAP()
 };
 
-#endif // _FILE_DEF_EXT_H_
-
+#endif /* _DRV_DEF_EXT_H_ */
diff --git a/reactos/dll/win32/shell32/enumidlist.h b/reactos/dll/win32/shell32/enumidlist.h
index 03bde1bccf0..5c056f5d700 100644
--- a/reactos/dll/win32/shell32/enumidlist.h
+++ b/reactos/dll/win32/shell32/enumidlist.h
@@ -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 @@ BEGIN_COM_MAP(IEnumIDListImpl)
 END_COM_MAP()
 };
 
-#endif /* ndef __ENUMIDLIST_H__ */
+#endif /* __ENUMIDLIST_H__ */
diff --git a/reactos/dll/win32/shell32/filedefext.h b/reactos/dll/win32/shell32/filedefext.h
index 33117b1060a..4252bcd3f05 100644
--- a/reactos/dll/win32/shell32/filedefext.h
+++ b/reactos/dll/win32/shell32/filedefext.h
@@ -116,4 +116,4 @@ BEGIN_COM_MAP(CFileDefExt)
 END_COM_MAP()
 };
 
-#endif // _FILE_DEF_EXT_H_
+#endif /* _FILE_DEF_EXT_H_ */
diff --git a/reactos/dll/win32/shell32/folder_options.cpp b/reactos/dll/win32/shell32/folder_options.cpp
index b609b1076e1..76445683241 100644
--- a/reactos/dll/win32/shell32/folder_options.cpp
+++ b/reactos/dll/win32/shell32/folder_options.cpp
@@ -20,8 +20,8 @@
 
 #include "precomp.h"
 
-
 WINE_DEFAULT_DEBUG_CHANNEL (fprop);
+
 #define MAX_PROPERTY_SHEET_PAGE (32)
 
 /// Folder Options:
diff --git a/reactos/dll/win32/shell32/folders/admintools.cpp b/reactos/dll/win32/shell32/folders/admintools.cpp
index 42edb6e847b..0e93a4f2160 100644
--- a/reactos/dll/win32/shell32/folders/admintools.cpp
+++ b/reactos/dll/win32/shell32/folders/admintools.cpp
@@ -23,7 +23,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL (shell);
 
-
 /*
 This folder should not exist. It is just a file system folder...
 */
diff --git a/reactos/dll/win32/shell32/folders/admintools.h b/reactos/dll/win32/shell32/folders/admintools.h
index bfbf456790c..7c3a8361504 100644
--- a/reactos/dll/win32/shell32/folders/admintools.h
+++ b/reactos/dll/win32/shell32/folders/admintools.h
@@ -84,4 +84,4 @@ class CAdminToolsFolder :
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_ADMINTOOLS_H_
+#endif /* _SHFLDR_ADMINTOOLS_H_ */
diff --git a/reactos/dll/win32/shell32/folders/cpanel.h b/reactos/dll/win32/shell32/folders/cpanel.h
index 0ceec8d37b6..0d3b6d9559e 100644
--- a/reactos/dll/win32/shell32/folders/cpanel.h
+++ b/reactos/dll/win32/shell32/folders/cpanel.h
@@ -107,4 +107,4 @@ class CControlPanelFolder :
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_CPANEL_H_
+#endif /* _SHFLDR_CPANEL_H_ */
diff --git a/reactos/dll/win32/shell32/folders/desktop.h b/reactos/dll/win32/shell32/folders/desktop.h
index 16f47a12d73..6f4c723d06a 100644
--- a/reactos/dll/win32/shell32/folders/desktop.h
+++ b/reactos/dll/win32/shell32/folders/desktop.h
@@ -105,4 +105,4 @@ class CDesktopFolder :
         END_COM_MAP()
 };
 
-#endif // _CDESKTOPFOLDER_H_
+#endif /* _CDESKTOPFOLDER_H_ */
diff --git a/reactos/dll/win32/shell32/folders/fonts.h b/reactos/dll/win32/shell32/folders/fonts.h
index d21c740086b..68db4609444 100644
--- a/reactos/dll/win32/shell32/folders/fonts.h
+++ b/reactos/dll/win32/shell32/folders/fonts.h
@@ -92,4 +92,4 @@ class CFontsFolder :
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_FONTS_H_
+#endif /* _SHFLDR_FONTS_H_ */
diff --git a/reactos/dll/win32/shell32/folders/fs.h b/reactos/dll/win32/shell32/folders/fs.h
index 8b687c3ffc9..23213680aea 100644
--- a/reactos/dll/win32/shell32/folders/fs.h
+++ b/reactos/dll/win32/shell32/folders/fs.h
@@ -126,4 +126,4 @@ struct _DoDropData {
     DWORD pdwEffect;
 };
 
-#endif // _CFSFOLDER_H_
+#endif /* _CFSFOLDER_H_ */
diff --git a/reactos/dll/win32/shell32/folders/mycomp.h b/reactos/dll/win32/shell32/folders/mycomp.h
index 5844b7a4665..b8275a7fd5d 100644
--- a/reactos/dll/win32/shell32/folders/mycomp.h
+++ b/reactos/dll/win32/shell32/folders/mycomp.h
@@ -82,4 +82,4 @@ class CDrivesFolder :
         END_COM_MAP()
 };
 
-#endif // _CDRIVESFOLDER_H_
+#endif /* _CDRIVESFOLDER_H_ */
diff --git a/reactos/dll/win32/shell32/folders/mydocuments.h b/reactos/dll/win32/shell32/folders/mydocuments.h
index e03bab3774d..c52ffe5346f 100644
--- a/reactos/dll/win32/shell32/folders/mydocuments.h
+++ b/reactos/dll/win32/shell32/folders/mydocuments.h
@@ -81,4 +81,4 @@ class CMyDocsFolder :
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_MYDOCUMENTS_H_
+#endif /* _SHFLDR_MYDOCUMENTS_H_ */
diff --git a/reactos/dll/win32/shell32/folders/netplaces.h b/reactos/dll/win32/shell32/folders/netplaces.h
index 21949606df0..a6ca94ed510 100644
--- a/reactos/dll/win32/shell32/folders/netplaces.h
+++ b/reactos/dll/win32/shell32/folders/netplaces.h
@@ -82,4 +82,4 @@ class CNetFolder :
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_NETPLACES_H_
+#endif /* _SHFLDR_NETPLACES_H_ */
diff --git a/reactos/dll/win32/shell32/folders/printers.cpp b/reactos/dll/win32/shell32/folders/printers.cpp
index f493a04adcb..f459fa0d595 100644
--- a/reactos/dll/win32/shell32/folders/printers.cpp
+++ b/reactos/dll/win32/shell32/folders/printers.cpp
@@ -23,6 +23,8 @@
 
 #include <precomp.h>
 
+#include <winspool.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL (shell);
 
 /***********************************************************************
diff --git a/reactos/dll/win32/shell32/folders/printers.h b/reactos/dll/win32/shell32/folders/printers.h
index 128ed50cdbe..7e4edced98a 100644
--- a/reactos/dll/win32/shell32/folders/printers.h
+++ b/reactos/dll/win32/shell32/folders/printers.h
@@ -85,4 +85,4 @@ class CPrinterFolder :
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_PRINTERS_H_
+#endif /* _SHFLDR_PRINTERS_H_ */
diff --git a/reactos/dll/win32/shell32/folders/recyclebin.cpp b/reactos/dll/win32/shell32/folders/recyclebin.cpp
index 50753d2341a..733873a807b 100644
--- a/reactos/dll/win32/shell32/folders/recyclebin.cpp
+++ b/reactos/dll/win32/shell32/folders/recyclebin.cpp
@@ -19,10 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define MAX_PROPERTY_SHEET_PAGE 32
-
 #include <precomp.h>
 
+#include <ntquery.h>
+
+#define MAX_PROPERTY_SHEET_PAGE 32
+
 WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin);
 
 typedef struct
diff --git a/reactos/dll/win32/shell32/folders/recyclebin.h b/reactos/dll/win32/shell32/folders/recyclebin.h
index 709c3eca4f7..8355697e845 100644
--- a/reactos/dll/win32/shell32/folders/recyclebin.h
+++ b/reactos/dll/win32/shell32/folders/recyclebin.h
@@ -110,4 +110,4 @@ class CRecycleBin :
         END_COM_MAP()
 };
 
-#endif // _SHFLDR_RECYCLEBIN_H_
+#endif /* _SHFLDR_RECYCLEBIN_H_ */
diff --git a/reactos/dll/win32/shell32/newmenu.h b/reactos/dll/win32/shell32/newmenu.h
index 12767d02739..88b29823356 100644
--- a/reactos/dll/win32/shell32/newmenu.h
+++ b/reactos/dll/win32/shell32/newmenu.h
@@ -99,4 +99,4 @@ BEGIN_COM_MAP(CNewMenu)
 END_COM_MAP()
 };
 
-#endif // _SHV_ITEM_NEW_H_
+#endif /* _SHV_ITEM_NEW_H_ */
diff --git a/reactos/dll/win32/shell32/openwithmenu.h b/reactos/dll/win32/shell32/openwithmenu.h
index 67b1e947b49..739fe05931e 100644
--- a/reactos/dll/win32/shell32/openwithmenu.h
+++ b/reactos/dll/win32/shell32/openwithmenu.h
@@ -68,4 +68,4 @@ class COpenWithMenu :
         END_COM_MAP()
 };
 
-#endif // _SHE_OCMENU_H_
+#endif /* _SHE_OCMENU_H_ */
diff --git a/reactos/dll/win32/shell32/pidl.h b/reactos/dll/win32/shell32/pidl.h
index ad149c04402..2def2a8300d 100644
--- a/reactos/dll/win32/shell32/pidl.h
+++ b/reactos/dll/win32/shell32/pidl.h
@@ -302,4 +302,4 @@ LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida);
 
 BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type);
 
-#endif
+#endif /* __WINE_PIDL_H */
diff --git a/reactos/dll/win32/shell32/precomp.h b/reactos/dll/win32/shell32/precomp.h
index b977194b79f..f464d095bcf 100644
--- a/reactos/dll/win32/shell32/precomp.h
+++ b/reactos/dll/win32/shell32/precomp.h
@@ -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 CLSID_UnixDosFolder;
 extern const GUID SHELL32_AdvtShortcutProduct;
 extern const GUID SHELL32_AdvtShortcutComponent;
 
-#endif
+#endif /* _PRECOMP_H__ */
diff --git a/reactos/dll/win32/shell32/shell32_main.cpp b/reactos/dll/win32/shell32/shell32_main.cpp
index 92c1195c6a8..21ccb1aa81d 100644
--- a/reactos/dll/win32/shell32/shell32_main.cpp
+++ b/reactos/dll/win32/shell32/shell32_main.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "precomp.h"
+
 #include "shell32_version.h"
 #include <reactos/version.h>
 
diff --git a/reactos/dll/win32/shell32/shell32_main.h b/reactos/dll/win32/shell32/shell32_main.h
index bb0a148b027..7c6d8643c60 100644
--- a/reactos/dll/win32/shell32/shell32_main.h
+++ b/reactos/dll/win32/shell32/shell32_main.h
@@ -22,9 +22,6 @@
 #ifndef __WINE_SHELL_MAIN_H
 #define __WINE_SHELL_MAIN_H
 
-#include <wine/unicode.h>
-
-
 /*******************************************
 *  global SHELL32.DLL variables
 */
@@ -205,4 +202,4 @@ LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT
 EXTERN_C HRESULT WINAPI DoRegisterServer(void);
 EXTERN_C HRESULT WINAPI DoUnregisterServer(void);
 
-#endif
+#endif /* __WINE_SHELL_MAIN_H */
diff --git a/reactos/dll/win32/shell32/shell32_version.h b/reactos/dll/win32/shell32/shell32_version.h
index cd0d8dbb9c7..92a0baf9bf9 100644
--- a/reactos/dll/win32/shell32/shell32_version.h
+++ b/reactos/dll/win32/shell32/shell32_version.h
@@ -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
diff --git a/reactos/dll/win32/shell32/shellitem.h b/reactos/dll/win32/shell32/shellitem.h
index 9bb0f6c12e6..a75698edfac 100644
--- a/reactos/dll/win32/shell32/shellitem.h
+++ b/reactos/dll/win32/shell32/shellitem.h
@@ -60,4 +60,4 @@ BEGIN_COM_MAP(CShellItem)
 END_COM_MAP()
 };
 
-#endif // _SHELLITEM_H_
+#endif /* _SHELLITEM_H_ */
diff --git a/reactos/dll/win32/shell32/shelllink.cpp b/reactos/dll/win32/shell32/shelllink.cpp
index f74fcb9cd05..156e4073426 100644
--- a/reactos/dll/win32/shell32/shelllink.cpp
+++ b/reactos/dll/win32/shell32/shelllink.cpp
@@ -36,6 +36,8 @@
 
 #include "precomp.h"
 
+#include <appmgmt.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 #define SHLINK_LOCAL  0
diff --git a/reactos/dll/win32/shell32/shelllink.h b/reactos/dll/win32/shell32/shelllink.h
index 40c5f10d8a2..47cb0fa8abb 100644
--- a/reactos/dll/win32/shell32/shelllink.h
+++ b/reactos/dll/win32/shell32/shelllink.h
@@ -179,4 +179,4 @@ BEGIN_COM_MAP(CShellLink)
 END_COM_MAP()
 };
 
-#endif // _SHELLLINK_H_
+#endif /* _SHELLLINK_H_ */
diff --git a/reactos/dll/win32/shell32/shellord.cpp b/reactos/dll/win32/shell32/shellord.cpp
index 0e6f8010c87..629e1f832cd 100644
--- a/reactos/dll/win32/shell32/shellord.cpp
+++ b/reactos/dll/win32/shell32/shellord.cpp
@@ -22,6 +22,9 @@
 
 #include "precomp.h"
 
+#include <mmsystem.h>
+#include <commoncontrols.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 WINE_DECLARE_DEBUG_CHANNEL(pidl);
 
diff --git a/reactos/dll/win32/shell32/shellpath.cpp b/reactos/dll/win32/shell32/shellpath.cpp
index 685d16926eb..8511feffda9 100644
--- a/reactos/dll/win32/shell32/shellpath.cpp
+++ b/reactos/dll/win32/shell32/shellpath.cpp
@@ -26,6 +26,8 @@
 
 #include "precomp.h"
 
+#include <sddl.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /*
diff --git a/reactos/dll/win32/shell32/shfldr.h b/reactos/dll/win32/shell32/shfldr.h
index 886f36619b8..8a194ce17d5 100644
--- a/reactos/dll/win32/shell32/shfldr.h
+++ b/reactos/dll/win32/shell32/shfldr.h
@@ -75,4 +75,4 @@ static int __inline SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str)
 void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags);
 BOOL SHELL_FS_HideExtension(LPWSTR pwszPath);
 
-#endif // _SHFLDR_H_
+#endif /* _SHFLDR_H_ */
diff --git a/reactos/dll/win32/shell32/shlfileop.cpp b/reactos/dll/win32/shell32/shlfileop.cpp
index 97cdb02b23a..1135afc258a 100644
--- a/reactos/dll/win32/shell32/shlfileop.cpp
+++ b/reactos/dll/win32/shell32/shlfileop.cpp
@@ -21,9 +21,10 @@
  * 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);
 
 #define IsAttrib(x, y)  ((INVALID_FILE_ATTRIBUTES != (x)) && ((x) & (y)))
diff --git a/reactos/dll/win32/shell32/shlview.cpp b/reactos/dll/win32/shell32/shlview.cpp
index 5d8f4b2fed0..5cf59f3a64a 100644
--- a/reactos/dll/win32/shell32/shlview.cpp
+++ b/reactos/dll/win32/shell32/shlview.cpp
@@ -50,6 +50,8 @@ TODO:
 
 #include "precomp.h"
 
+#include <atlwin.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 #undef SV_CLASS_NAME
diff --git a/reactos/dll/win32/shell32/startmenu.h b/reactos/dll/win32/shell32/startmenu.h
index c91467af52c..29e2778bb6a 100644
--- a/reactos/dll/win32/shell32/startmenu.h
+++ b/reactos/dll/win32/shell32/startmenu.h
@@ -152,4 +152,4 @@ BEGIN_COM_MAP(CMenuBandSite)
 END_COM_MAP()
 };
 
-#endif // _STARTMENU_H_
+#endif /* _STARTMENU_H_ */
diff --git a/reactos/dll/win32/shell32/xdg.h b/reactos/dll/win32/shell32/xdg.h
index 6c083c66e32..ef40cc95911 100644
--- a/reactos/dll/win32/shell32/xdg.h
+++ b/reactos/dll/win32/shell32/xdg.h
@@ -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 @@ HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count);
 void TRASH_DisposeElement(TRASH_ELEMENT *element);
 
 
-#endif /* ndef __XDG_H__ */
+#endif /* __XDG_H__ */