Index: src/libchcore/TPath.h
===================================================================
diff -u -N -rb26ced3298e3e7e51d91f3ac70b56746786da83b -r0d5b67ee96b435d63f7bf075dc8e28603793b187
--- src/libchcore/TPath.h	(.../TPath.h)	(revision b26ced3298e3e7e51d91f3ac70b56746786da83b)
+++ src/libchcore/TPath.h	(.../TPath.h)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
@@ -19,11 +19,11 @@
 #ifndef __TPATH_H__
 #define __TPATH_H__
 
-#include "TString.h"
+#include "../libstring/TString.h"
+#include "libchcore.h"
 
 namespace chcore
 {
-	class TSmartPath;
 	class TPathContainer;
 
 	class LIBCHCORE_API TSmartPath
@@ -46,10 +46,10 @@
 
 		// from/to string conversions
 		void FromString(const wchar_t* pszPath);
-		void FromString(const TString& strPath);
+		void FromString(const string::TString& strPath);
 
 		const wchar_t* ToString() const;
-		TString ToWString() const;
+		string::TString ToWString() const;
 
 		// other operations
 		void Clear() throw();
@@ -119,11 +119,11 @@
 		static bool IsSeparator(wchar_t wchSeparator);
 
 	protected:
-		TString m_strPath;
+		string::TString m_strPath;
 	};
 
 	LIBCHCORE_API TSmartPath PathFromString(const wchar_t* pszPath);
-	LIBCHCORE_API TSmartPath PathFromWString(const TString& strPath);
+	LIBCHCORE_API TSmartPath PathFromWString(const string::TString& strPath);
 
 	inline std::wostream& operator<<(std::wostream& os, const TSmartPath& rPath)
 	{