changed in Makefile: we have now one lib pikotools/pikotools.a

make depend

winixd/Makefile

@@ -70,7 +70,7 @@ winix.so: $(winix.src.files)
 	@cd $(GLOBAL_WORKING_DIR)/tito/src  ; $(MAKE) -e
 	@cd $(GLOBAL_WORKING_DIR)/pikotools ; $(MAKE) -e
 	@cd $(GLOBAL_WORKING_DIR)/morm/src  ; $(MAKE) -e
-	$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o models/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/convert/convert.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(GLOBAL_WORKING_DIR)/pikotools/log/log.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
+	$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o models/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/pikotools.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
 
 
 winix: winix.so $(winix.src.files)

winixd/core/Makefile.dep

@@ -4,19 +4,21 @@ acceptbaseparser.o: acceptbaseparser.h winixbase.h
 acceptbaseparser.o: ../../../winix/winixd/core/config.h
 acceptbaseparser.o: ../../../pikotools/space/spaceparser.h
 acceptbaseparser.o: ../../../pikotools/space/space.h
-acceptbaseparser.o: ../../../pikotools/textstream/types.h log.h
+acceptbaseparser.o: ../../../pikotools/textstream/types.h
+acceptbaseparser.o: ../../../pikotools/convert/inttostr.h log.h
 acceptbaseparser.o: logmanipulators.h ../../../pikotools/log/log.h
 acceptbaseparser.o: ../../../pikotools/textstream/textstream.h
 acceptbaseparser.o: ../../../pikotools/space/space.h
 acceptbaseparser.o: ../../../pikotools/date/date.h
-acceptbaseparser.o: ../../../pikotools/convert/inttostr.h
 acceptbaseparser.o: ../../../pikotools/membuffer/membuffer.h
 acceptbaseparser.o: ../../../pikotools/textstream/types.h filelog.h
 acceptbaseparser.o: ../../../winix/winixd/core/synchro.h
 acceptbaseparser.o: ../../../winix/winixd/core/log.h
 acceptbaseparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 acceptbaseparser.o: misc.h requesttypes.h ../../../pikotools/utf8/utf8.h
-acceptbaseparser.o: winix_const.h ../../../pikotools/convert/convert.h
+acceptbaseparser.o: ../../../pikotools/utf8/utf8_templates.h
+acceptbaseparser.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
+acceptbaseparser.o: ../../../pikotools/convert/convert.h
 acceptbaseparser.o: ../../../pikotools/convert/inttostr.h
 acceptbaseparser.o: ../../../pikotools/convert/patternreplacer.h
 acceptbaseparser.o: ../../../pikotools/convert/strtoint.h
@@ -33,7 +35,9 @@ app.o: ../../../pikotools/membuffer/membuffer.h
 app.o: ../../../pikotools/textstream/types.h filelog.h
 app.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
 app.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h textstream.h
-app.o: misc.h requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
+app.o: misc.h requesttypes.h ../../../pikotools/utf8/utf8.h
+app.o: ../../../pikotools/utf8/utf8_templates.h
+app.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 app.o: ../../../pikotools/convert/convert.h
 app.o: ../../../pikotools/convert/inttostr.h
 app.o: ../../../pikotools/convert/patternreplacer.h
@@ -50,8 +54,7 @@ app.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 app.o: ../../../morm/src/flatexpression.h
 app.o: ../../../winix/winixd/models/itemcontent.h config.h
 app.o: ../../../winix/winixd/templates/htmltextstream.h
-app.o: ../../../winix/winixd/core/textstream.h
-app.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
+app.o: ../../../winix/winixd/core/textstream.h ../../../ezc/src/outstreams.h
 app.o: mount.h winixmodel.h ../../../winix/winixd/core/winixbase.h plugin.h
 app.o: pluginmsg.h ../../../morm/src/morm.h ../../../morm/src/finder.h
 app.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
@@ -146,18 +149,17 @@ app.o: ../../../winix/winixd/templates/changepatterns.h
 app.o: ../../../winix/winixd/templates/htmltextstream.h compress.h
 app.o: postparser.h httpsimpleparser.h ../../../pikotools/convert/text.h
 app.o: cookieparser.h postmultiparser.h acceptencodingparser.h
-app.o: acceptbaseparser.h ../../../pikotools/space/jsontospaceparser.h
-app.o: winixrequest.h
+app.o: acceptbaseparser.h winixrequest.h
 basethread.o: basethread.h synchro.h winixmodel.h
 basethread.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 basethread.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 basethread.o: ../../../pikotools/space/spaceparser.h
 basethread.o: ../../../pikotools/space/space.h
-basethread.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+basethread.o: ../../../pikotools/textstream/types.h
+basethread.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 basethread.o: ../../../pikotools/log/log.h
 basethread.o: ../../../pikotools/textstream/textstream.h
 basethread.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-basethread.o: ../../../pikotools/convert/inttostr.h
 basethread.o: ../../../pikotools/membuffer/membuffer.h
 basethread.o: ../../../pikotools/textstream/types.h filelog.h
 basethread.o: ../../../winix/winixd/core/synchro.h
@@ -173,8 +175,10 @@ basethread.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
 basethread.o: ../../../morm/src/finderhelper.h
 basethread.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 basethread.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-basethread.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
-basethread.o: ../../../morm/src/jsonexpression.h
+basethread.o: ../../../pikotools/utf8/utf8.h
+basethread.o: ../../../pikotools/utf8/utf8_templates.h
+basethread.o: ../../../pikotools/utf8/utf8_private.h
+basethread.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 basethread.o: ../../../morm/src/postgresqlexpression.h
 basethread.o: ../../../morm/src/jsonconnector.h
 basethread.o: ../../../morm/src/postgresqlconnector.h
@@ -202,7 +206,9 @@ config.o: ../../../pikotools/convert/inttostr.h
 config.o: ../../../pikotools/membuffer/membuffer.h
 config.o: ../../../pikotools/textstream/types.h filelog.h
 config.o: ../../../winix/winixd/core/synchro.h misc.h requesttypes.h
-config.o: ../../../pikotools/utf8/utf8.h winix_const.h
+config.o: ../../../pikotools/utf8/utf8.h
+config.o: ../../../pikotools/utf8/utf8_templates.h
+config.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 config.o: ../../../pikotools/convert/convert.h
 config.o: ../../../pikotools/convert/inttostr.h
 config.o: ../../../pikotools/convert/patternreplacer.h
@@ -217,17 +223,19 @@ config.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h user.h
 crypt.o: crypt.h run.h winixbase.h ../../../winix/winixd/core/config.h
 crypt.o: ../../../pikotools/space/spaceparser.h
 crypt.o: ../../../pikotools/space/space.h
-crypt.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+crypt.o: ../../../pikotools/textstream/types.h
+crypt.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 crypt.o: ../../../pikotools/log/log.h
 crypt.o: ../../../pikotools/textstream/textstream.h
 crypt.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-crypt.o: ../../../pikotools/convert/inttostr.h
 crypt.o: ../../../pikotools/membuffer/membuffer.h
 crypt.o: ../../../pikotools/textstream/types.h filelog.h
 crypt.o: ../../../winix/winixd/core/synchro.h
 crypt.o: ../../../winix/winixd/core/log.h
 crypt.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h config.h
-crypt.o: user.h ../../../pikotools/utf8/utf8.h misc.h requesttypes.h
+crypt.o: user.h ../../../pikotools/utf8/utf8.h
+crypt.o: ../../../pikotools/utf8/utf8_templates.h
+crypt.o: ../../../pikotools/utf8/utf8_private.h misc.h requesttypes.h
 crypt.o: winix_const.h ../../../pikotools/convert/convert.h
 crypt.o: ../../../pikotools/convert/inttostr.h
 crypt.o: ../../../pikotools/convert/patternreplacer.h
@@ -237,12 +245,12 @@ dircontainer.o: dircontainer.h winixbase.h
 dircontainer.o: ../../../winix/winixd/core/config.h
 dircontainer.o: ../../../pikotools/space/spaceparser.h
 dircontainer.o: ../../../pikotools/space/space.h
-dircontainer.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+dircontainer.o: ../../../pikotools/textstream/types.h
+dircontainer.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 dircontainer.o: ../../../pikotools/log/log.h
 dircontainer.o: ../../../pikotools/textstream/textstream.h
 dircontainer.o: ../../../pikotools/space/space.h
 dircontainer.o: ../../../pikotools/date/date.h
-dircontainer.o: ../../../pikotools/convert/inttostr.h
 dircontainer.o: ../../../pikotools/membuffer/membuffer.h
 dircontainer.o: ../../../pikotools/textstream/types.h filelog.h
 dircontainer.o: ../../../winix/winixd/core/synchro.h
@@ -265,11 +273,11 @@ dircontainer.o: ../../../winix/winixd/models/itemcontent.h
 dirs.o: dirs.h dircontainer.h winixbase.h ../../../winix/winixd/core/config.h
 dirs.o: ../../../pikotools/space/spaceparser.h
 dirs.o: ../../../pikotools/space/space.h
