diff --git a/samples/Makefile.dep b/samples/Makefile.dep
index ff14ffb..c47d6be 100644
--- a/samples/Makefile.dep
+++ b/samples/Makefile.dep
@@ -13,8 +13,7 @@
 ./main.o: ../../pikotools/src/textstream/stream.h
 ./main.o: ../../pikotools/src/date/date.h
 ./main.o: ../../pikotools/src/membuffer/membuffer.h
-./main.o: ../../pikotools/src/textstream/types.h
-./main.o: ../../pikotools/src/utf8/utf8_stream.h ../src/modelconnector.h
+./main.o: ../../pikotools/src/textstream/types.h ../src/modelconnector.h
 ./main.o: ../src/clearer.h ../src/ft.h ../src/dbconnector.h
 ./main.o: ../../pikotools/src/log/log.h ../../pikotools/src/log/filelog.h
 ./main.o: ../src/queryresult.h ../src/flatconnector.h ../src/dbexpression.h
diff --git a/src/Makefile.dep b/src/Makefile.dep
index 8c1ebc3..21d5cf4 100644
--- a/src/Makefile.dep
+++ b/src/Makefile.dep
@@ -12,8 +12,7 @@
 ./baseexpression.o: ../../pikotools/src/utf8/utf8_private.h
 ./baseexpression.o: ../../pikotools/src/date/date.h
 ./baseexpression.o: ../../pikotools/src/membuffer/membuffer.h
-./baseexpression.o: ../../pikotools/src/textstream/types.h
-./baseexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h
+./baseexpression.o: ../../pikotools/src/textstream/types.h morm_types.h
 ./baseexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h
 ./baseexpression.o: ../../pikotools/src/log/log.h
 ./baseexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h
@@ -33,8 +32,7 @@
 ./clearer.o: ../../pikotools/src/textstream/textstream.h
 ./clearer.o: ../../pikotools/src/textstream/stream.h
 ./clearer.o: ../../pikotools/src/membuffer/membuffer.h
-./clearer.o: ../../pikotools/src/textstream/types.h
-./clearer.o: ../../pikotools/src/utf8/utf8_stream.h modelconnector.h
+./clearer.o: ../../pikotools/src/textstream/types.h modelconnector.h
 ./clearer.o: dbconnector.h ../../pikotools/src/log/log.h
 ./clearer.o: ../../pikotools/src/log/filelog.h queryresult.h flatconnector.h
 ./clearer.o: dbexpression.h baseexpression.h morm_types.h modelenv.h
@@ -56,8 +54,7 @@
 ./dbconnector.o: ../../pikotools/src/space/space.h
 ./dbconnector.o: ../../pikotools/src/date/date.h
 ./dbconnector.o: ../../pikotools/src/membuffer/membuffer.h
-./dbconnector.o: ../../pikotools/src/textstream/types.h
-./dbconnector.o: ../../pikotools/src/utf8/utf8_stream.h dbconnector.h
+./dbconnector.o: ../../pikotools/src/textstream/types.h dbconnector.h
 ./dbconnector.o: ../../pikotools/src/log/log.h
 ./dbconnector.o: ../../pikotools/src/log/filelog.h queryresult.h ft.h
 ./dbconnector.o: dbexpression.h baseexpression.h morm_types.h modelenv.h
@@ -85,8 +82,7 @@
 ./dbexpression.o: ../../pikotools/src/utf8/utf8_private.h
 ./dbexpression.o: ../../pikotools/src/date/date.h
 ./dbexpression.o: ../../pikotools/src/membuffer/membuffer.h
-./dbexpression.o: ../../pikotools/src/textstream/types.h
-./dbexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h
+./dbexpression.o: ../../pikotools/src/textstream/types.h morm_types.h
 ./dbexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h
 ./dbexpression.o: ../../pikotools/src/log/log.h
 ./dbexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h
@@ -106,8 +102,7 @@
 ./flatconnector.o: ../../pikotools/src/utf8/utf8_private.h
 ./flatconnector.o: ../../pikotools/src/date/date.h
 ./flatconnector.o: ../../pikotools/src/membuffer/membuffer.h
-./flatconnector.o: ../../pikotools/src/textstream/types.h
-./flatconnector.o: ../../pikotools/src/utf8/utf8_stream.h flatexpression.h
+./flatconnector.o: ../../pikotools/src/textstream/types.h flatexpression.h
 ./flatconnector.o: baseexpression.h morm_types.h modelenv.h modeldata.h
 ./flatconnector.o: cursorhelper.h queryresult.h ../../pikotools/src/log/log.h
 ./flatconnector.o: ../../pikotools/src/log/filelog.h finderhelper.h
@@ -127,8 +122,7 @@
 ./flatexpression.o: ../../pikotools/src/utf8/utf8_private.h
 ./flatexpression.o: ../../pikotools/src/date/date.h
 ./flatexpression.o: ../../pikotools/src/membuffer/membuffer.h
-./flatexpression.o: ../../pikotools/src/textstream/types.h
-./flatexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h
+./flatexpression.o: ../../pikotools/src/textstream/types.h morm_types.h
 ./flatexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h
 ./flatexpression.o: ../../pikotools/src/log/log.h
 ./flatexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h
@@ -147,8 +141,7 @@
 ./jsonconnector.o: ../../pikotools/src/utf8/utf8_private.h
 ./jsonconnector.o: ../../pikotools/src/date/date.h
 ./jsonconnector.o: ../../pikotools/src/membuffer/membuffer.h
