Index: src/ch/ch.h
===================================================================
diff -u -rc085b65f1de24f25feab2bac2d5882abf04aabcf -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af
--- src/ch/ch.h	(.../ch.h)	(revision c085b65f1de24f25feab2bac2d5882abf04aabcf)
+++ src/ch/ch.h	(.../ch.h)	(revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af)
@@ -21,12 +21,12 @@
 
 #include "AppHelper.h"
 #include "../libictranslate/ResourceManager.h"
-#include "../libchcore/TConfig.h"
 #include "TShellExtensionClient.h"
 #include "TCommandLineParser.h"
 #include "../liblogger/TLogger.h"
-#include "../libchcore/TCoreEngine.h"
 #include "TShellExtensionConfig.h"
+#include "../libchengine/TConfig.h"
+#include "../libchengine/TCoreEngine.h"
 
 class CCopyHandlerApp : public CWinApp, public CAppHelper
 {
@@ -39,13 +39,13 @@
 
 	void HtmlHelp(DWORD_PTR dwData, UINT nCmd) override;
 
-	PCTSTR GetHelpPath() const { return m_pszHelpFilePath; };
+	PCTSTR GetHelpPath() const { return m_pszHelpFilePath; }
 
-	friend int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0);
+	static int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0);
 
 	friend CCopyHandlerApp& GetApplication();
 	static ictranslate::CResourceManager& GetResManager();
-	static chcore::TConfig& GetConfig();
+	static chengine::TConfig& GetConfig();
 
 	logger::TLogFileDataPtr GetLogFileData() const;
 	logger::TMultiLoggerConfigPtr GetEngineLoggerConfig() const;
@@ -54,7 +54,7 @@
 	void RegisterShellExtension();
 	void UnregisterShellExtension();
 
-	void OnConfigNotify(const chcore::TStringSet& setPropNames);
+	void OnConfigNotify(const string::TStringSet& setPropNames);
 	void OnResManNotify(UINT uiType);
 
 	const TCommandLineParser& GetCommandLine() const { return m_cmdLineParser; }
@@ -74,7 +74,7 @@
 
 	TCommandLineParser m_cmdLineParser;
 
-	chcore::TCoreEngine m_chEngine;
+	chengine::TCoreEngine m_chEngine;
 
 	TShellExtensionConfigPtr m_shellExtConfig;
 	TShellExtensionClient m_tShellExtClient;
@@ -103,7 +103,7 @@
 	return CCopyHandlerApp::GetResManager();
 }
 
-inline chcore::TConfig& GetConfig()
+inline chengine::TConfig& GetConfig()
 {
 	return CCopyHandlerApp::GetConfig();
 }
@@ -113,4 +113,9 @@
 	return GetApp().GetShellExtensionConfig();
 }
 
+inline int MsgBox(UINT uiID, UINT nType = MB_OK, UINT nIDHelp = 0)
+{
+	return GetApp().MsgBox(uiID, nType, nIDHelp);
+}
+
 #endif