Remove unused #include directives

diff --git a/Externals/crystaledit/editlib/basic.cpp b/Externals/crystaledit/editlib/basic.cpp
index 5afc9b0..cce4d69 100644 (file)
--- a/Externals/crystaledit/editlib/basic.cpp
+++ b/Externals/crystaledit/editlib/basic.cpp
@@ -16,7 +16,6 @@
 
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
-#include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
 #include "string_util.h"
 

diff --git a/Externals/crystaledit/editlib/memcombo.cpp b/Externals/crystaledit/editlib/memcombo.cpp
index 7cfd23e..b227b20 100644 (file)
--- a/Externals/crystaledit/editlib/memcombo.cpp
+++ b/Externals/crystaledit/editlib/memcombo.cpp
@@ -15,7 +15,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "StdAfx.h"
-#include "resource.h"
 #include "editreg.h"
 #include "memcombo.h"
 #include "registry.h"

diff --git a/Externals/crystaledit/editlib/verilog.cpp b/Externals/crystaledit/editlib/verilog.cpp
index fb7811c..0ecbb4d 100644 (file)
--- a/Externals/crystaledit/editlib/verilog.cpp
+++ b/Externals/crystaledit/editlib/verilog.cpp
@@ -16,7 +16,6 @@
 
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
-#include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
 #include "string_util.h"
 

diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp
index 9fb06de..cb8ba1f 100644 (file)
--- a/Src/7zCommon.cpp
+++ b/Src/7zCommon.cpp
@@ -101,7 +101,6 @@ DATE:               BY:                                     DESCRIPTION:
 #include <shlwapi.h>\r
 #include "OptionsDef.h"\r
 #include "OptionsMgr.h"\r
-#include "resource.h"\r
 #include "DirView.h"\r
 #include "DirDoc.h"\r
 #include "DirActions.h"\r

diff --git a/Src/AboutDlg.h b/Src/AboutDlg.h
index 8c0a2ed..744687d 100644 (file)
--- a/Src/AboutDlg.h
+++ b/Src/AboutDlg.h
@@ -24,7 +24,6 @@
 
 #include <memory>
 #include <Poco/BasicEvent.h>
-#include "UnicodeString.h"
 #include "MergeApp.h"
 
 class CAboutDlg

diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp
index b97b4e0..f230a32 100644 (file)
--- a/Src/Common/LanguageSelect.cpp
+++ b/Src/Common/LanguageSelect.cpp
@@ -6,7 +6,6 @@
 
 #include "StdAfx.h"
 #include "LanguageSelect.h"
-#include <locale.h>
 #include "version.h"
 #include "BCMenu.h"
 #include "Environment.h"

diff --git a/Src/Common/RegKey.cpp b/Src/Common/RegKey.cpp
index 24c5f14..a037e77 100644 (file)
--- a/Src/Common/RegKey.cpp
+++ b/Src/Common/RegKey.cpp
@@ -8,10 +8,8 @@
 #include "RegKey.h"
 #include <windows.h>
 #include <cassert>
-#include <algorithm>
 #include <strsafe.h>
 #include "UnicodeString.h"
-#include "coretypes.h"
 
 /**
  * @brief Default constructor.

diff --git a/Src/CompareEngines/TimeSizeCompare.cpp b/Src/CompareEngines/TimeSizeCompare.cpp
index b0c19ab..93c059c 100644 (file)
--- a/Src/CompareEngines/TimeSizeCompare.cpp
+++ b/Src/CompareEngines/TimeSizeCompare.cpp
@@ -5,8 +5,6 @@
  */
 
 #include "TimeSizeCompare.h"
-#include <cstdlib>
-#include <vector>
 #include <cstdint>
 #include <Poco/Timestamp.h>
 #include "DiffItem.h"

diff --git a/Src/Diff3.h b/Src/Diff3.h
index 8101542..1065d1e 100644 (file)
--- a/Src/Diff3.h
+++ b/Src/Diff3.h
@@ -2,11 +2,6 @@
 
 #include <vector>
 #include <algorithm>