-./jsonconnector.o: ../../pikotools/src/textstream/types.h
-./jsonconnector.o: ../../pikotools/src/utf8/utf8_stream.h jsonexpression.h
+./jsonconnector.o: ../../pikotools/src/textstream/types.h jsonexpression.h
 ./jsonconnector.o: flatexpression.h baseexpression.h morm_types.h modelenv.h
 ./jsonconnector.o: modeldata.h cursorhelper.h queryresult.h
 ./jsonconnector.o: ../../pikotools/src/log/log.h
@@ -168,8 +161,7 @@
 ./jsonexpression.o: ../../pikotools/src/utf8/utf8_private.h
 ./jsonexpression.o: ../../pikotools/src/date/date.h
 ./jsonexpression.o: ../../pikotools/src/membuffer/membuffer.h
-./jsonexpression.o: ../../pikotools/src/textstream/types.h
-./jsonexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h
+./jsonexpression.o: ../../pikotools/src/textstream/types.h morm_types.h
 ./jsonexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h
 ./jsonexpression.o: ../../pikotools/src/log/log.h
 ./jsonexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h
@@ -189,8 +181,7 @@
 ./model.o: ../../pikotools/src/utf8/utf8_private.h
 ./model.o: ../../pikotools/src/date/date.h
 ./model.o: ../../pikotools/src/membuffer/membuffer.h
-./model.o: ../../pikotools/src/textstream/types.h
-./model.o: ../../pikotools/src/utf8/utf8_stream.h modelconnector.h clearer.h
+./model.o: ../../pikotools/src/textstream/types.h modelconnector.h clearer.h
 ./model.o: ft.h dbconnector.h ../../pikotools/src/log/log.h
 ./model.o: ../../pikotools/src/log/filelog.h queryresult.h flatconnector.h
 ./model.o: dbexpression.h baseexpression.h morm_types.h modelenv.h
@@ -211,7 +202,6 @@
 ./modelconnector.o: ../../pikotools/src/textstream/stream.h
 ./modelconnector.o: ../../pikotools/src/membuffer/membuffer.h
 ./modelconnector.o: ../../pikotools/src/textstream/types.h
-./modelconnector.o: ../../pikotools/src/utf8/utf8_stream.h
 ./modelconnector.o: ../../pikotools/src/log/log.h
 ./modelconnector.o: ../../pikotools/src/log/filelog.h queryresult.h
 ./modelconnector.o: flatconnector.h
@@ -228,7 +218,6 @@
 ./postgresqlconnector.o: ../../pikotools/src/date/date.h
 ./postgresqlconnector.o: ../../pikotools/src/membuffer/membuffer.h
 ./postgresqlconnector.o: ../../pikotools/src/textstream/types.h
-./postgresqlconnector.o: ../../pikotools/src/utf8/utf8_stream.h
 ./postgresqlconnector.o: ../../pikotools/src/log/log.h
 ./postgresqlconnector.o: ../../pikotools/src/log/filelog.h queryresult.h ft.h
 ./postgresqlconnector.o: postgresqlqueryresult.h postgresqlexpression.h
@@ -253,8 +242,7 @@
 ./postgresqlexpression.o: ../../pikotools/src/utf8/utf8_private.h
 ./postgresqlexpression.o: ../../pikotools/src/date/date.h
 ./postgresqlexpression.o: ../../pikotools/src/membuffer/membuffer.h
-./postgresqlexpression.o: ../../pikotools/src/textstream/types.h
-./postgresqlexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h
+./postgresqlexpression.o: ../../pikotools/src/textstream/types.h morm_types.h
 ./postgresqlexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h
 ./postgresqlexpression.o: ../../pikotools/src/log/log.h
 ./postgresqlexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h
@@ -275,7 +263,6 @@
 ./postgresqlqueryresult.o: ../../pikotools/src/date/date.h
 ./postgresqlqueryresult.o: ../../pikotools/src/membuffer/membuffer.h
 ./postgresqlqueryresult.o: ../../pikotools/src/textstream/types.h
-./postgresqlqueryresult.o: ../../pikotools/src/utf8/utf8_stream.h
 ./postgresqlqueryresult.o: ../../pikotools/src/log/filelog.h
 ./queryresult.o: queryresult.h ../../pikotools/src/log/log.h
 ./queryresult.o: ../../pikotools/src/textstream/textstream.h
@@ -290,7 +277,6 @@
 ./queryresult.o: ../../pikotools/src/date/date.h
 ./queryresult.o: ../../pikotools/src/membuffer/membuffer.h
 ./queryresult.o: ../../pikotools/src/textstream/types.h
-./queryresult.o: ../../pikotools/src/utf8/utf8_stream.h
 ./queryresult.o: ../../pikotools/src/log/filelog.h
 ./transaction.o: transaction.h ../../pikotools/src/log/log.h
 ./transaction.o: ../../pikotools/src/textstream/textstream.h
@@ -305,6 +291,5 @@
 ./transaction.o: ../../pikotools/src/date/date.h
 ./transaction.o: ../../pikotools/src/membuffer/membuffer.h
 ./transaction.o: ../../pikotools/src/textstream/types.h
-./transaction.o: ../../pikotools/src/utf8/utf8_stream.h
 ./transaction.o: ../../pikotools/src/log/filelog.h modelconnector.h clearer.h
 ./transaction.o: ft.h dbconnector.h queryresult.h flatconnector.h