-dirs.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+dirs.o: ../../../pikotools/textstream/types.h
+dirs.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 dirs.o: ../../../pikotools/log/log.h
 dirs.o: ../../../pikotools/textstream/textstream.h
 dirs.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-dirs.o: ../../../pikotools/convert/inttostr.h
 dirs.o: ../../../pikotools/membuffer/membuffer.h
 dirs.o: ../../../pikotools/textstream/types.h filelog.h
 dirs.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
@@ -294,15 +302,16 @@ dirs.o: ../../../winix/winixd/core/group.h
 dirs.o: ../../../winix/winixd/core/dircontainer.h
 dirs.o: ../../../winix/winixd/core/ugcontainer.h request.h requesttypes.h
 dirs.o: error.h config.h textstream.h misc.h ../../../pikotools/utf8/utf8.h
-dirs.o: winix_const.h ../../../pikotools/convert/convert.h
+dirs.o: ../../../pikotools/utf8/utf8_templates.h
+dirs.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
+dirs.o: ../../../pikotools/convert/convert.h
 dirs.o: ../../../pikotools/convert/inttostr.h
 dirs.o: ../../../pikotools/convert/patternreplacer.h
 dirs.o: ../../../pikotools/convert/strtoint.h
 dirs.o: ../../../pikotools/convert/text.h
 dirs.o: ../../../winix/winixd/templates/htmltextstream.h
-dirs.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
-dirs.o: winixmodel.h plugin.h pluginmsg.h plugindata.h
-dirs.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
+dirs.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h pluginmsg.h
+dirs.o: plugindata.h ../../../morm/src/morm.h ../../../morm/src/finder.h
 dirs.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 dirs.o: ../../../morm/src/postgresqlexpression.h
 dirs.o: ../../../morm/src/jsonconnector.h
@@ -332,7 +341,9 @@ filelog.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
 filelog.o: ../../../pikotools/convert/inttostr.h
 filelog.o: ../../../pikotools/membuffer/membuffer.h
 filelog.o: ../../../pikotools/textstream/types.h
-filelog.o: ../../../pikotools/utf8/utf8.h timezones.h timezone.h
+filelog.o: ../../../pikotools/utf8/utf8.h
+filelog.o: ../../../pikotools/utf8/utf8_templates.h
+filelog.o: ../../../pikotools/utf8/utf8_private.h timezones.h timezone.h
 filelog.o: ../../../pikotools/space/spaceparser.h
 filelog.o: ../../../pikotools/space/space.h
 filelog.o: ../../../pikotools/textstream/types.h winixbase.h
@@ -372,7 +383,9 @@ groups.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
 groups.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
 groups.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 groups.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-groups.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+groups.o: ../../../pikotools/utf8/utf8.h
+groups.o: ../../../pikotools/utf8/utf8_templates.h
+groups.o: ../../../pikotools/utf8/utf8_private.h ../../../morm/src/cursor.h
 groups.o: ../../../morm/src/jsonexpression.h
 groups.o: ../../../morm/src/postgresqlexpression.h
 groups.o: ../../../morm/src/jsonconnector.h
@@ -385,12 +398,12 @@ httpsimpleparser.o: pluginmsg.h plugindata.h winixbase.h
 httpsimpleparser.o: ../../../winix/winixd/core/config.h
 httpsimpleparser.o: ../../../pikotools/space/spaceparser.h
 httpsimpleparser.o: ../../../pikotools/space/space.h
-httpsimpleparser.o: ../../../pikotools/textstream/types.h log.h
+httpsimpleparser.o: ../../../pikotools/textstream/types.h
+httpsimpleparser.o: ../../../pikotools/convert/inttostr.h log.h
 httpsimpleparser.o: logmanipulators.h ../../../pikotools/log/log.h
 httpsimpleparser.o: ../../../pikotools/textstream/textstream.h
 httpsimpleparser.o: ../../../pikotools/space/space.h
 httpsimpleparser.o: ../../../pikotools/date/date.h
-httpsimpleparser.o: ../../../pikotools/convert/inttostr.h
 httpsimpleparser.o: ../../../pikotools/membuffer/membuffer.h
 httpsimpleparser.o: ../../../pikotools/textstream/types.h filelog.h
 httpsimpleparser.o: ../../../winix/winixd/core/synchro.h
@@ -412,6 +425,8 @@ httpsimpleparser.o: ../../../morm/src/finderhelper.h
 httpsimpleparser.o: ../../../morm/src/fieldvaluehelper.h
 httpsimpleparser.o: ../../../morm/src/ft.h ../../../morm/src/flatexpression.h
 httpsimpleparser.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+httpsimpleparser.o: ../../../pikotools/utf8/utf8_templates.h
+httpsimpleparser.o: ../../../pikotools/utf8/utf8_private.h
 httpsimpleparser.o: ../../../morm/src/cursor.h
 httpsimpleparser.o: ../../../morm/src/jsonexpression.h
 httpsimpleparser.o: ../../../morm/src/postgresqlexpression.h
@@ -429,11 +444,11 @@ image.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 image.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 image.o: ../../../pikotools/space/spaceparser.h
 image.o: ../../../pikotools/space/space.h
-image.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+image.o: ../../../pikotools/textstream/types.h
+image.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 image.o: ../../../pikotools/log/log.h
 image.o: ../../../pikotools/textstream/textstream.h
 image.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-image.o: ../../../pikotools/convert/inttostr.h
 image.o: ../../../pikotools/membuffer/membuffer.h
 image.o: ../../../pikotools/textstream/types.h filelog.h
 image.o: ../../../winix/winixd/core/synchro.h
@@ -448,7 +463,9 @@ image.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
 image.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
 image.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 image.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-image.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+image.o: ../../../pikotools/utf8/utf8.h
+image.o: ../../../pikotools/utf8/utf8_templates.h
+image.o: ../../../pikotools/utf8/utf8_private.h ../../../morm/src/cursor.h
 image.o: ../../../morm/src/jsonexpression.h
 image.o: ../../../morm/src/postgresqlexpression.h
 image.o: ../../../morm/src/jsonconnector.h
@@ -470,10 +487,9 @@ image.o: ../../../winix/winixd/models/item.h
 image.o: ../../../winix/winixd/models/itemcontent.h system.h job.h dirs.h
 image.o: dircontainer.h request.h error.h config.h
 image.o: ../../../winix/winixd/templates/htmltextstream.h
-image.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
-image.o: mounts.h mount.h mountparser.h crypt.h run.h user.h users.h
-image.o: ugcontainer.h lastcontainer.h cur.h session.h rebus.h ipban.h
-image.o: groups.h group.h loadavg.h threadmanager.h
+image.o: ../../../ezc/src/outstreams.h mounts.h mount.h mountparser.h crypt.h
+image.o: run.h user.h users.h ugcontainer.h lastcontainer.h cur.h session.h
+image.o: rebus.h ipban.h groups.h group.h loadavg.h threadmanager.h
 image.o: ../../../winix/winixd/notify/notify.h
 image.o: ../../../winix/winixd/notify/notifypool.h
 image.o: ../../../winix/winixd/templates/locale.h
@@ -498,12 +514,12 @@ ipbancontainer.o: plugindata.h winixbase.h
 ipbancontainer.o: ../../../winix/winixd/core/config.h
 ipbancontainer.o: ../../../pikotools/space/spaceparser.h
 ipbancontainer.o: ../../../pikotools/space/space.h
-ipbancontainer.o: ../../../pikotools/textstream/types.h log.h
+ipbancontainer.o: ../../../pikotools/textstream/types.h
+ipbancontainer.o: ../../../pikotools/convert/inttostr.h log.h
 ipbancontainer.o: logmanipulators.h ../../../pikotools/log/log.h
 ipbancontainer.o: ../../../pikotools/textstream/textstream.h
 ipbancontainer.o: ../../../pikotools/space/space.h
 ipbancontainer.o: ../../../pikotools/date/date.h
-ipbancontainer.o: ../../../pikotools/convert/inttostr.h
 ipbancontainer.o: ../../../pikotools/membuffer/membuffer.h
 ipbancontainer.o: ../../../pikotools/textstream/types.h filelog.h
 ipbancontainer.o: ../../../winix/winixd/core/synchro.h
@@ -522,6 +538,8 @@ ipbancontainer.o: ../../../morm/src/finderhelper.h
 ipbancontainer.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 ipbancontainer.o: ../../../morm/src/flatexpression.h
 ipbancontainer.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+ipbancontainer.o: ../../../pikotools/utf8/utf8_templates.h
+ipbancontainer.o: ../../../pikotools/utf8/utf8_private.h
 ipbancontainer.o: ../../../morm/src/cursor.h
 ipbancontainer.o: ../../../morm/src/jsonexpression.h
 ipbancontainer.o: ../../../morm/src/postgresqlexpression.h
@@ -533,10 +551,10 @@ job.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 job.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 job.o: ../../../pikotools/space/spaceparser.h
 job.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
