diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index c02cf460..19ba6847 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -29,14 +29,12 @@ libbase_a_SOURCES =			\
 	CLog.cpp				\
 	CStopwatch.cpp			\
 	CString.cpp				\
-	CUnicode.cpp			\
 	XBase.cpp				\
 	BasicTypes.h			\
 	CFunctionJob.h			\
 	CLog.h					\
 	CStopwatch.h			\
 	CString.h				\
-	CUnicode.h				\
 	IInterface.h			\
 	IJob.h					\
 	TMethodJob.h			\
diff --git a/lib/base/CUnicode.cpp b/lib/io/CUnicode.cpp
similarity index 100%
rename from lib/base/CUnicode.cpp
rename to lib/io/CUnicode.cpp
diff --git a/lib/base/CUnicode.h b/lib/io/CUnicode.h
similarity index 100%
rename from lib/base/CUnicode.h
rename to lib/io/CUnicode.h
diff --git a/lib/io/Makefile.am b/lib/io/Makefile.am
index 1309e7d5..69665e80 100644
--- a/lib/io/Makefile.am
+++ b/lib/io/Makefile.am
@@ -30,12 +30,14 @@ libio_a_SOURCES = 				\
 	CInputStreamFilter.cpp		\
 	COutputStreamFilter.cpp		\
 	CStreamBuffer.cpp			\
+	CUnicode.cpp				\
 	XIO.cpp						\
 	CBufferedInputStream.h		\
 	CBufferedOutputStream.h		\
 	CInputStreamFilter.h		\
 	COutputStreamFilter.h		\
 	CStreamBuffer.h				\
+	CUnicode.h					s\
 	IInputStream.h				\
 	IOutputStream.h				\
 	IStreamFilterFactory.h		\
diff --git a/lib/platform/Makefile.am b/lib/platform/Makefile.am
index 8da68bf3..53511b5d 100644
--- a/lib/platform/Makefile.am
+++ b/lib/platform/Makefile.am
@@ -69,5 +69,6 @@ EXTRA_libplatform_a_SOURCES =				\
 INCLUDES =									\
 	-I$(VDEPTH)/lib/base 					\
 	-I$(VDEPTH)/lib/mt	 					\
+	-I$(VDEPTH)/lib/io	 					\
 	-I$(VDEPTH)/lib/synergy 				\
 	$(NULL)