Index: src/ch/TSubTaskContext.h
===================================================================
diff -u -N -rab32897e61cc637a1e28d9dc3f0489b8d16a429c -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/ch/TSubTaskContext.h	(.../TSubTaskContext.h)	(revision ab32897e61cc637a1e28d9dc3f0489b8d16a429c)
+++ src/ch/TSubTaskContext.h	(.../TSubTaskContext.h)	(revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -30,9 +30,9 @@
 	class IFeedbackHandler;
 	class TTaskDefinition;
 	class TWorkerThreadController;
+	class TBasePathDataContainer;
 }
 
-class TBasePathDataContainer;
 class TTaskLocalStats;
 class TTaskConfigTracker;
 class TTaskBasicProgressInfo;
@@ -44,16 +44,16 @@
 class TSubTaskContext
 {
 public:
-	TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats,
+	TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats,
 		TTaskBasicProgressInfo& rTaskBasicProgressInfo, TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog,
 		chcore::IFeedbackHandler* piFeedbackHandler, chcore::TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal);
 	~TSubTaskContext();
 
 	chcore::TTaskDefinition& GetTaskDefinition() { return m_rTaskDefinition; }
 	const chcore::TTaskDefinition& GetTaskDefinition() const { return m_rTaskDefinition; }
 
-	TBasePathDataContainer& GetBasePathDataContainer() { return m_rBasePathDataContainer; }
-	const TBasePathDataContainer& GetBasePathDataContainer() const { return m_rBasePathDataContainer; }
+	chcore::TBasePathDataContainer& GetBasePathDataContainer() { return m_rBasePathDataContainer; }
+	const chcore::TBasePathDataContainer& GetBasePathDataContainer() const { return m_rBasePathDataContainer; }
 
 	CFileInfoArray& GetFilesCache() { return m_rFilesCache; }
 	const CFileInfoArray& GetFilesCache() const { return m_rFilesCache; }
@@ -83,7 +83,7 @@
 	chcore::TTaskDefinition& m_rTaskDefinition;
 
 	// information about input paths
-	TBasePathDataContainer& m_rBasePathDataContainer;
+	chcore::TBasePathDataContainer& m_rBasePathDataContainer;
 
 	// data on which to operate
 	CFileInfoArray& m_rFilesCache;