-job.o: log.h logmanipulators.h ../../../pikotools/log/log.h
+job.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
+job.o: ../../../pikotools/log/log.h
 job.o: ../../../pikotools/textstream/textstream.h
 job.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-job.o: ../../../pikotools/convert/inttostr.h
 job.o: ../../../pikotools/membuffer/membuffer.h
 job.o: ../../../pikotools/textstream/types.h filelog.h
 job.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
@@ -550,7 +568,9 @@ job.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
 job.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
 job.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 job.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-job.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+job.o: ../../../pikotools/utf8/utf8.h
+job.o: ../../../pikotools/utf8/utf8_templates.h
+job.o: ../../../pikotools/utf8/utf8_private.h ../../../morm/src/cursor.h
 job.o: ../../../morm/src/jsonexpression.h
 job.o: ../../../morm/src/postgresqlexpression.h
 job.o: ../../../morm/src/jsonconnector.h
@@ -570,7 +590,9 @@ lastcontainer.o: ../../../pikotools/textstream/types.h filelog.h
 lastcontainer.o: ../../../winix/winixd/core/synchro.h
 lastcontainer.o: ../../../winix/winixd/core/log.h
 lastcontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h
-lastcontainer.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
+lastcontainer.o: requesttypes.h ../../../pikotools/utf8/utf8.h
+lastcontainer.o: ../../../pikotools/utf8/utf8_templates.h
+lastcontainer.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 lastcontainer.o: ../../../pikotools/convert/convert.h
 lastcontainer.o: ../../../pikotools/convert/inttostr.h
 lastcontainer.o: ../../../pikotools/convert/patternreplacer.h
@@ -579,17 +601,19 @@ lastcontainer.o: ../../../pikotools/convert/text.h
 loadavg.o: loadavg.h winixbase.h ../../../winix/winixd/core/config.h
 loadavg.o: ../../../pikotools/space/spaceparser.h
 loadavg.o: ../../../pikotools/space/space.h
-loadavg.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+loadavg.o: ../../../pikotools/textstream/types.h
+loadavg.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 loadavg.o: ../../../pikotools/log/log.h
 loadavg.o: ../../../pikotools/textstream/textstream.h
 loadavg.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-loadavg.o: ../../../pikotools/convert/inttostr.h
 loadavg.o: ../../../pikotools/membuffer/membuffer.h
 loadavg.o: ../../../pikotools/textstream/types.h filelog.h
 loadavg.o: ../../../winix/winixd/core/synchro.h
 loadavg.o: ../../../winix/winixd/core/log.h
 loadavg.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h
-loadavg.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
+loadavg.o: requesttypes.h ../../../pikotools/utf8/utf8.h
+loadavg.o: ../../../pikotools/utf8/utf8_templates.h
+loadavg.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 loadavg.o: ../../../pikotools/convert/convert.h
 loadavg.o: ../../../pikotools/convert/inttostr.h
 loadavg.o: ../../../pikotools/convert/patternreplacer.h
@@ -603,12 +627,16 @@ log.o: ../../../pikotools/convert/inttostr.h
 log.o: ../../../pikotools/membuffer/membuffer.h
 log.o: ../../../pikotools/textstream/types.h filelog.h
 log.o: ../../../winix/winixd/core/synchro.h ../../../pikotools/utf8/utf8.h
+log.o: ../../../pikotools/utf8/utf8_templates.h
+log.o: ../../../pikotools/utf8/utf8_private.h
 misc.o: misc.h requesttypes.h ../../../pikotools/textstream/textstream.h
 misc.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
 misc.o: ../../../pikotools/convert/inttostr.h
 misc.o: ../../../pikotools/membuffer/membuffer.h
 misc.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
-misc.o: winix_const.h ../../../pikotools/convert/convert.h
+misc.o: ../../../pikotools/utf8/utf8_templates.h
+misc.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
+misc.o: ../../../pikotools/convert/convert.h
 misc.o: ../../../pikotools/convert/inttostr.h
 misc.o: ../../../pikotools/convert/patternreplacer.h
 misc.o: ../../../pikotools/convert/strtoint.h
@@ -659,8 +687,8 @@ misc.o: ../../../winix/winixd/core/winixsystem.h
 misc.o: ../../../winix/winixd/core/winixmodel.h
 misc.o: ../../../winix/winixd/core/slog.h cur.h request.h error.h config.h
 misc.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h
-misc.o: ../../../pikotools/space/spacetojson.h session.h user.h plugindata.h
-misc.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h
+misc.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+misc.o: ../../../winix/winixd/templates/locale.h
 misc.o: ../../../pikotools/convert/patternreplacer.h
 mount.o: mount.h misc.h requesttypes.h
 mount.o: ../../../pikotools/textstream/textstream.h
@@ -668,7 +696,9 @@ mount.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
 mount.o: ../../../pikotools/convert/inttostr.h
 mount.o: ../../../pikotools/membuffer/membuffer.h
 mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
-mount.o: winix_const.h ../../../pikotools/convert/convert.h
+mount.o: ../../../pikotools/utf8/utf8_templates.h
+mount.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
+mount.o: ../../../pikotools/convert/convert.h
 mount.o: ../../../pikotools/convert/inttostr.h
 mount.o: ../../../pikotools/convert/patternreplacer.h
 mount.o: ../../../pikotools/convert/strtoint.h
@@ -677,12 +707,12 @@ mountparser.o: mountparser.h mount.h dirs.h dircontainer.h winixbase.h
 mountparser.o: ../../../winix/winixd/core/config.h
 mountparser.o: ../../../pikotools/space/spaceparser.h
 mountparser.o: ../../../pikotools/space/space.h
-mountparser.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+mountparser.o: ../../../pikotools/textstream/types.h
+mountparser.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 mountparser.o: ../../../pikotools/log/log.h
 mountparser.o: ../../../pikotools/textstream/textstream.h
 mountparser.o: ../../../pikotools/space/space.h
 mountparser.o: ../../../pikotools/date/date.h
-mountparser.o: ../../../pikotools/convert/inttostr.h
 mountparser.o: ../../../pikotools/membuffer/membuffer.h
 mountparser.o: ../../../pikotools/textstream/types.h filelog.h
 mountparser.o: ../../../winix/winixd/core/synchro.h
@@ -713,14 +743,15 @@ mountparser.o: ../../../winix/winixd/core/group.h
 mountparser.o: ../../../winix/winixd/core/dircontainer.h
 mountparser.o: ../../../winix/winixd/core/ugcontainer.h request.h
 mountparser.o: requesttypes.h error.h config.h textstream.h misc.h
-mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
+mountparser.o: ../../../pikotools/utf8/utf8.h
+mountparser.o: ../../../pikotools/utf8/utf8_templates.h
+mountparser.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 mountparser.o: ../../../pikotools/convert/convert.h
 mountparser.o: ../../../pikotools/convert/inttostr.h
 mountparser.o: ../../../pikotools/convert/patternreplacer.h
 mountparser.o: ../../../pikotools/convert/strtoint.h
 mountparser.o: ../../../pikotools/convert/text.h
 mountparser.o: ../../../winix/winixd/templates/htmltextstream.h
-mountparser.o: ../../../pikotools/space/spacetojson.h
 mountparser.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h
 mountparser.o: pluginmsg.h plugindata.h ../../../morm/src/morm.h
 mountparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
@@ -733,11 +764,11 @@ mounts.o: mounts.h mount.h error.h dirs.h dircontainer.h winixbase.h
 mounts.o: ../../../winix/winixd/core/config.h
 mounts.o: ../../../pikotools/space/spaceparser.h
 mounts.o: ../../../pikotools/space/space.h
-mounts.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+mounts.o: ../../../pikotools/textstream/types.h
+mounts.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 mounts.o: ../../../pikotools/log/log.h
 mounts.o: ../../../pikotools/textstream/textstream.h
 mounts.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-mounts.o: ../../../pikotools/convert/inttostr.h
 mounts.o: ../../../pikotools/membuffer/membuffer.h
 mounts.o: ../../../pikotools/textstream/types.h filelog.h
 mounts.o: ../../../winix/winixd/core/synchro.h
@@ -764,13 +795,14 @@ mounts.o: ../../../winix/winixd/core/group.h
 mounts.o: ../../../winix/winixd/core/dircontainer.h
 mounts.o: ../../../winix/winixd/core/ugcontainer.h request.h requesttypes.h
 mounts.o: config.h textstream.h misc.h ../../../pikotools/utf8/utf8.h
-mounts.o: winix_const.h ../../../pikotools/convert/convert.h
+mounts.o: ../../../pikotools/utf8/utf8_templates.h
+mounts.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
+mounts.o: ../../../pikotools/convert/convert.h
 mounts.o: ../../../pikotools/convert/inttostr.h
 mounts.o: ../../../pikotools/convert/patternreplacer.h
 mounts.o: ../../../pikotools/convert/strtoint.h
 mounts.o: ../../../pikotools/convert/text.h
 mounts.o: ../../../winix/winixd/templates/htmltextstream.h
