#include "wine/shell32_main.h"
#include "shresdef.h"
#include "cpanel.h"
-#include "enumidlist.h"
+#include "CEnumIDListBase.h"
#include "shfldr.h"
#include "shellfolder.h"
-#include "shellitem.h"
-#include "shelllink.h"
-#include "dragdrophelper.h"
-#include "autocomplete.h"
-#include "folders/fs.h"
-#include "folders/mycomp.h"
-#include "folders/desktop.h"
-#include "folders/cpanel.h"
-#include "folders/mydocuments.h"
-#include "folders/netplaces.h"
-#include "folders/fonts.h"
-#include "folders/printers.h"
-#include "folders/admintools.h"
-#include "folders/recyclebin.h"
+#include "CShellItem.h"
+#include "CShellLink.h"
+#include "CDropTargetHelper.h"
+#include "CAutoComplete.h"
+#include "folders/CFSFolder.h"
+#include "folders/CDrivesFolder.h"
+#include "folders/CDesktopFolder.h"
+#include "folders/CControlPanelFolder.h"
+#include "folders/CMyDocsFolder.h"
+#include "folders/CNetFolder.h"
+#include "folders/CFontsFolder.h"
+#include "folders/CPrinterFolder.h"
+#include "folders/CAdminToolsFolder.h"
+#include "folders/CRecycleBin.h"
#include "droptargets/CexeDropHandler.h"
-#include "openwithmenu.h"
-#include "newmenu.h"
-#include "startmenu.h"
+#include "COpenWithMenu.h"
+#include "CNewMenu.h"
+#include "CStartMenu.h"
#include "filedefext.h"
#include "drvdefext.h"
#include "CMenuBand.h"