-#ifdef _DEBUG
-#  define POCO_NO_UNWINDOWS 1
-#  include <Poco/Debugger.h>
-#  include <Poco/Format.h>
-#endif
 #include "DiffList.h"
 
 /* diff3 algorithm. It is almost the same as GNU diff3's algorithm */

diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp
index 215acdc..10aac34 100644 (file)
--- a/Src/DiffContext.cpp
+++ b/Src/DiffContext.cpp
@@ -26,11 +26,8 @@
 
 #include "DiffContext.h"
 #include <Poco/ScopedLock.h>
-#include <cstring>
-#include <algorithm>
 #include "CompareOptions.h"
 #include "version.h"
-#include "FilterList.h"
 #include "paths.h"
 #include "codepage_detect.h"
 #include "DiffItemList.h"

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index 1113961..7d1f934 100644 (file)
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -7,12 +7,12 @@
 
 #define POCO_NO_UNWINDOWS 1
 #include <Poco/Mutex.h>
-#include <Poco/ThreadLocal.h>
 #include <memory>
 #include <cstdint>
 #include "PathContext.h"
 #include "DiffFileInfo.h"
 #include "DiffItemList.h"
+#include "FilterList.h"
 
 class PackingInfo;
 class PrediffingInfo;
@@ -21,7 +21,6 @@ struct DIFFITEM;
 class CompareStats;
 class IAbortable;
 class CDiffWrapper;
-class FilterList;
 class CompareOptions;
 struct DIFFOPTIONS;
 class FilterCommentsManager;

diff --git a/Src/DiffFileData.cpp b/Src/DiffFileData.cpp
index 01e2695..c03b241 100644 (file)
--- a/Src/DiffFileData.cpp
+++ b/Src/DiffFileData.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "DiffFileData.h"
-#include <vector>
 #ifdef _WIN32
 #include <io.h>
 #else

diff --git a/Src/DiffList.h b/Src/DiffList.h
index 761a52a..85c7d44 100644 (file)
--- a/Src/DiffList.h
+++ b/Src/DiffList.h
@@ -21,7 +21,6 @@
  */
 #pragma once
 
-#include <map>
 #include <vector>
 #include <cstring>
 

diff --git a/Src/DiffTextBuffer.cpp b/Src/DiffTextBuffer.cpp
index 04f2ac4..a34a47f 100644 (file)
--- a/Src/DiffTextBuffer.cpp
+++ b/Src/DiffTextBuffer.cpp
@@ -7,11 +7,9 @@
 
 #include "StdAfx.h"
 #include "DiffTextBuffer.h"
-#include <cstdint>
 #include <Poco/Exception.h>
 #include "UniFile.h"
 #include "files.h"
-#include "cs2cs.h"
 #include "locality.h"
 #include "paths.h"
 #include "OptionsDef.h"

diff --git a/Src/DiffViewBar.h b/Src/DiffViewBar.h
index 0fba1a0..1792b7c 100644 (file)
--- a/Src/DiffViewBar.h
+++ b/Src/DiffViewBar.h
@@ -5,7 +5,6 @@
  */
 #pragma once
 
-#include "sizecbar.h"
 #include "scbarcf.h"
 
 class CSplitterWndEx;

diff --git a/Src/DiffWrapper.h b/Src/DiffWrapper.h
index 2b84202..611932f 100644 (file)
--- a/Src/DiffWrapper.h
+++ b/Src/DiffWrapper.h
@@ -24,11 +24,9 @@
 #pragma once
 
 #include <memory>
-#include <algorithm>
 #include "diff.h"
 #include "FileLocation.h"
 #include "PathContext.h"
-#include "FileTextStats.h"
 #include "CompareOptions.h"
 #include "DiffList.h"
 #include "UnicodeString.h"

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index db3055d..03d7346 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -22,7 +22,6 @@
 #include "FileActionScript.h"
 #include "locality.h"
 #include "FileFilterHelper.h"
-#include "OptionsMgr.h"
 
 static void ThrowConfirmCopy(const CDiffContext& ctxt, int origin, int destination, int count,
                const String& src, const String& dest, bool destIsSide);

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index dafbf37..c92e3da 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -43,7 +43,6 @@
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "OptionsDiffOptions.h"
-#include "FileActionScript.h"
 #include "LineFiltersList.h"
 #include "FileFilterHelper.h"
 #include "unicoder.h"