-mounts.o: ../../../pikotools/space/spacetojson.h
 mounts.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h pluginmsg.h
 mounts.o: plugindata.h ../../../morm/src/morm.h ../../../morm/src/finder.h
 mounts.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
@@ -783,11 +815,11 @@ plugin.o: plugin.h pluginmsg.h plugindata.h winixbase.h
 plugin.o: ../../../winix/winixd/core/config.h
 plugin.o: ../../../pikotools/space/spaceparser.h
 plugin.o: ../../../pikotools/space/space.h
-plugin.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+plugin.o: ../../../pikotools/textstream/types.h
+plugin.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 plugin.o: ../../../pikotools/log/log.h
 plugin.o: ../../../pikotools/textstream/textstream.h
 plugin.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-plugin.o: ../../../pikotools/convert/inttostr.h
 plugin.o: ../../../pikotools/membuffer/membuffer.h
 plugin.o: ../../../pikotools/textstream/types.h filelog.h
 plugin.o: ../../../winix/winixd/core/synchro.h
@@ -796,7 +828,9 @@ plugin.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 plugin.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 plugin.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 plugin.o: ../../../morm/src/flatconnector.h misc.h requesttypes.h
-plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h
+plugin.o: ../../../pikotools/utf8/utf8.h
+plugin.o: ../../../pikotools/utf8/utf8_templates.h
+plugin.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 plugin.o: ../../../pikotools/convert/convert.h
 plugin.o: ../../../pikotools/convert/inttostr.h
 plugin.o: ../../../pikotools/convert/patternreplacer.h
@@ -827,7 +861,6 @@ plugin.o: ../../../winix/winixd/core/group.h
 plugin.o: ../../../winix/winixd/core/dircontainer.h
 plugin.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h config.h
 plugin.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h
-plugin.o: ../../../pikotools/space/spacetojson.h
 plugin.o: ../../../ezc/src/outstreams.h mounts.h mount.h mountparser.h
 plugin.o: crypt.h run.h user.h users.h ugcontainer.h lastcontainer.h cur.h
 plugin.o: session.h rebus.h ipban.h groups.h group.h loadavg.h image.h
@@ -913,11 +946,11 @@ plugindata.o: plugindata.h plugin.h pluginmsg.h winixbase.h
 plugindata.o: ../../../winix/winixd/core/config.h
 plugindata.o: ../../../pikotools/space/spaceparser.h
 plugindata.o: ../../../pikotools/space/space.h
-plugindata.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+plugindata.o: ../../../pikotools/textstream/types.h
+plugindata.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 plugindata.o: ../../../pikotools/log/log.h
 plugindata.o: ../../../pikotools/textstream/textstream.h
 plugindata.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-plugindata.o: ../../../pikotools/convert/inttostr.h
 plugindata.o: ../../../pikotools/membuffer/membuffer.h
 plugindata.o: ../../../pikotools/textstream/types.h filelog.h
 plugindata.o: ../../../winix/winixd/core/synchro.h
@@ -933,7 +966,9 @@ postmultiparser.o: ../../../pikotools/date/date.h
 postmultiparser.o: ../../../pikotools/convert/inttostr.h
 postmultiparser.o: ../../../pikotools/membuffer/membuffer.h
 postmultiparser.o: ../../../pikotools/textstream/types.h config.h misc.h
-postmultiparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
+postmultiparser.o: ../../../pikotools/utf8/utf8.h
+postmultiparser.o: ../../../pikotools/utf8/utf8_templates.h
+postmultiparser.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 postmultiparser.o: ../../../pikotools/convert/convert.h
 postmultiparser.o: ../../../pikotools/convert/inttostr.h
 postmultiparser.o: ../../../pikotools/convert/patternreplacer.h
@@ -961,7 +996,9 @@ rebus.o: ../../../pikotools/space/space.h
 rebus.o: ../../../pikotools/textstream/types.h
 rebus.o: ../../../winix/winixd/core/log.h
 rebus.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h
-rebus.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
+rebus.o: requesttypes.h ../../../pikotools/utf8/utf8.h
+rebus.o: ../../../pikotools/utf8/utf8_templates.h
+rebus.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 rebus.o: ../../../pikotools/convert/convert.h
 rebus.o: ../../../pikotools/convert/inttostr.h
 rebus.o: ../../../pikotools/convert/patternreplacer.h
@@ -979,8 +1016,8 @@ rebus.o: ../../../morm/src/flatexpression.h
 rebus.o: ../../../winix/winixd/models/itemcontent.h error.h config.h
 rebus.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h
 rebus.o: ../../../winix/winixd/core/textstream.h
-rebus.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
-rebus.o: session.h user.h plugindata.h ipban.h mount.h
+rebus.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h ipban.h
+rebus.o: mount.h
 request.o: request.h requesttypes.h
 request.o: ../../../pikotools/textstream/textstream.h
 request.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
@@ -999,7 +1036,9 @@ request.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
 request.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 request.o: ../../../morm/src/flatexpression.h
 request.o: ../../../winix/winixd/models/itemcontent.h error.h config.h
-request.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h winix_const.h
+request.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h
+request.o: ../../../pikotools/utf8/utf8_templates.h
+request.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 request.o: ../../../pikotools/convert/convert.h
 request.o: ../../../pikotools/convert/inttostr.h
 request.o: ../../../pikotools/convert/patternreplacer.h
@@ -1007,22 +1046,21 @@ request.o: ../../../pikotools/convert/strtoint.h
 request.o: ../../../pikotools/convert/text.h
 request.o: ../../../winix/winixd/templates/htmltextstream.h
 request.o: ../../../winix/winixd/core/textstream.h
-request.o: ../../../pikotools/space/spacetojson.h
-request.o: ../../../pikotools/space/space.h
-request.o: ../../../pikotools/textstream/types.h
 request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h plugin.h
 request.o: pluginmsg.h plugindata.h winixbase.h
 request.o: ../../../winix/winixd/core/config.h
 request.o: ../../../pikotools/space/spaceparser.h
+request.o: ../../../pikotools/space/space.h
+request.o: ../../../pikotools/textstream/types.h
 request.o: ../../../winix/winixd/core/log.h
 request.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 run.o: run.h winixbase.h ../../../winix/winixd/core/config.h
 run.o: ../../../pikotools/space/spaceparser.h
 run.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
-run.o: log.h logmanipulators.h ../../../pikotools/log/log.h
+run.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
+run.o: ../../../pikotools/log/log.h
 run.o: ../../../pikotools/textstream/textstream.h
 run.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-run.o: ../../../pikotools/convert/inttostr.h
 run.o: ../../../pikotools/membuffer/membuffer.h
 run.o: ../../../pikotools/textstream/types.h filelog.h
 run.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
@@ -1041,7 +1079,9 @@ session.o: ../../../pikotools/textstream/types.h filelog.h
 session.o: ../../../winix/winixd/core/synchro.h
 session.o: ../../../winix/winixd/core/log.h
 session.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h textstream.h
-session.o: misc.h requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
+session.o: misc.h requesttypes.h ../../../pikotools/utf8/utf8.h
+session.o: ../../../pikotools/utf8/utf8_templates.h
+session.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 session.o: ../../../pikotools/convert/convert.h
 session.o: ../../../pikotools/convert/inttostr.h
 session.o: ../../../pikotools/convert/patternreplacer.h
@@ -1063,7 +1103,9 @@ sessioncontainer.o: ../../../winix/winixd/core/synchro.h
 sessioncontainer.o: ../../../winix/winixd/core/log.h
 sessioncontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 sessioncontainer.o: textstream.h misc.h requesttypes.h
-sessioncontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
+sessioncontainer.o: ../../../pikotools/utf8/utf8.h
+sessioncontainer.o: ../../../pikotools/utf8/utf8_templates.h
+sessioncontainer.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 sessioncontainer.o: ../../../pikotools/convert/convert.h
 sessioncontainer.o: ../../../pikotools/convert/inttostr.h
 sessioncontainer.o: ../../../pikotools/convert/patternreplacer.h
@@ -1088,7 +1130,6 @@ sessioncontainer.o: ../../../morm/src/ft.h ../../../morm/src/flatexpression.h
 sessioncontainer.o: ../../../winix/winixd/models/itemcontent.h config.h
 sessioncontainer.o: ../../../winix/winixd/templates/htmltextstream.h
 sessioncontainer.o: ../../../winix/winixd/core/textstream.h
-sessioncontainer.o: ../../../pikotools/space/spacetojson.h
 sessioncontainer.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h
 sessioncontainer.o: ../../../winix/winixd/core/winixbase.h plugin.h
 sessioncontainer.o: pluginmsg.h ../../../morm/src/morm.h
@@ -1103,18 +1144,21 @@ sessionidmanager.o: ../../../pikotools/space/space.h ../../../tito/src/aes.h
 sessionidmanager.o: winixbase.h ../../../winix/winixd/core/config.h
 sessionidmanager.o: ../../../pikotools/space/spaceparser.h
 sessionidmanager.o: ../../../pikotools/space/space.h
