Merge with stable

[winmerge-jp/winmerge-jp.git] / Src / 7zCommon.h

diff --git a/Src/7zCommon.h b/Src/7zCommon.h
index 8d20fc0..ca3b2ce 100644 (file)
--- a/Src/7zCommon.h
+++ b/Src/7zCommon.h
@@ -2,15 +2,15 @@
 
 // We include dllpstub.h for Merge7z.h
 // Merge7z::Proxy embeds a DLLPSTUB
-#include "dllpstub.h"
+#include <list>
+#include <map>
 #include <PropIdl.h>
+#include "dllpstub.h"
 #include "../ArchiveSupport/Merge7z/Merge7z.h"
 
-#include "DiffContext.h"
-#include <list>
-
 class CDirView;
 class CListCtrl;
+struct DIFFITEM;
 
 extern __declspec(thread) Merge7z::Proxy Merge7z;