Index: src/ch/ch.h
===================================================================
diff -u -N -rb684bec49aaaea4b89ab2e599497f4085d8698a3 -r3cd8d4a64a63e4fb32d7dc96e46789c713698435
--- src/ch/ch.h	(.../ch.h)	(revision b684bec49aaaea4b89ab2e599497f4085d8698a3)
+++ src/ch/ch.h	(.../ch.h)	(revision 3cd8d4a64a63e4fb32d7dc96e46789c713698435)
@@ -26,13 +26,11 @@
 #include "resource.h"       // main symbols
 #include "AppHelper.h"
 #include "CfgProperties.h"
-#include "../chext/chext.h"
 #include "../libicpf/log.h"
 #include "../libictranslate/ResourceManager.h"
 #include "../libchcore/TConfig.h"
+#include "TShellExtensionClient.h"
 
-using namespace std;
-
 /////////////////////////////////////////////////////////////////////////////
 // CCopyHandlerApp:
 // See CopyHandler.cpp for the implementation of this class
@@ -58,7 +56,8 @@
 	friend ictranslate::CResourceManager& GetResManager();
 	friend chcore::TConfig& GetConfig();
 
-	bool IsShellExtEnabled() const;
+	void RegisterShellExtension();
+	void UnregisterShellExtension();
 
 	void OnConfigNotify(const std::set<std::wstring>& setPropNames);
 	void OnResManNotify(UINT uiType);
@@ -67,9 +66,11 @@
 	bool UpdateHelpPaths();
 	HWND HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD_PTR dwData);
 
+	void InitShellExtension();
+
 protected:
 	HANDLE m_hMapObject;
-	IShellExtControl* m_piShellExtControl;
+	TShellExtensionClient m_tShellExtClient;
 
 	CWnd *m_pMainWindow;