-sessionidmanager.o: ../../../pikotools/textstream/types.h log.h
+sessionidmanager.o: ../../../pikotools/textstream/types.h
+sessionidmanager.o: ../../../pikotools/convert/inttostr.h log.h
 sessionidmanager.o: logmanipulators.h ../../../pikotools/log/log.h
 sessionidmanager.o: ../../../pikotools/textstream/textstream.h
 sessionidmanager.o: ../../../pikotools/date/date.h
-sessionidmanager.o: ../../../pikotools/convert/inttostr.h
 sessionidmanager.o: ../../../pikotools/membuffer/membuffer.h
 sessionidmanager.o: ../../../pikotools/textstream/types.h filelog.h
 sessionidmanager.o: ../../../winix/winixd/core/synchro.h
 sessionidmanager.o: ../../../winix/winixd/core/log.h
 sessionidmanager.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
-sessionidmanager.o: ../../../pikotools/utf8/utf8.h misc.h requesttypes.h
-sessionidmanager.o: winix_const.h ../../../pikotools/convert/convert.h
+sessionidmanager.o: ../../../pikotools/utf8/utf8.h
+sessionidmanager.o: ../../../pikotools/utf8/utf8_templates.h
+sessionidmanager.o: ../../../pikotools/utf8/utf8_private.h misc.h
+sessionidmanager.o: requesttypes.h winix_const.h
+sessionidmanager.o: ../../../pikotools/convert/convert.h
 sessionidmanager.o: ../../../pikotools/convert/inttostr.h
 sessionidmanager.o: ../../../pikotools/convert/patternreplacer.h
 sessionidmanager.o: ../../../pikotools/convert/strtoint.h
@@ -1135,7 +1179,9 @@ sessionmanager.o: ../../../winix/winixd/core/synchro.h
 sessionmanager.o: ../../../winix/winixd/core/log.h
 sessionmanager.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 sessionmanager.o: textstream.h misc.h requesttypes.h
-sessionmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
+sessionmanager.o: ../../../pikotools/utf8/utf8.h
+sessionmanager.o: ../../../pikotools/utf8/utf8_templates.h
+sessionmanager.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 sessionmanager.o: ../../../pikotools/convert/convert.h
 sessionmanager.o: ../../../pikotools/convert/inttostr.h
 sessionmanager.o: ../../../pikotools/convert/patternreplacer.h
@@ -1158,7 +1204,6 @@ sessionmanager.o: ../../../morm/src/flatexpression.h
 sessionmanager.o: ../../../winix/winixd/models/itemcontent.h config.h
 sessionmanager.o: ../../../winix/winixd/templates/htmltextstream.h
 sessionmanager.o: ../../../winix/winixd/core/textstream.h
-sessionmanager.o: ../../../pikotools/space/spacetojson.h
 sessionmanager.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h
 sessionmanager.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 sessionmanager.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -1225,7 +1270,9 @@ sessionparser.o: ../../../winix/winixd/core/synchro.h
 sessionparser.o: ../../../winix/winixd/core/log.h
 sessionparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 sessionparser.o: textstream.h misc.h requesttypes.h
-sessionparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
+sessionparser.o: ../../../pikotools/utf8/utf8.h
+sessionparser.o: ../../../pikotools/utf8/utf8_templates.h
+sessionparser.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 sessionparser.o: ../../../pikotools/convert/convert.h
 sessionparser.o: ../../../pikotools/convert/inttostr.h
 sessionparser.o: ../../../pikotools/convert/patternreplacer.h
@@ -1247,7 +1294,6 @@ sessionparser.o: ../../../morm/src/flatexpression.h
 sessionparser.o: ../../../winix/winixd/models/itemcontent.h config.h
 sessionparser.o: ../../../winix/winixd/templates/htmltextstream.h
 sessionparser.o: ../../../winix/winixd/core/textstream.h
-sessionparser.o: ../../../pikotools/space/spacetojson.h
 sessionparser.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h
 sessionparser.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 sessionparser.o: ../../../morm/src/morm.h ../../../morm/src/finder.h
@@ -1283,20 +1329,21 @@ slog.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
 slog.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
 slog.o: ../../../morm/src/ft.h ../../../morm/src/flatexpression.h
 slog.o: ../../../winix/winixd/models/itemcontent.h error.h config.h
-slog.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h winix_const.h
+slog.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h
+slog.o: ../../../pikotools/utf8/utf8_templates.h
+slog.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 slog.o: ../../../pikotools/convert/convert.h
 slog.o: ../../../pikotools/convert/inttostr.h
 slog.o: ../../../pikotools/convert/patternreplacer.h
 slog.o: ../../../pikotools/convert/strtoint.h
 slog.o: ../../../pikotools/convert/text.h
 slog.o: ../../../winix/winixd/templates/htmltextstream.h
-slog.o: ../../../winix/winixd/core/textstream.h
-slog.o: ../../../pikotools/space/spacetojson.h
-slog.o: ../../../pikotools/space/space.h
-slog.o: ../../../pikotools/textstream/types.h ../../../ezc/src/outstreams.h
+slog.o: ../../../winix/winixd/core/textstream.h ../../../ezc/src/outstreams.h
 slog.o: session.h user.h plugindata.h rebus.h winixbase.h
 slog.o: ../../../winix/winixd/core/config.h
-slog.o: ../../../pikotools/space/spaceparser.h log.h logmanipulators.h
+slog.o: ../../../pikotools/space/spaceparser.h
+slog.o: ../../../pikotools/space/space.h
+slog.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
 slog.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
 slog.o: lock.h synchro.h ipban.h mount.h
 slog.o: ../../../winix/winixd/templates/locale.h
@@ -1308,11 +1355,11 @@ system.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 system.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 system.o: ../../../pikotools/space/spaceparser.h
 system.o: ../../../pikotools/space/space.h
-system.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+system.o: ../../../pikotools/textstream/types.h
+system.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 system.o: ../../../pikotools/log/log.h
 system.o: ../../../pikotools/textstream/textstream.h
 system.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-system.o: ../../../pikotools/convert/inttostr.h
 system.o: ../../../pikotools/membuffer/membuffer.h
 system.o: ../../../pikotools/textstream/types.h filelog.h
 system.o: ../../../winix/winixd/core/synchro.h
@@ -1327,7 +1374,9 @@ system.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
 system.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
 system.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 system.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-system.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+system.o: ../../../pikotools/utf8/utf8.h
+system.o: ../../../pikotools/utf8/utf8_templates.h
+system.o: ../../../pikotools/utf8/utf8_private.h ../../../morm/src/cursor.h
 system.o: ../../../morm/src/jsonexpression.h
 system.o: ../../../morm/src/postgresqlexpression.h
 system.o: ../../../morm/src/jsonconnector.h
@@ -1351,7 +1400,6 @@ system.o: ../../../pikotools/convert/patternreplacer.h
 system.o: ../../../pikotools/convert/strtoint.h
 system.o: ../../../pikotools/convert/text.h
 system.o: ../../../winix/winixd/templates/htmltextstream.h
-system.o: ../../../pikotools/space/spacetojson.h
 system.o: ../../../ezc/src/outstreams.h mounts.h mount.h mountparser.h
 system.o: crypt.h run.h user.h users.h ugcontainer.h lastcontainer.h cur.h
 system.o: session.h rebus.h ipban.h groups.h group.h loadavg.h image.h
@@ -1436,12 +1484,12 @@ threadmanager.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 threadmanager.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 threadmanager.o: ../../../pikotools/space/spaceparser.h
 threadmanager.o: ../../../pikotools/space/space.h
-threadmanager.o: ../../../pikotools/textstream/types.h log.h
+threadmanager.o: ../../../pikotools/textstream/types.h
+threadmanager.o: ../../../pikotools/convert/inttostr.h log.h
 threadmanager.o: logmanipulators.h ../../../pikotools/log/log.h
 threadmanager.o: ../../../pikotools/textstream/textstream.h
 threadmanager.o: ../../../pikotools/space/space.h
 threadmanager.o: ../../../pikotools/date/date.h
-threadmanager.o: ../../../pikotools/convert/inttostr.h
 threadmanager.o: ../../../pikotools/membuffer/membuffer.h
 threadmanager.o: ../../../pikotools/textstream/types.h filelog.h
 threadmanager.o: ../../../winix/winixd/core/synchro.h
@@ -1460,6 +1508,8 @@ threadmanager.o: ../../../morm/src/finderhelper.h
 threadmanager.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 threadmanager.o: ../../../morm/src/flatexpression.h
 threadmanager.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+threadmanager.o: ../../../pikotools/utf8/utf8_templates.h
+threadmanager.o: ../../../pikotools/utf8/utf8_private.h
 threadmanager.o: ../../../morm/src/cursor.h
 threadmanager.o: ../../../morm/src/jsonexpression.h
 threadmanager.o: ../../../morm/src/postgresqlexpression.h