diff --git a/Src/DirView.h b/Src/DirView.h
index e055f80..1627cb7 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -27,7 +27,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // CDirView view
 #include <afxcview.h>
-#include <map>
 #include <memory>
 #include "OptionsDiffColors.h"
 #include "SortHeaderCtrl.h"

diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp
index 6f0ae31..b5b3390 100644 (file)
--- a/Src/DirViewColItems.cpp
+++ b/Src/DirViewColItems.cpp
@@ -23,7 +23,6 @@ using Poco::Timestamp;
 #endif
 
 using std::swap;
-using boost::int64_t;
 
 namespace
 {

diff --git a/Src/DirViewColItems.h b/Src/DirViewColItems.h
index 68322c8..dac14ae 100644 (file)
--- a/Src/DirViewColItems.h
+++ b/Src/DirViewColItems.h
@@ -10,7 +10,6 @@
 #include "UnicodeString.h"
 #include <vector>
 #include <sstream>
-#include <cassert>
 
 struct DIFFITEM;
 class CDiffContext;

diff --git a/Src/Environment.cpp b/Src/Environment.cpp
index 43b0391..eec0f0d 100644 (file)
--- a/Src/Environment.cpp
+++ b/Src/Environment.cpp
@@ -8,7 +8,6 @@
 #include "Environment.h"
 #include <windows.h>
 #include <shlobj.h>
-#include <cassert>
 #include <sstream>
 #include <Poco/Path.h>
 #include <Poco/Process.h>

diff --git a/Src/Exceptions.h b/Src/Exceptions.h
index 14b3113..308fa89 100644 (file)
--- a/Src/Exceptions.h
+++ b/Src/Exceptions.h
@@ -27,15 +27,12 @@
 
 #ifdef _MSC_VER
 
-#include <cstdio>
 #include <windows.h>
 #include <tchar.h>
 #include <strsafe.h>
 
 #endif
 
-#include "UnicodeString.h"
-
 /**
  * @brief C exception "wrapper" class for C++ try/catch
  *

diff --git a/Src/FileFilterMgr.cpp b/Src/FileFilterMgr.cpp
index 2bbfcfd..8eaadc9 100644 (file)
--- a/Src/FileFilterMgr.cpp
+++ b/Src/FileFilterMgr.cpp
@@ -20,7 +20,6 @@
 
 #include "FileFilterMgr.h"
 #include <vector>
-#include <cstring>
 #include <Poco/String.h>
 #include <Poco/Glob.h>
 #include <Poco/DirectoryIterator.h>

diff --git a/Src/FileOrFolderSelect.cpp b/Src/FileOrFolderSelect.cpp
index 5d321f1..01319ac 100644 (file)
--- a/Src/FileOrFolderSelect.cpp
+++ b/Src/FileOrFolderSelect.cpp
@@ -31,7 +31,6 @@
 #include "Environment.h"
 #include "paths.h"
 #include "MergeApp.h"
-#include "resource.h"
 
 static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam,
                LPARAM lpData);

diff --git a/Src/FileTransform.cpp b/Src/FileTransform.cpp
index 63af2c6..1a7f3c8 100644 (file)
--- a/Src/FileTransform.cpp
+++ b/Src/FileTransform.cpp
@@ -28,7 +28,6 @@
 #include <vector>
 #include <Poco/Exception.h>
 #include "Plugins.h"
-#include "paths.h"
 #include "multiformatText.h"
 #include "UniMarkdownFile.h"
 #include "Environment.h"

diff --git a/Src/FileTransform.h b/Src/FileTransform.h
index 69dc060..0e3e9c1 100644 (file)
--- a/Src/FileTransform.h
+++ b/Src/FileTransform.h
@@ -27,7 +27,6 @@
 
 #include <vector>
 #include "UnicodeString.h"
-#include "resource.h"
 #include "MergeApp.h"
 
 class UniFile;

diff --git a/Src/FilepathEdit.cpp b/Src/FilepathEdit.cpp
index ca39425..9303275 100644 (file)
--- a/Src/FilepathEdit.cpp
+++ b/Src/FilepathEdit.cpp
@@ -31,7 +31,6 @@
 #include "ClipBoard.h"
 #include "Shlwapi.h"
 #include "paths.h"
-#include <algorithm>
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

diff --git a/Src/FilterCommentsManager.cpp b/Src/FilterCommentsManager.cpp
index 36f7f4d..97b9721 100644 (file)
--- a/Src/FilterCommentsManager.cpp
+++ b/Src/FilterCommentsManager.cpp
@@ -23,7 +23,6 @@
 #include "FilterCommentsManager.h"\r
 #include <Poco/Util/IniFileConfiguration.h>\r
 #include <Poco/AutoPtr.h>\r
-#include <string>\r
 #include <map>\r
 #include <cstdio>\r
 #include <memory>\r

diff --git a/Src/FilterList.h b/Src/FilterList.h
index 4fbc62e..efaaac0 100644 (file)
--- a/Src/FilterList.h
+++ b/Src/FilterList.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include <vector>
-#include <string>
 #include <memory>
 #define POCO_NO_UNWINDOWS 1
 #include <Poco/RegularExpression.h>

diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp
index 5f78ff8..be16507 100644 (file)
--- a/Src/FolderCmp.cpp
+++ b/Src/FolderCmp.cpp
@@ -15,10 +15,7 @@
 #include "DiffList.h"
 #include "DiffWrapper.h"
 #include "FileTransform.h"
-#include "IAbortable.h"
-#include "ByteComparator.h"
 #include "codepage_detect.h"
-#include "unicoder.h"
 #include "BinaryCompare.h"
 #include "TimeSizeCompare.h"
 #include "TFile.h"
@@ -377,10 +374,10 @@ exitPrepAndCompare:
                if (nDirs > 2 && filepathUnpacked[2] != files[2])
                        try { TFile(filepathUnpacked[2]).remove(); } catch (...) { LogErrorString(string_format(_T("DeleteFile(%s) failed"), filepathUnpacked[2].c_str())); }
 
-               if (!pCtxt->m_bIgnoreCodepage && \r
-                   (code & DIFFCODE::COMPAREFLAGS) == DIFFCODE::SAME &&\r
-                   !std::equal(encoding + 1, encoding + nDirs, encoding))\r
-                       code = (code & ~DIFFCODE::COMPAREFLAGS) | DIFFCODE::DIFF;\r
+               if (!pCtxt->m_bIgnoreCodepage && 
+                   (code & DIFFCODE::COMPAREFLAGS) == DIFFCODE::SAME &&
+                   !std::equal(encoding + 1, encoding + nDirs, encoding))
+                       code = (code & ~DIFFCODE::COMPAREFLAGS) | DIFFCODE::DIFF;
        }
        else if (nCompMethod == CMP_BINARY_CONTENT)
        {

diff --git a/Src/HexMergeDoc.cpp b/Src/HexMergeDoc.cpp
index 3a23411..11bdeb9 100644 (file)
--- a/Src/HexMergeDoc.cpp
+++ b/Src/HexMergeDoc.cpp
@@ -29,12 +29,10 @@
 #include "HexMergeDoc.h"
 #include <afxinet.h>
 #include "UnicodeString.h"
-#include "FileTextEncoding.h"
 #include "HexMergeFrm.h"
 #include "HexMergeView.h"
 #include "DiffItem.h"
 #include "FolderCmp.h"
-#include "Environment.h"
 #include "DiffContext.h"       // FILE_SAME
 #include "DirDoc.h"
 #include "DirActions.h"

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index cf087bd..a5a2c15 100644 (file)
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -45,8 +45,6 @@
 #include "Constants.h"
 #include "DropHandler.h"
 #include <cmath>
-#include <cstdint>
-#include <Shlwapi.h>
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

diff --git a/Src/IntToIntMap.h b/Src/IntToIntMap.h
index 60474a4..81ad4e7 100644 (file)
--- a/Src/IntToIntMap.h
+++ b/Src/IntToIntMap.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <map>
+
 /**
  * @brief An int->int map with helper methods for finding largest bin
  */

diff --git a/Src/JumpList.cpp b/Src/JumpList.cpp
index e26cabe..fa6eea0 100644 (file)
--- a/Src/JumpList.cpp
+++ b/Src/JumpList.cpp
@@ -6,7 +6,6 @@
  */
 #include "JumpList.h"
 #include <vector>
-#include <ObjBase.h>
 #include <ShlObj.h>
 #include <propvarutil.h>
 #include <propkey.h>

diff --git a/Src/LineFiltersList.cpp b/Src/LineFiltersList.cpp
index c61ebd6..49f1dbd 100644 (file)
--- a/Src/LineFiltersList.cpp
+++ b/Src/LineFiltersList.cpp
@@ -7,8 +7,6 @@
 #include "LineFiltersList.h"
 #include <vector>
 #include <cassert>
-#include <cstring>
-#include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "UnicodeString.h"
 

diff --git a/Src/LoadSaveCodepageDlg.cpp b/Src/LoadSaveCodepageDlg.cpp
index 6b96b97..cd3afd6 100644 (file)
--- a/Src/LoadSaveCodepageDlg.cpp
+++ b/Src/LoadSaveCodepageDlg.cpp
@@ -7,7 +7,6 @@
 #include "stdafx.h"
 #include "LoadSaveCodepageDlg.h"
 #include "resource.h"
-#include "unicoder.h"
 #include "ExConverter.h"
 
 #ifdef _DEBUG

diff --git a/Src/LocationBar.h b/Src/LocationBar.h
index b412032..450906b 100644 (file)
--- a/Src/LocationBar.h
+++ b/Src/LocationBar.h
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include "sizecbar.h"
 #include "scbarcf.h"
 
 

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 9cafaa7..3f0e57f 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -27,9 +27,6 @@
 #include "StdAfx.h"
 #include "MainFrm.h"
 #include <vector>
-#include <Poco/Exception.h>
-#include <shlwapi.h>
-#include <Poco/Exception.h>
 #include <afxinet.h>
 #include <boost/range/mfc.hpp>
 #include "Constants.h"
@@ -44,7 +41,6 @@
 #include "DirView.h"
 #include "DirDoc.h"
 #include "OpenDoc.h"
-#include "OpenView.h"
 #include "MergeDoc.h"
 #include "MergeEditView.h"
 #include "HexMergeDoc.h"
@@ -56,7 +52,6 @@
 #include "Environment.h"
 #include "PatchTool.h"
 #include "Plugins.h"
-#include "SelectUnpackerDlg.h"
 #include "ConfigLog.h"
 #include "7zCommon.h"
 #include "Merge7zFormatMergePluginImpl.h"
@@ -65,16 +60,13 @@
 #include "OptionsDef.h"
 #include "codepage_detect.h"
 #include "unicoder.h"
-#include "codepage.h"
 #include "PreferencesDlg.h"
 #include "ProjectFilePathsDlg.h"
 #include "FileOrFolderSelect.h"
-#include "unicoder.h"
 #include "PluginsListDlg.h"
 #include "stringdiffs.h"
 #include "MergeCmdLineInfo.h"
 #include "OptionsFont.h"
-#include "TFile.h"
 #include "JumpList.h"
 #include "DropHandler.h"
 #include "LanguageSelect.h"

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index fa9d8d6..b161bb1 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -62,14 +62,11 @@
 #include "OptionsDef.h"
 #include "MergeCmdLineInfo.h"
 #include "ConflictFileParser.h"
-#include "codepage.h"
 #include "JumpList.h"
-#include "paths.h"
 #include "stringdiffs.h"
 #include "TFile.h"
 #include "SourceControl.h"
 #include "paths.h"
-#include "Constants.h"
 
 // For shutdown cleanup
 #include "charsets.h"

diff --git a/Src/Merge7zFormatShellImpl.cpp b/Src/Merge7zFormatShellImpl.cpp
index f8b1fbf..4abef40 100644 (file)
--- a/Src/Merge7zFormatShellImpl.cpp
+++ b/Src/Merge7zFormatShellImpl.cpp
@@ -9,7 +9,6 @@
 #include <comip.h>
 #include <vector>
 #include "unicoder.h"
-#include "paths.h"
 #include "Merge7zFormatRegister.h"
 
 typedef _com_ptr_t<_com_IIID<IFileOperation, &__uuidof(IFileOperation)>> IFileOperationPtr;

diff --git a/Src/MergeApp.cpp b/Src/MergeApp.cpp
index aeb986a..2c7af3b 100644 (file)
--- a/Src/MergeApp.cpp
+++ b/Src/MergeApp.cpp
@@ -3,7 +3,6 @@
 #include "Merge.h"
 #include "version.h"
 #include "paths.h"
-#include "Environment.h"
 #include "Constants.h"
 #include "unicoder.h"
 

diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp
index d041d9b..569973b 100644 (file)
--- a/Src/MergeCmdLineInfo.cpp
+++ b/Src/MergeCmdLineInfo.cpp
@@ -28,8 +28,6 @@
 
 
 #include "MergeCmdLineInfo.h"
-#include <cstring>
-#include <algorithm>
 #include "Constants.h"
 #include "Paths.h"
 #include "OptionsDef.h"

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 890edd1..a125a46 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -27,17 +27,13 @@
 
 #include "StdAfx.h"
 #include "MergeDoc.h"
-#include <cstdint>
-#include <shlwapi.h>           // PathCompactPathEx()
 #include <io.h>
 #include <Poco/Timestamp.h>
-#include <Poco/Exception.h>
 #include "UnicodeString.h"
 #include "Merge.h"
 #include "MainFrm.h"
 #include "DiffTextBuffer.h"
 #include "Environment.h"
-#include "DiffContext.h"       // FILE_SAME
 #include "MovedLines.h"
 #include "MergeEditView.h"
 #include "ChildFrm.h"
@@ -50,7 +46,6 @@
 #include "DiffFileInfo.h"
 #include "SaveClosingDlg.h"
 #include "DiffList.h"
-#include "codepage.h"
 #include "paths.h"
 #include "OptionsMgr.h"
 #include "OptionsDiffOptions.h"

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 79e5b28..96cb32e 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -40,7 +40,6 @@
 #include "OptionsDef.h"
 #include "SyntaxColors.h"
 #include "ChildFrm.h"
-#include "unicoder.h"
 #include "MergeLineFlags.h"
 #include "paths.h"
 #include "DropHandler.h"

diff --git a/Src/OpenView.cpp b/Src/OpenView.cpp
index b69fcf0..538acbe 100644 (file)
--- a/Src/OpenView.cpp
+++ b/Src/OpenView.cpp
@@ -27,7 +27,6 @@
 #include "stdafx.h"
 #include "OpenView.h"
 #include <vector>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include "UnicodeString.h"
 #include "Merge.h"

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
index dbab7be..21b13be 100644 (file)
--- a/Src/OptionsInit.cpp
+++ b/Src/OptionsInit.cpp
@@ -12,7 +12,6 @@
 #include "OptionsDiffColors.h"
 #include "OptionsFont.h"
 #include "DiffWrapper.h" // CMP_CONTENT
-#include "unicoder.h"
 #include "SourceControl.h"
 #include "paths.h"
 #include "Environment.h"

diff --git a/Src/PatchDlg.cpp b/Src/PatchDlg.cpp
index 3472d77..c861aa6 100644 (file)
--- a/Src/PatchDlg.cpp
+++ b/Src/PatchDlg.cpp
@@ -26,7 +26,6 @@
 #include "diff.h"
 #include "paths.h"
 #include "CompareOptions.h"
-#include "PatchHTML.h"
 #include "FileOrFolderSelect.h"
 #include "Environment.h"
 

diff --git a/Src/PathContext.cpp b/Src/PathContext.cpp
index 14486bf..8d7bfaa 100644 (file)
--- a/Src/PathContext.cpp
+++ b/Src/PathContext.cpp
@@ -7,9 +7,7 @@
 
 #include "PathContext.h"
 #include <cassert>
-#include <algorithm>
 #include "paths.h"
-#include "Environment.h"
 
 /**
  * @brief Copy constructor.

diff --git a/Src/PropArchive.cpp b/Src/PropArchive.cpp
index 8af5683..f8f9575 100644 (file)
--- a/Src/PropArchive.cpp
+++ b/Src/PropArchive.cpp
@@ -6,7 +6,6 @@
 
 #include "stdafx.h"
 #include "PropArchive.h"
-#include "Constants.h"
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "OptionsPanel.h"

diff --git a/Src/PropShell.cpp b/Src/PropShell.cpp
index 78a08ea..851e604 100644 (file)
--- a/Src/PropShell.cpp
+++ b/Src/PropShell.cpp
@@ -8,7 +8,6 @@
 #include "stdafx.h"
 #include "PropShell.h"
 #include "RegKey.h"
-#include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "OptionsPanel.h"
 #include "Constants.h"

diff --git a/Src/TempFile.cpp b/Src/TempFile.cpp
index e955c7f..c487ab6 100644 (file)
--- a/Src/TempFile.cpp
+++ b/Src/TempFile.cpp
@@ -9,7 +9,6 @@
 #include <windows.h>
 #include <tlhelp32.h> 
 #include <shlwapi.h>
-#include <algorithm>
 #include "paths.h"
 #include "Environment.h"
 #include "Constants.h"

diff --git a/Src/VSSHelper.cpp b/Src/VSSHelper.cpp
index 346220f..37fd63f 100644 (file)
--- a/Src/VSSHelper.cpp
+++ b/Src/VSSHelper.cpp
@@ -23,13 +23,11 @@
 
 #include "VSSHelper.h"
 #include <windows.h>
-#include <algorithm>
 #include <cassert>
 #include "UnicodeString.h"
 #include "paths.h"
 #include "Environment.h"
 #include "MergeApp.h"
-#include "resource.h"
 
 String VSSHelper::GetProjectBase() const
 {

diff --git a/Src/paths.cpp b/Src/paths.cpp
index de4e4a5..7403efd 100644 (file)
--- a/Src/paths.cpp
+++ b/Src/paths.cpp
@@ -13,7 +13,6 @@
 #include <shlobj.h>
 #include <shlwapi.h>
 #include "PathContext.h"
-#include "unicoder.h"
 #include "coretools.h"
 
 static bool IsSlash(const String& pszStart, size_t nPos);

diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp
index 8bf3929..76fc93e 100644 (file)
--- a/Src/stringdiffs.cpp
+++ b/Src/stringdiffs.cpp
@@ -9,9 +9,7 @@
 #define NOMINMAX
 #include <windows.h>
 #include <tchar.h>
-#include <cstring>
 #include <cassert>
-#include <climits>
 #include <mbctype.h>
 #include "CompareOptions.h"
 #include "stringdiffsi.h"

diff --git a/Testing/GoogleTest/Paths/paths_test.cpp b/Testing/GoogleTest/Paths/paths_test.cpp
index 8b9d180..1c88723 100644 (file)
--- a/Testing/GoogleTest/Paths/paths_test.cpp
+++ b/Testing/GoogleTest/Paths/paths_test.cpp
@@ -1,8 +1,5 @@
 #include <gtest/gtest.h>\r
 #include <windows.h>\r
-#include <tchar.h>\r
-#include <io.h>\r
-#include <direct.h>\r
 #include "paths.h"\r
 \r
 // Expects that C:\Temp exists for creating temporary testing files.\r

diff --git a/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp b/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp
index 347f62b..7d28d3d 100644 (file)
--- a/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp
+++ b/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp
@@ -2,7 +2,6 @@
 #include <windows.h>
 #include <tchar.h>
 #include <vector>
-#include <direct.h>
 #include "UnicodeString.h"
 #include "ShellFileOperations.h"
 

diff --git a/Testing/GoogleTest/unicoder/unicoder_test.cpp b/Testing/GoogleTest/unicoder/unicoder_test.cpp
index 94ab8ce..a8681bd 100644 (file)
--- a/Testing/GoogleTest/unicoder/unicoder_test.cpp
+++ b/Testing/GoogleTest/unicoder/unicoder_test.cpp
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+#include "codepage.h"
 #include "unicoder.h"
 
 namespace