Index: src/ch/ClipboardMonitor.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -rbeaf6c76a528f2bcf42efa705770079fd84c0156
--- src/ch/ClipboardMonitor.h	(.../ClipboardMonitor.h)	(revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/ch/ClipboardMonitor.h	(.../ClipboardMonitor.h)	(revision beaf6c76a528f2bcf42efa705770079fd84c0156)
@@ -22,6 +22,8 @@
 #ifndef __CLIPBOARDMONITOR_H__
 #define __CLIPBOARDMONITOR_H__
 
+#include "..\libchcore\TWorkerThreadController.h"
+
 namespace chcore
 {
 	class TTaskManager;
Index: src/ch/MainWnd.cpp
===================================================================
diff -u -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 -rbeaf6c76a528f2bcf42efa705770079fd84c0156
--- src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66)
+++ src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision beaf6c76a528f2bcf42efa705770079fd84c0156)
@@ -44,6 +44,7 @@
 #include "TRecentPathsTools.h"
 #include "DirectoryChooser.h"
 #include "FeedbackHandlerFactory.h"
+#include "../libchcore/TTask.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
Index: src/ch/MiniViewDlg.h
===================================================================
diff -u -ra5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8 -rbeaf6c76a528f2bcf42efa705770079fd84c0156
--- src/ch/MiniViewDlg.h	(.../MiniViewDlg.h)	(revision a5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8)
+++ src/ch/MiniViewDlg.h	(.../MiniViewDlg.h)	(revision beaf6c76a528f2bcf42efa705770079fd84c0156)
@@ -22,11 +22,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // CMiniViewDlg dialog
 #include "ProgressListBox.h"
-#include "..\libchcore\TTask.h"
 
 namespace chcore
 {
-	class chcore::TTaskManager;
+	class TTaskManager;
 }
 
 #define BTN_COUNT 5
Index: src/libictranslate/ResourceManager.cpp
===================================================================
diff -u -r982c83aa62ee2e25f792d1d7ecc2e09d36f17179 -rbeaf6c76a528f2bcf42efa705770079fd84c0156
--- src/libictranslate/ResourceManager.cpp	(.../ResourceManager.cpp)	(revision 982c83aa62ee2e25f792d1d7ecc2e09d36f17179)
+++ src/libictranslate/ResourceManager.cpp	(.../ResourceManager.cpp)	(revision beaf6c76a528f2bcf42efa705770079fd84c0156)
@@ -877,21 +877,20 @@
 	if(!pszFolder || !pvData)
 		return;
 
-	TCHAR szPath[_MAX_PATH];
-	_tcscpy(szPath, pszFolder);
-	_tcscat(szPath, _T("*.lng"));
+	CString strPath = pszFolder;
+	strPath += _T("*.lng");
 	
 	WIN32_FIND_DATA wfd;
-	HANDLE hFind=::FindFirstFile(szPath, &wfd);
+	HANDLE hFind=::FindFirstFile(strPath, &wfd);
 	BOOL bFound=TRUE;
 	CLangData ld;
 	while (bFound && hFind != INVALID_HANDLE_VALUE)
 	{
 		if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
 		{
-			_tcscpy(szPath, pszFolder);
-			_tcscat(szPath, wfd.cFileName);
-			if (ld.ReadInfo(szPath))
+			strPath = pszFolder;
+			strPath += wfd.cFileName;
+			if (ld.ReadInfo(strPath))
 				pvData->push_back(ld);
 		}