@@ -1472,7 +1522,9 @@ timezone.o: ../../../pikotools/space/space.h misc.h requesttypes.h
 timezone.o: ../../../pikotools/textstream/textstream.h
 timezone.o: ../../../pikotools/membuffer/membuffer.h
 timezone.o: ../../../pikotools/textstream/types.h
-timezone.o: ../../../pikotools/utf8/utf8.h winix_const.h
+timezone.o: ../../../pikotools/utf8/utf8.h
+timezone.o: ../../../pikotools/utf8/utf8_templates.h
+timezone.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 timezone.o: ../../../pikotools/convert/convert.h
 timezone.o: ../../../pikotools/convert/inttostr.h
 timezone.o: ../../../pikotools/convert/patternreplacer.h
@@ -1492,7 +1544,9 @@ timezones.o: ../../../pikotools/textstream/types.h filelog.h
 timezones.o: ../../../winix/winixd/core/synchro.h
 timezones.o: ../../../winix/winixd/core/log.h
 timezones.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h
-timezones.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
+timezones.o: requesttypes.h ../../../pikotools/utf8/utf8.h
+timezones.o: ../../../pikotools/utf8/utf8_templates.h
+timezones.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 timezones.o: ../../../pikotools/convert/convert.h
 timezones.o: ../../../pikotools/convert/inttostr.h
 timezones.o: ../../../pikotools/convert/patternreplacer.h
@@ -1525,7 +1579,9 @@ users.o: ../../../morm/src/finderhelper.h
 users.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 users.o: ../../../morm/src/flatexpression.h
 users.o: ../../../winix/winixd/models/itemcontent.h error.h config.h
-users.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h winix_const.h
+users.o: textstream.h misc.h ../../../pikotools/utf8/utf8.h
+users.o: ../../../pikotools/utf8/utf8_templates.h
+users.o: ../../../pikotools/utf8/utf8_private.h winix_const.h
 users.o: ../../../pikotools/convert/convert.h
 users.o: ../../../pikotools/convert/inttostr.h
 users.o: ../../../pikotools/convert/patternreplacer.h
@@ -1533,10 +1589,9 @@ users.o: ../../../pikotools/convert/strtoint.h
 users.o: ../../../pikotools/convert/text.h
 users.o: ../../../winix/winixd/templates/htmltextstream.h
 users.o: ../../../winix/winixd/core/textstream.h
-users.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
-users.o: session.h plugindata.h rebus.h ipban.h mount.h
-users.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
-users.o: ../../../winix/winixd/db/dbconn.h
+users.o: ../../../ezc/src/outstreams.h session.h plugindata.h rebus.h ipban.h
+users.o: mount.h ../../../winix/winixd/db/db.h
+users.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
 users.o: ../../../winix/winixd/db/dbtextstream.h
 users.o: ../../../winix/winixd/core/winixbase.h
 users.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/user.h
@@ -1575,11 +1630,11 @@ users.o: ../../../tito/src/aes.h
 winixbase.o: winixbase.h ../../../winix/winixd/core/config.h
 winixbase.o: ../../../pikotools/space/spaceparser.h
 winixbase.o: ../../../pikotools/space/space.h
-winixbase.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+winixbase.o: ../../../pikotools/textstream/types.h
+winixbase.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 winixbase.o: ../../../pikotools/log/log.h
 winixbase.o: ../../../pikotools/textstream/textstream.h
 winixbase.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-winixbase.o: ../../../pikotools/convert/inttostr.h
 winixbase.o: ../../../pikotools/membuffer/membuffer.h
 winixbase.o: ../../../pikotools/textstream/types.h filelog.h
 winixbase.o: ../../../winix/winixd/core/synchro.h
@@ -1590,11 +1645,11 @@ winixmodel.o: pluginmsg.h plugindata.h winixbase.h
 winixmodel.o: ../../../winix/winixd/core/config.h
 winixmodel.o: ../../../pikotools/space/spaceparser.h
 winixmodel.o: ../../../pikotools/space/space.h
-winixmodel.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
+winixmodel.o: ../../../pikotools/textstream/types.h
+winixmodel.o: ../../../pikotools/convert/inttostr.h log.h logmanipulators.h
 winixmodel.o: ../../../pikotools/log/log.h
 winixmodel.o: ../../../pikotools/textstream/textstream.h
 winixmodel.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-winixmodel.o: ../../../pikotools/convert/inttostr.h
 winixmodel.o: ../../../pikotools/membuffer/membuffer.h
 winixmodel.o: ../../../pikotools/textstream/types.h filelog.h
 winixmodel.o: ../../../winix/winixd/core/synchro.h
@@ -1610,8 +1665,10 @@ winixmodel.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
 winixmodel.o: ../../../morm/src/finderhelper.h
 winixmodel.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 winixmodel.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-winixmodel.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
-winixmodel.o: ../../../morm/src/jsonexpression.h
+winixmodel.o: ../../../pikotools/utf8/utf8.h
+winixmodel.o: ../../../pikotools/utf8/utf8_templates.h
+winixmodel.o: ../../../pikotools/utf8/utf8_private.h
+winixmodel.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 winixmodel.o: ../../../morm/src/postgresqlexpression.h
 winixmodel.o: ../../../morm/src/jsonconnector.h
 winixmodel.o: ../../../morm/src/postgresqlconnector.h

winixd/db/Makefile.dep

@@ -6,9 +6,11 @@ db.o: ../../../winix/winixd/core/misc.h
 db.o: ../../../winix/winixd/core/requesttypes.h
 db.o: ../../../pikotools/textstream/textstream.h
 db.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
-db.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h
+db.o: ../../../pikotools/convert/inttostr.h ../../../pikotools/date/date.h
 db.o: ../../../pikotools/membuffer/membuffer.h
 db.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
+db.o: ../../../pikotools/utf8/utf8_templates.h
+db.o: ../../../pikotools/utf8/utf8_private.h
 db.o: ../../../winix/winixd/core/winix_const.h
 db.o: ../../../pikotools/convert/convert.h
 db.o: ../../../pikotools/convert/inttostr.h
@@ -45,11 +47,13 @@ dbbase.o: ../../../winix/winixd/core/requesttypes.h
 dbbase.o: ../../../pikotools/textstream/textstream.h
 dbbase.o: ../../../pikotools/space/space.h
 dbbase.o: ../../../pikotools/textstream/types.h
-dbbase.o: ../../../pikotools/date/date.h
 dbbase.o: ../../../pikotools/convert/inttostr.h
+dbbase.o: ../../../pikotools/date/date.h
 dbbase.o: ../../../pikotools/membuffer/membuffer.h
 dbbase.o: ../../../pikotools/textstream/types.h
 dbbase.o: ../../../pikotools/utf8/utf8.h
+dbbase.o: ../../../pikotools/utf8/utf8_templates.h
+dbbase.o: ../../../pikotools/utf8/utf8_private.h
 dbbase.o: ../../../winix/winixd/core/winix_const.h
 dbbase.o: ../../../pikotools/convert/convert.h
 dbbase.o: ../../../pikotools/convert/inttostr.h
@@ -75,11 +79,13 @@ dbconn.o: ../../../winix/winixd/core/requesttypes.h
 dbconn.o: ../../../pikotools/textstream/textstream.h
 dbconn.o: ../../../pikotools/space/space.h
 dbconn.o: ../../../pikotools/textstream/types.h
-dbconn.o: ../../../pikotools/date/date.h
 dbconn.o: ../../../pikotools/convert/inttostr.h
+dbconn.o: ../../../pikotools/date/date.h
 dbconn.o: ../../../pikotools/membuffer/membuffer.h
 dbconn.o: ../../../pikotools/textstream/types.h
 dbconn.o: ../../../pikotools/utf8/utf8.h
+dbconn.o: ../../../pikotools/utf8/utf8_templates.h
+dbconn.o: ../../../pikotools/utf8/utf8_private.h
 dbconn.o: ../../../winix/winixd/core/winix_const.h
 dbconn.o: ../../../pikotools/convert/convert.h
 dbconn.o: ../../../pikotools/convert/inttostr.h
@@ -104,11 +110,13 @@ dbtextstream.o: ../../../winix/winixd/core/requesttypes.h
 dbtextstream.o: ../../../pikotools/textstream/textstream.h
 dbtextstream.o: ../../../pikotools/space/space.h
 dbtextstream.o: ../../../pikotools/textstream/types.h
-dbtextstream.o: ../../../pikotools/date/date.h
 dbtextstream.o: ../../../pikotools/convert/inttostr.h
+dbtextstream.o: ../../../pikotools/date/date.h
 dbtextstream.o: ../../../pikotools/membuffer/membuffer.h
 dbtextstream.o: ../../../pikotools/textstream/types.h
 dbtextstream.o: ../../../pikotools/utf8/utf8.h
