Index: src/ch/CrashDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/CrashDlg.h (.../CrashDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/CrashDlg.h (.../CrashDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -17,9 +17,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #pragma once -#include "afxwin.h" - // CCrashDlg dialog class CCrashDlg : public CDialog Index: src/ch/Dialogs.cpp =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/Dialogs.cpp (.../Dialogs.cpp) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/Dialogs.cpp (.../Dialogs.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -18,6 +18,7 @@ ***************************************************************************/ #include "stdafx.h" #include "dialogs.h" +#include "shlobj.h" #ifdef _DEBUG #define new DEBUG_NEW Index: src/ch/Dialogs.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/Dialogs.h (.../Dialogs.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/Dialogs.h (.../Dialogs.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -19,8 +19,6 @@ #ifndef __DIALOGS_H__ #define __DIALOGS_H__ -#include "shlobj.h" - bool BrowseForFolder(LPCTSTR lpszTitle, CString* pResult); #endif \ No newline at end of file Index: src/ch/FeedbackFileErrorDlg.cpp =================================================================== diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FeedbackFileErrorDlg.cpp (.../FeedbackFileErrorDlg.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/FeedbackFileErrorDlg.cpp (.../FeedbackFileErrorDlg.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -11,7 +11,7 @@ IMPLEMENT_DYNAMIC(CFeedbackFileErrorDlg, ictranslate::CLanguageDialog) CFeedbackFileErrorDlg::CFeedbackFileErrorDlg(const tchar_t* pszPath, ulong_t ulSysError, CWnd* pParent /*=NULL*/) - : ictranslate::CLanguageDialog(CFeedbackFileErrorDlg::IDD, pParent), + : ictranslate::CLanguageDialog(IDD_FEEDBACK_FILE_ERROR_DIALOG, pParent), m_bAllItems(FALSE), m_strPath(pszPath), m_ulSysError(ulSysError) Index: src/ch/FeedbackFileErrorDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FeedbackFileErrorDlg.h (.../FeedbackFileErrorDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/FeedbackFileErrorDlg.h (.../FeedbackFileErrorDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -18,7 +18,6 @@ ***************************************************************************/ #ifndef __FEEDBACKFILEERRORDLG_H__ #define __FEEDBACKFILEERRORDLG_H__ -#include "afxwin.h" // CFeedbackFileErrorDlg dialog class CFeedbackFileErrorDlg : public ictranslate::CLanguageDialog @@ -29,9 +28,6 @@ CFeedbackFileErrorDlg(const tchar_t* pszPath, ulong_t ulSysError, CWnd* pParent = NULL); // standard constructor virtual ~CFeedbackFileErrorDlg(); -// Dialog Data - enum { IDD = IDD_FEEDBACK_FILE_ERROR_DIALOG }; - afx_msg void OnBnClickedRetryButton(); afx_msg void OnBnClickedSkipButton(); afx_msg void OnBnClickedPauseButton(); Index: src/ch/FeedbackHandler.cpp =================================================================== diff -u -r9c71c0a84781c524c0091ee86914d5cc3bbf5190 -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision 9c71c0a84781c524c0091ee86914d5cc3bbf5190) +++ src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -23,6 +23,7 @@ #include "FeedbackNotEnoughSpaceDlg.h" #include "ch.h" #include "mmsystem.h" +#include "FileInfo.h" CFeedbackHandler::CFeedbackHandler() : chcore::IFeedbackHandler() Index: src/ch/FeedbackHandler.h =================================================================== diff -u -r9c71c0a84781c524c0091ee86914d5cc3bbf5190 -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FeedbackHandler.h (.../FeedbackHandler.h) (revision 9c71c0a84781c524c0091ee86914d5cc3bbf5190) +++ src/ch/FeedbackHandler.h (.../FeedbackHandler.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -20,8 +20,9 @@ #define __FEEDBACKHANDLER_H__ #include "../libchcore/FeedbackHandlerBase.h" -#include "FileInfo.h" +class CFileInfo; + struct FEEDBACK_ALREADYEXISTS { CFileInfo* pfiSrc; Index: src/ch/FeedbackNotEnoughSpaceDlg.cpp =================================================================== diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -34,7 +34,7 @@ CFeedbackNotEnoughSpaceDlg::CFeedbackNotEnoughSpaceDlg(ull_t ullSizeRequired, const tchar_t* pszSrcPath, const tchar_t* pszDstPath) - :ictranslate::CLanguageDialog(CFeedbackNotEnoughSpaceDlg::IDD), + :ictranslate::CLanguageDialog(IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG), m_bAllItems(FALSE), m_ullRequired(ullSizeRequired), m_strDisk(pszDstPath) Index: src/ch/FeedbackNotEnoughSpaceDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FeedbackNotEnoughSpaceDlg.h (.../FeedbackNotEnoughSpaceDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/FeedbackNotEnoughSpaceDlg.h (.../FeedbackNotEnoughSpaceDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -28,12 +28,6 @@ public: CFeedbackNotEnoughSpaceDlg(ull_t ullSizeRequired, const tchar_t* pszSrcPath, const tchar_t* pszDstPath); // standard constructor -// Dialog Data - //{{AFX_DATA(CFeedbackNotEnoughSpaceDlg) - enum { IDD = IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG }; - CListBox m_ctlFiles; - //}}AFX_DATA - // Overrides protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support @@ -43,6 +37,7 @@ CString m_strDisk; ull_t m_ullRequired; std::vector m_vstrFiles; + CListBox m_ctlFiles; protected: void UpdateDialog(); Index: src/ch/FeedbackReplaceDlg.cpp =================================================================== diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -13,7 +13,7 @@ IMPLEMENT_DYNAMIC(CFeedbackReplaceDlg, ictranslate::CLanguageDialog) CFeedbackReplaceDlg::CFeedbackReplaceDlg(const CFileInfo* pfiSrcFile, const CFileInfo* pfiDstFile, CWnd* pParent /*=NULL*/) - : ictranslate::CLanguageDialog(CFeedbackReplaceDlg::IDD, pParent), + : ictranslate::CLanguageDialog(IDD_FEEDBACK_REPLACE_DIALOG, pParent), m_pfiSrcFile(pfiSrcFile), m_pfiDstFile(pfiDstFile) , m_bAllItems(FALSE) Index: src/ch/FeedbackReplaceDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -19,16 +19,11 @@ #ifndef __FEEDBACKREPLACEDLG_H__ #define __FEEDBACKREPLACEDLG_H__ -#include "afxwin.h" -#include "resource.h" class CFileInfo; class CFeedbackReplaceDlg : public ictranslate::CLanguageDialog { DECLARE_DYNAMIC(CFeedbackReplaceDlg) -public: - // Dialog Data - enum { IDD = IDD_FEEDBACK_REPLACE_DIALOG }; public: CFeedbackReplaceDlg(const CFileInfo* pfiSrcFile, const CFileInfo* pfiDstFile, CWnd* pParent = NULL); // standard constructor Index: src/ch/FileFilter.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FileFilter.h (.../FileFilter.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/FileFilter.h (.../FileFilter.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -19,8 +19,6 @@ #ifndef __FILEFILTER_H__ #define __FILEFILTER_H__ -#include - // definitions for comparing sizes and dates #define LT 0 #define LE 1 Index: src/ch/FileInfo.cpp =================================================================== diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FileInfo.cpp (.../FileInfo.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/FileInfo.cpp (.../FileInfo.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -31,7 +31,6 @@ #include "Device IO.h" #include "imagehlp.h" #include "ch.h" -#include #include "../libicpf/exception.h" #ifdef _DEBUG Index: src/ch/FilterDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FilterDlg.h (.../FilterDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/FilterDlg.h (.../FilterDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -20,7 +20,6 @@ #define __FILTERDLG_H__ #include "FileFilter.h" -#include ///////////////////////////////////////////////////////////////////////////// // CFilterDlg dialog Index: src/ch/FolderDialog.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/FolderDialog.h (.../FolderDialog.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/FolderDialog.h (.../FolderDialog.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -32,7 +32,6 @@ #ifndef __FOLDERDIALOG_H__ #define __FOLDERDIALOG_H__ -#include "afxtempl.h" #include "DirTreeCtrl.h" #include "ThemedButton.h" #include "shortcuts.h" Index: src/ch/MainWnd.cpp =================================================================== diff -u -r9c71c0a84781c524c0091ee86914d5cc3bbf5190 -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 9c71c0a84781c524c0091ee86914d5cc3bbf5190) +++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -18,30 +18,21 @@ ***************************************************************************/ #include "stdafx.h" #include "ch.h" - #include "MainWnd.h" -#include "OptionsDlg.h" -#include "shlobj.h" -#include "tchar.h" -#include "structs.h" -#include "dialogs.h" - +#include "OptionsDlg.h" #include "FolderDialog.h" - #include "CustomCopyDlg.h" -#include "btnIDs.h" -#include "..\Common\FileSupport.h" #include "AboutDlg.h" #include "register.h" #include "ShutdownDlg.h" -#include "StringHelpers.h" #include "..\common\ipcstructs.h" -#include #include "af_defs.h" #include "UpdateChecker.h" #include "UpdaterDlg.h" -#include +#include "FeedbackHandler.h" +#include "MiniviewDlg.h" +#include "StatusDlg.h" #ifdef _DEBUG #define new DEBUG_NEW Index: src/ch/MainWnd.h =================================================================== diff -u -r9c71c0a84781c524c0091ee86914d5cc3bbf5190 -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/MainWnd.h (.../MainWnd.h) (revision 9c71c0a84781c524c0091ee86914d5cc3bbf5190) +++ src/ch/MainWnd.h (.../MainWnd.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -22,11 +22,11 @@ #include "TrayIcon.h" #include "structs.h" -#include "MiniviewDlg.h" -#include "DataBuffer.h" -#include "StatusDlg.h" -#include "FeedbackHandler.h" +#include "task.h" +class CMiniViewDlg; +class CStatusDlg; + class CMainWnd : public CWnd { public: Index: src/ch/MiniViewDlg.cpp =================================================================== diff -u -ra07af504f54ceb5551be875f0f42e3134d57fabc -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision a07af504f54ceb5551be875f0f42e3134d57fabc) +++ src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -42,7 +42,7 @@ // CMiniViewDlg dialog CMiniViewDlg::CMiniViewDlg(CTaskArray* pArray, bool *pbHide, CWnd* pParent /*=NULL*/) - :ictranslate::CLanguageDialog(CMiniViewDlg::IDD, pParent, &m_bLock) + :ictranslate::CLanguageDialog(IDD_MINIVIEW_DIALOG, pParent, &m_bLock) { //{{AFX_DATA_INIT(CMiniViewDlg) // NOTE: the ClassWizard will add member initialization here Index: src/ch/MiniViewDlg.h =================================================================== diff -u -r49b67b7417f8b42ce581ebfe604f47df841f763b -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 49b67b7417f8b42ce581ebfe604f47df841f763b) +++ src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -23,7 +23,6 @@ // CMiniViewDlg dialog #include "task.h" #include "ProgressListBox.h" -#include "resource.h" #define BTN_COUNT 5 @@ -84,13 +83,8 @@ // in onmousemove points to last pressed button int m_iIndex; -// Dialog Data - //{{AFX_DATA(CMiniViewDlg) - enum { IDD = IDD_MINIVIEW_DIALOG }; CProgressListBox m_ctlStatus; - //}}AFX_DATA - // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CMiniViewDlg) Index: src/ch/OptionsDlg.cpp =================================================================== diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/OptionsDlg.cpp (.../OptionsDlg.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/OptionsDlg.cpp (.../OptionsDlg.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -24,6 +24,7 @@ #include "ShortcutsDlg.h" #include "RecentDlg.h" #include +#include "structs.h" #ifdef _DEBUG #define new DEBUG_NEW Index: src/ch/OptionsDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/OptionsDlg.h (.../OptionsDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/OptionsDlg.h (.../OptionsDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -20,8 +20,6 @@ #define __OPTIONSDLG_H__ #include "PropertyListCtrl.h" -#include "structs.h" -#include "shortcuts.h" #include "charvect.h" #define WM_CONFIGNOTIFY WM_USER+13 Index: src/ch/ProgressListBox.h =================================================================== diff -u -ra07af504f54ceb5551be875f0f42e3134d57fabc -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision a07af504f54ceb5551be875f0f42e3134d57fabc) +++ src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -19,8 +19,6 @@ #ifndef __PROGRESSLISTBOX_H__ #define __PROGRESSLISTBOX_H__ -#include "afxtempl.h" - class CTask; ///////////////////////////////////////////////////////////////////////////// Index: src/ch/PropertyListCtrl.cpp =================================================================== diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/PropertyListCtrl.cpp (.../PropertyListCtrl.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/PropertyListCtrl.cpp (.../PropertyListCtrl.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -20,6 +20,7 @@ #include "ch.h" #include "PropertyListCtrl.h" #include "dialogs.h" +#include "memdc.h" #ifdef _DEBUG #define new DEBUG_NEW Index: src/ch/PropertyListCtrl.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/PropertyListCtrl.h (.../PropertyListCtrl.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/PropertyListCtrl.h (.../PropertyListCtrl.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -19,8 +19,6 @@ #ifndef __PROPERTYLIST_H__ #define __PROPERTYLIST_H__ -#include "memdc.h" - // Property Type #define ID_PROPERTY_TEXT 1 #define ID_PROPERTY_BOOL 2 Index: src/ch/RecentDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/RecentDlg.h (.../RecentDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/RecentDlg.h (.../RecentDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -19,7 +19,6 @@ #ifndef __RECENTDLG_H__ #define __RECENTDLG_H__ -#include "afxtempl.h" #include "charvect.h" ///////////////////////////////////////////////////////////////////////////// Index: src/ch/ShortcutsDlg.cpp =================================================================== diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -20,6 +20,7 @@ #include "ch.h" #include "ShortcutsDlg.h" #include "dialogs.h" +#include "shortcuts.h" #ifdef _DEBUG #define new DEBUG_NEW Index: src/ch/Stdafx.h =================================================================== diff -u -rcaa71fb57fcfdd3b3731ed038cecc280ff69a78e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/Stdafx.h (.../Stdafx.h) (revision caa71fb57fcfdd3b3731ed038cecc280ff69a78e) +++ src/ch/Stdafx.h (.../Stdafx.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -28,7 +28,8 @@ #ifndef _AFX_NO_AFXCMN_SUPPORT #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT -#include "afxmt.h" +#include +#include #pragma warning (disable: 4711) #include "debug.h" Index: src/ch/Structs.h =================================================================== diff -u -r9c71c0a84781c524c0091ee86914d5cc3bbf5190 -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/Structs.h (.../Structs.h) (revision 9c71c0a84781c524c0091ee86914d5cc3bbf5190) +++ src/ch/Structs.h (.../Structs.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -19,10 +19,6 @@ #ifndef __STRUCTS_H__ #define __STRUCTS_H__ -#include "DestPath.h" -//#include "LogFile.h" -#include "../libicpf/log.h" - ///////////////////////////////////////////////////////////////////////////// // priority Index: src/ch/TrayIcon.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/TrayIcon.h (.../TrayIcon.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/TrayIcon.h (.../TrayIcon.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -21,8 +21,6 @@ #ifndef __TRAYICON_H__ #define __TRAYICON_H__ -#include "shellapi.h" - class CTrayIcon { public: Index: src/ch/UpdaterDlg.cpp =================================================================== diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/UpdaterDlg.cpp (.../UpdaterDlg.cpp) (revision aa6bff57279b9f9cfc276e9adab2763e2900878d) +++ src/ch/UpdaterDlg.cpp (.../UpdaterDlg.cpp) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -6,7 +6,6 @@ #include "UpdaterDlg.h" #include "UpdateChecker.h" #include "../common/version.h" -#include #define UPDATER_TIMER 639 Index: src/ch/UpdaterDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -1,5 +1,4 @@ #pragma once -#include "afxwin.h" #include "UpdateChecker.h" // CUpdaterDlg dialog Index: src/ch/shortcutsdlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/shortcutsdlg.h (.../shortcutsdlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/shortcutsdlg.h (.../shortcutsdlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -19,8 +19,6 @@ #ifndef __SHORTCUTSDLG_H__ #define __SHORTCUTSDLG_H__ -#include "afxtempl.h" -#include "shortcuts.h" #include "charvect.h" ///////////////////////////////////////////////////////////////////////////// Index: src/ch/task.h =================================================================== diff -u -r9c71c0a84781c524c0091ee86914d5cc3bbf5190 -r449a5b399ab21ca0d06050b47b264f2f704af966 --- src/ch/task.h (.../task.h) (revision 9c71c0a84781c524c0091ee86914d5cc3bbf5190) +++ src/ch/task.h (.../task.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966) @@ -69,7 +69,6 @@ ///////////////////////////////////////////////////////////////////// // CTask -class CFileInfo; class CTask; struct TASK_CREATE_DATA