+dbtextstream.o: ../../../pikotools/utf8/utf8_templates.h
+dbtextstream.o: ../../../pikotools/utf8/utf8_private.h
 dbtextstream.o: ../../../winix/winixd/core/winix_const.h
 dbtextstream.o: ../../../pikotools/convert/convert.h
 dbtextstream.o: ../../../pikotools/convert/inttostr.h

winixd/main/Makefile.dep

@@ -6,8 +6,8 @@ main.o: ../../../winix/winixd/core/sessioncontainer.h
 main.o: ../../../winix/winixd/core/session.h
 main.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/user.h
 main.o: ../../../pikotools/space/space.h
-main.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
-main.o: ../../../pikotools/convert/inttostr.h
+main.o: ../../../pikotools/textstream/types.h
+main.o: ../../../pikotools/convert/inttostr.h ../../../pikotools/date/date.h
 main.o: ../../../winix/winixd/core/plugindata.h
 main.o: ../../../winix/winixd/core/rebus.h
 main.o: ../../../winix/winixd/core/winixbase.h
@@ -28,6 +28,8 @@ main.o: ../../../winix/winixd/core/textstream.h
 main.o: ../../../winix/winixd/core/misc.h
 main.o: ../../../winix/winixd/core/requesttypes.h
 main.o: ../../../pikotools/utf8/utf8.h
+main.o: ../../../pikotools/utf8/utf8_templates.h
+main.o: ../../../pikotools/utf8/utf8_private.h
 main.o: ../../../winix/winixd/core/winix_const.h
 main.o: ../../../pikotools/convert/convert.h
 main.o: ../../../pikotools/convert/inttostr.h
@@ -47,8 +49,7 @@ main.o: ../../../morm/src/flatexpression.h
 main.o: ../../../winix/winixd/models/itemcontent.h
 main.o: ../../../winix/winixd/core/config.h
 main.o: ../../../winix/winixd/templates/htmltextstream.h
-main.o: ../../../winix/winixd/core/textstream.h
-main.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
+main.o: ../../../winix/winixd/core/textstream.h ../../../ezc/src/outstreams.h
 main.o: ../../../winix/winixd/core/mount.h
 main.o: ../../../winix/winixd/core/winixmodel.h
 main.o: ../../../winix/winixd/core/winixbase.h
@@ -170,6 +171,5 @@ main.o: ../../../winix/winixd/core/cookieparser.h
 main.o: ../../../winix/winixd/core/postmultiparser.h
 main.o: ../../../winix/winixd/core/acceptencodingparser.h
 main.o: ../../../winix/winixd/core/acceptbaseparser.h
-main.o: ../../../pikotools/space/jsontospaceparser.h
 main.o: ../../../winix/winixd/core/winixrequest.h
 main.o: ../../../winix/winixd/core/version.h

winixd/models/Makefile.dep

@@ -3,8 +3,8 @@
 item.o: ../../../winix/winixd/models/item.h ../../../morm/src/model.h
 item.o: ../../../pikotools/textstream/textstream.h
 item.o: ../../../pikotools/space/space.h
-item.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
-item.o: ../../../pikotools/convert/inttostr.h
+item.o: ../../../pikotools/textstream/types.h
+item.o: ../../../pikotools/convert/inttostr.h ../../../pikotools/date/date.h
 item.o: ../../../pikotools/membuffer/membuffer.h
 item.o: ../../../pikotools/textstream/types.h
 item.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
@@ -20,6 +20,8 @@ item.o: ../../../winix/winixd/models/itemcontent.h
 item.o: ../../../winix/winixd/core/misc.h
 item.o: ../../../winix/winixd/core/requesttypes.h
 item.o: ../../../pikotools/utf8/utf8.h
+item.o: ../../../pikotools/utf8/utf8_templates.h
+item.o: ../../../pikotools/utf8/utf8_private.h
 item.o: ../../../winix/winixd/core/winix_const.h
 item.o: ../../../pikotools/convert/convert.h
 item.o: ../../../pikotools/convert/inttostr.h
@@ -30,9 +32,8 @@ item.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 itemcontent.o: ../../../winix/winixd/models/itemcontent.h
 itemcontent.o: ../../../pikotools/space/space.h
 itemcontent.o: ../../../pikotools/textstream/types.h
-itemcontent.o: ../../../pikotools/date/date.h
 itemcontent.o: ../../../pikotools/convert/inttostr.h
-itemcontent.o: ../../../morm/src/model.h
+itemcontent.o: ../../../pikotools/date/date.h ../../../morm/src/model.h
 itemcontent.o: ../../../pikotools/textstream/textstream.h
 itemcontent.o: ../../../pikotools/membuffer/membuffer.h
 itemcontent.o: ../../../pikotools/textstream/types.h
@@ -66,6 +67,8 @@ itemcontent.o: ../../../winix/winixd/core/user.h
 itemcontent.o: ../../../winix/winixd/core/misc.h
 itemcontent.o: ../../../winix/winixd/core/requesttypes.h
 itemcontent.o: ../../../pikotools/utf8/utf8.h
+itemcontent.o: ../../../pikotools/utf8/utf8_templates.h
+itemcontent.o: ../../../pikotools/utf8/utf8_private.h
 itemcontent.o: ../../../winix/winixd/core/winix_const.h
 itemcontent.o: ../../../pikotools/convert/convert.h
 itemcontent.o: ../../../pikotools/convert/inttostr.h

winixd/notify/Makefile.dep

@@ -4,9 +4,9 @@ notify.o: notify.h notifypool.h ../../../winix/winixd/templates/locale.h
 notify.o: ../../../pikotools/space/spaceparser.h
 notify.o: ../../../pikotools/space/space.h
 notify.o: ../../../pikotools/textstream/types.h
+notify.o: ../../../pikotools/convert/inttostr.h
 notify.o: ../../../pikotools/textstream/textstream.h
 notify.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-notify.o: ../../../pikotools/convert/inttostr.h
 notify.o: ../../../pikotools/membuffer/membuffer.h
 notify.o: ../../../pikotools/textstream/types.h
 notify.o: ../../../winix/winixd/core/winixbase.h
@@ -28,7 +28,9 @@ notify.o: ../../../winix/winixd/templates/localefilter.h
 notify.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 notify.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 notify.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
-notify.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
+notify.o: ../../../pikotools/utf8/utf8.h
+notify.o: ../../../pikotools/utf8/utf8_templates.h
+notify.o: ../../../pikotools/utf8/utf8_private.h ../../../ezc/src/funinfo.h
 notify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
 notify.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
 notify.o: ../../../ezc/src/patternparser.h notifythread.h
@@ -66,7 +68,6 @@ notify.o: ../../../winix/winixd/core/error.h
 notify.o: ../../../winix/winixd/core/config.h
 notify.o: ../../../winix/winixd/core/textstream.h
 notify.o: ../../../winix/winixd/templates/htmltextstream.h
-notify.o: ../../../pikotools/space/spacetojson.h
 notify.o: ../../../winix/winixd/core/session.h
 notify.o: ../../../winix/winixd/core/rebus.h
 notify.o: ../../../winix/winixd/core/ipban.h
@@ -120,9 +121,9 @@ notifypool.o: notifypool.h ../../../winix/winixd/templates/locale.h
 notifypool.o: ../../../pikotools/space/spaceparser.h
 notifypool.o: ../../../pikotools/space/space.h
 notifypool.o: ../../../pikotools/textstream/types.h
+notifypool.o: ../../../pikotools/convert/inttostr.h
 notifypool.o: ../../../pikotools/textstream/textstream.h
 notifypool.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-notifypool.o: ../../../pikotools/convert/inttostr.h
 notifypool.o: ../../../pikotools/membuffer/membuffer.h
 notifypool.o: ../../../pikotools/textstream/types.h
 notifypool.o: ../../../winix/winixd/core/winixbase.h
@@ -147,13 +148,13 @@ notifythread.o: ../../../winix/winixd/core/config.h
 notifythread.o: ../../../pikotools/space/spaceparser.h
 notifythread.o: ../../../pikotools/space/space.h
 notifythread.o: ../../../pikotools/textstream/types.h
+notifythread.o: ../../../pikotools/convert/inttostr.h
 notifythread.o: ../../../winix/winixd/core/log.h
 notifythread.o: ../../../winix/winixd/core/logmanipulators.h
 notifythread.o: ../../../pikotools/log/log.h
 notifythread.o: ../../../pikotools/textstream/textstream.h
 notifythread.o: ../../../pikotools/space/space.h
 notifythread.o: ../../../pikotools/date/date.h
-notifythread.o: ../../../pikotools/convert/inttostr.h
 notifythread.o: ../../../pikotools/membuffer/membuffer.h
 notifythread.o: ../../../pikotools/textstream/types.h
 notifythread.o: ../../../pikotools/log/filelog.h
@@ -177,8 +178,10 @@ notifythread.o: ../../../morm/src/cursorhelper.h
 notifythread.o: ../../../morm/src/finderhelper.h
 notifythread.o: ../../../morm/src/fieldvaluehelper.h ../../../morm/src/ft.h
 notifythread.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-notifythread.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
-notifythread.o: ../../../morm/src/jsonexpression.h
+notifythread.o: ../../../pikotools/utf8/utf8.h
+notifythread.o: ../../../pikotools/utf8/utf8_templates.h
+notifythread.o: ../../../pikotools/utf8/utf8_private.h
+notifythread.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 notifythread.o: ../../../morm/src/postgresqlexpression.h
 notifythread.o: ../../../morm/src/jsonconnector.h
 notifythread.o: ../../../morm/src/postgresqlconnector.h
@@ -209,7 +212,6 @@ notifythread.o: ../../../winix/winixd/core/error.h
 notifythread.o: ../../../winix/winixd/core/config.h
 notifythread.o: ../../../winix/winixd/core/textstream.h
 notifythread.o: ../../../winix/winixd/templates/htmltextstream.h
-notifythread.o: ../../../pikotools/space/spacetojson.h
 notifythread.o: ../../../winix/winixd/core/session.h
 notifythread.o: ../../../winix/winixd/core/rebus.h
 notifythread.o: ../../../winix/winixd/core/ipban.h
@@ -237,6 +239,8 @@ templatesnotify.o: ../../../pikotools/date/date.h
 templatesnotify.o: ../../../pikotools/convert/inttostr.h
 templatesnotify.o: ../../../pikotools/membuffer/membuffer.h
 templatesnotify.o: ../../../pikotools/textstream/types.h
+templatesnotify.o: ../../../pikotools/utf8/utf8_templates.h
+templatesnotify.o: ../../../pikotools/utf8/utf8_private.h
 templatesnotify.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
 templatesnotify.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
 templatesnotify.o: ../../../ezc/src/expressionparser.h

winixd/plugins/export/Makefile.dep

@@ -9,11 +9,13 @@ edb.o: ../../../../winix/winixd/core/requesttypes.h
 edb.o: ../../../../pikotools/textstream/textstream.h
 edb.o: ../../../../pikotools/space/space.h
 edb.o: ../../../../pikotools/textstream/types.h
-edb.o: ../../../../pikotools/date/date.h
 edb.o: ../../../../pikotools/convert/inttostr.h
+edb.o: ../../../../pikotools/date/date.h
 edb.o: ../../../../pikotools/membuffer/membuffer.h
 edb.o: ../../../../pikotools/textstream/types.h
 edb.o: ../../../../pikotools/utf8/utf8.h
+edb.o: ../../../../pikotools/utf8/utf8_templates.h
+edb.o: ../../../../pikotools/utf8/utf8_private.h
 edb.o: ../../../../winix/winixd/core/winix_const.h
 edb.o: ../../../../pikotools/convert/convert.h
 edb.o: ../../../../pikotools/convert/inttostr.h
@@ -58,7 +60,6 @@ edb.o: ../../../../winix/winixd/core/error.h
 edb.o: ../../../../winix/winixd/core/config.h
 edb.o: ../../../../winix/winixd/core/textstream.h
 edb.o: ../../../../winix/winixd/templates/htmltextstream.h
-edb.o: ../../../../pikotools/space/spacetojson.h
 edb.o: ../../../../ezc/src/outstreams.h
 edb.o: ../../../../winix/winixd/core/winixmodel.h
 edb.o: ../../../../winix/winixd/core/plugin.h
@@ -86,8 +87,8 @@ exportinfo.o: ../../../../pikotools/log/log.h
 exportinfo.o: ../../../../pikotools/textstream/textstream.h
 exportinfo.o: ../../../../pikotools/space/space.h
 exportinfo.o: ../../../../pikotools/textstream/types.h
-exportinfo.o: ../../../../pikotools/date/date.h
 exportinfo.o: ../../../../pikotools/convert/inttostr.h
+exportinfo.o: ../../../../pikotools/date/date.h
 exportinfo.o: ../../../../pikotools/membuffer/membuffer.h
 exportinfo.o: ../../../../pikotools/textstream/types.h
 exportinfo.o: ../../../../pikotools/log/filelog.h
@@ -114,6 +115,8 @@ exportinfo.o: ../../../../morm/src/finderhelper.h
 exportinfo.o: ../../../../morm/src/fieldvaluehelper.h
 exportinfo.o: ../../../../morm/src/ft.h ../../../../morm/src/flatexpression.h
 exportinfo.o: ../../../../morm/src/finder.h ../../../../pikotools/utf8/utf8.h
+exportinfo.o: ../../../../pikotools/utf8/utf8_templates.h
+exportinfo.o: ../../../../pikotools/utf8/utf8_private.h
 exportinfo.o: ../../../../morm/src/cursor.h
 exportinfo.o: ../../../../morm/src/jsonexpression.h
 exportinfo.o: ../../../../morm/src/postgresqlexpression.h
@@ -144,7 +147,6 @@ exportinfo.o: ../../../../pikotools/convert/inttostr.h
 exportinfo.o: ../../../../pikotools/convert/patternreplacer.h
 exportinfo.o: ../../../../pikotools/convert/strtoint.h
 exportinfo.o: ../../../../pikotools/convert/text.h
-exportinfo.o: ../../../../pikotools/space/spacetojson.h
 exportinfo.o: ../../../../ezc/src/outstreams.h
 exportinfo.o: ../../../../winix/winixd/core/mounts.h
 exportinfo.o: ../../../../winix/winixd/core/mount.h
@@ -198,11 +200,13 @@ exportthread.o: ../../../../winix/winixd/core/requesttypes.h
 exportthread.o: ../../../../pikotools/textstream/textstream.h
 exportthread.o: ../../../../pikotools/space/space.h
 exportthread.o: ../../../../pikotools/textstream/types.h
-exportthread.o: ../../../../pikotools/date/date.h
 exportthread.o: ../../../../pikotools/convert/inttostr.h
+exportthread.o: ../../../../pikotools/date/date.h
 exportthread.o: ../../../../pikotools/membuffer/membuffer.h
 exportthread.o: ../../../../pikotools/textstream/types.h
 exportthread.o: ../../../../pikotools/utf8/utf8.h
+exportthread.o: ../../../../pikotools/utf8/utf8_templates.h
+exportthread.o: ../../../../pikotools/utf8/utf8_private.h
 exportthread.o: ../../../../winix/winixd/core/winix_const.h
 exportthread.o: ../../../../pikotools/convert/convert.h
 exportthread.o: ../../../../pikotools/convert/inttostr.h
@@ -217,8 +221,8 @@ funexport.o: ../../../../winix/winixd/db/dbbase.h
 funexport.o: ../../../../winix/winixd/core/user.h
 funexport.o: ../../../../pikotools/space/space.h
 funexport.o: ../../../../pikotools/textstream/types.h
-funexport.o: ../../../../pikotools/date/date.h
 funexport.o: ../../../../pikotools/convert/inttostr.h
+funexport.o: ../../../../pikotools/date/date.h
 funexport.o: ../../../../winix/winixd/core/group.h
 funexport.o: ../../../../winix/winixd/core/dircontainer.h
 funexport.o: ../../../../winix/winixd/core/ugcontainer.h
@@ -253,17 +257,18 @@ funexport.o: ../../../../winix/winixd/templates/htmltextstream.h
 funexport.o: ../../../../winix/winixd/core/textstream.h
 funexport.o: ../../../../winix/winixd/core/misc.h
 funexport.o: ../../../../pikotools/utf8/utf8.h
+funexport.o: ../../../../pikotools/utf8/utf8_templates.h
+funexport.o: ../../../../pikotools/utf8/utf8_private.h
 funexport.o: ../../../../winix/winixd/core/winix_const.h
 funexport.o: ../../../../pikotools/convert/convert.h
 funexport.o: ../../../../pikotools/convert/inttostr.h
 funexport.o: ../../../../pikotools/convert/patternreplacer.h
 funexport.o: ../../../../pikotools/convert/strtoint.h
 funexport.o: ../../../../pikotools/convert/text.h
-funexport.o: ../../../../pikotools/space/spacetojson.h
-funexport.o: ../../../../pikotools/space/space.h
 funexport.o: ../../../../ezc/src/outstreams.h
 funexport.o: ../../../../winix/winixd/core/config.h
 funexport.o: ../../../../pikotools/space/spaceparser.h
+funexport.o: ../../../../pikotools/space/space.h
 funexport.o: ../../../../winix/winixd/core/log.h
 funexport.o: ../../../../winix/winixd/core/logmanipulators.h
 funexport.o: ../../../../winix/winixd/core/system.h
@@ -383,8 +388,10 @@ init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
 init.o: ../../../../morm/src/finderhelper.h
 init.o: ../../../../morm/src/fieldvaluehelper.h ../../../../morm/src/ft.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
-init.o: ../../../../pikotools/utf8/utf8.h ../../../../morm/src/cursor.h
-init.o: ../../../../morm/src/jsonexpression.h
+init.o: ../../../../pikotools/utf8/utf8.h