diff --git a/winixd/core/Makefile.dep b/winixd/core/Makefile.dep
index e53cf74..3d9b2bb 100644
--- a/winixd/core/Makefile.dep
+++ b/winixd/core/Makefile.dep
@@ -4,9 +4,8 @@ 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 htmlfilter.h log.h
-acceptbaseparser.o: textstream.h misc.h item.h
-acceptbaseparser.o: ../../../pikotools/space/space.h
+acceptbaseparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+acceptbaseparser.o: misc.h item.h ../../../pikotools/space/space.h
 acceptbaseparser.o: ../../../pikotools/date/date.h
 acceptbaseparser.o: ../../../pikotools/convert/convert.h
 acceptbaseparser.o: ../../../pikotools/convert/inttostr.h
@@ -33,7 +32,7 @@ app.o: winix_const.h error.h user.h plugindata.h rebus.h winixbase.h
 app.o: ../../../winix/winixd/core/config.h
 app.o: ../../../pikotools/space/spaceparser.h
 app.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
-app.o: htmlfilter.h log.h textstream.h logmanipulators.h filelog.h
+app.o: log.h textstream.h logmanipulators.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 ipban.h cur.h
 app.o: request.h config.h ../../../winix/winixd/templates/htmltextstream.h
@@ -136,8 +135,8 @@ 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 htmlfilter.h log.h
-basethread.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+basethread.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+basethread.o: item.h ../../../pikotools/space/space.h
 basethread.o: ../../../pikotools/date/date.h
 basethread.o: ../../../pikotools/convert/convert.h
 basethread.o: ../../../pikotools/convert/inttostr.h
@@ -151,6 +150,7 @@ basethread.o: filelog.h ../../../winix/winixd/core/synchro.h
 basethread.o: ../../../winix/winixd/core/log.h
 basethread.o: ../../../winix/winixd/core/filelog.h lock.h
 bbcodeparser.o: bbcodeparser.h htmlfilter.h
+bbcodeparser.o: ../../../winix/winixd/core/winixbase.h
 compress.o: compress.h requesttypes.h
 compress.o: ../../../pikotools/textstream/textstream.h
 compress.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
@@ -164,9 +164,8 @@ compress.o: ../../../pikotools/textstream/types.h winixbase.h
 compress.o: ../../../winix/winixd/core/config.h
 compress.o: ../../../pikotools/space/spaceparser.h
 compress.o: ../../../pikotools/space/space.h
-compress.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-compress.o: textstream.h logmanipulators.h filelog.h
-compress.o: ../../../winix/winixd/core/synchro.h
+compress.o: ../../../pikotools/textstream/types.h log.h textstream.h
+compress.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 compress.o: ../../../winix/winixd/core/log.h
 compress.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 config.o: config.h log.h textstream.h misc.h item.h
@@ -183,14 +182,14 @@ config.o: filelog.h ../../../winix/winixd/core/synchro.h crypt.h run.h
 config.o: winixbase.h ../../../winix/winixd/core/config.h
 config.o: ../../../pikotools/space/spaceparser.h
 config.o: ../../../pikotools/space/space.h
-config.o: ../../../pikotools/textstream/types.h htmlfilter.h
+config.o: ../../../pikotools/textstream/types.h
 config.o: ../../../winix/winixd/core/log.h
 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 htmlfilter.h log.h
-crypt.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+crypt.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+crypt.o: item.h ../../../pikotools/space/space.h
 crypt.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 crypt.o: ../../../pikotools/convert/inttostr.h
 crypt.o: ../../../pikotools/convert/strtoint.h
@@ -216,8 +215,8 @@ dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.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 htmlfilter.h log.h
-dircontainer.o: textstream.h logmanipulators.h filelog.h
+dircontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
+dircontainer.o: logmanipulators.h filelog.h
 dircontainer.o: ../../../winix/winixd/core/synchro.h
 dircontainer.o: ../../../winix/winixd/core/log.h
 dircontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -233,7 +232,7 @@ dirs.o: winix_const.h dircontainer.h winixbase.h
 dirs.o: ../../../winix/winixd/core/config.h
 dirs.o: ../../../pikotools/space/spaceparser.h
 dirs.o: ../../../pikotools/space/space.h
-dirs.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h textstream.h
+dirs.o: ../../../pikotools/textstream/types.h log.h textstream.h
 dirs.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 dirs.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
 dirs.o: lock.h synchro.h ../../../winix/winixd/db/db.h
@@ -281,8 +280,8 @@ filelog.o: ../../../winix/winixd/core/synchro.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
-filelog.o: ../../../winix/winixd/core/config.h htmlfilter.h log.h
-filelog.o: logmanipulators.h ../../../winix/winixd/core/log.h
+filelog.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
+filelog.o: ../../../winix/winixd/core/log.h
 filelog.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 groups.o: groups.h group.h ugcontainer.h ../../../winix/winixd/db/db.h
 groups.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
@@ -309,21 +308,20 @@ groups.o: ../../../winix/winixd/core/user.h
 groups.o: ../../../winix/winixd/core/group.h
 groups.o: ../../../winix/winixd/core/dircontainer.h
 groups.o: ../../../winix/winixd/core/ugcontainer.h winixbase.h
-groups.o: ../../../winix/winixd/core/config.h htmlfilter.h log.h textstream.h
+groups.o: ../../../winix/winixd/core/config.h log.h textstream.h
 groups.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 groups.o: ../../../winix/winixd/core/log.h
 groups.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h winixmodel.h
 groups.o: plugin.h pluginmsg.h plugindata.h
-htmlfilter.o: htmlfilter.h
+htmlfilter.o: htmlfilter.h ../../../winix/winixd/core/winixbase.h
 httpsimpleparser.o: httpsimpleparser.h winixmodel.h
 httpsimpleparser.o: ../../../winix/winixd/core/winixbase.h plugin.h
 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 htmlfilter.h log.h
-httpsimpleparser.o: textstream.h misc.h item.h
-httpsimpleparser.o: ../../../pikotools/space/space.h
+httpsimpleparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+httpsimpleparser.o: misc.h item.h ../../../pikotools/space/space.h
 httpsimpleparser.o: ../../../pikotools/date/date.h
 httpsimpleparser.o: ../../../pikotools/convert/convert.h
 httpsimpleparser.o: ../../../pikotools/convert/inttostr.h
@@ -342,8 +340,8 @@ 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 htmlfilter.h log.h
-image.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+image.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+image.o: item.h ../../../pikotools/space/space.h
 image.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 image.o: ../../../pikotools/convert/inttostr.h
 image.o: ../../../pikotools/convert/strtoint.h
@@ -394,8 +392,8 @@ 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 htmlfilter.h log.h
-ipbancontainer.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+ipbancontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
+ipbancontainer.o: misc.h item.h ../../../pikotools/space/space.h
 ipbancontainer.o: ../../../pikotools/date/date.h
 ipbancontainer.o: ../../../pikotools/convert/convert.h
 ipbancontainer.o: ../../../pikotools/convert/inttostr.h
@@ -421,7 +419,7 @@ item.o: winix_const.h crypt.h run.h winixbase.h
 item.o: ../../../winix/winixd/core/config.h
 item.o: ../../../pikotools/space/spaceparser.h
 item.o: ../../../pikotools/space/space.h
-item.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h textstream.h
+item.o: ../../../pikotools/textstream/types.h log.h textstream.h
 item.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 item.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
 item.o: lock.h synchro.h config.h user.h
@@ -430,9 +428,8 @@ 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: htmlfilter.h log.h textstream.h misc.h item.h
-job.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-job.o: ../../../pikotools/convert/convert.h
+job.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h
+job.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 job.o: ../../../pikotools/convert/inttostr.h
 job.o: ../../../pikotools/convert/strtoint.h
 job.o: ../../../pikotools/convert/text.h requesttypes.h
@@ -455,16 +452,16 @@ lastcontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h winixbase.h
 lastcontainer.o: ../../../winix/winixd/core/config.h
 lastcontainer.o: ../../../pikotools/space/spaceparser.h
 lastcontainer.o: ../../../pikotools/space/space.h
-lastcontainer.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-lastcontainer.o: textstream.h logmanipulators.h filelog.h
+lastcontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
+lastcontainer.o: logmanipulators.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
 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 htmlfilter.h log.h
-loadavg.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+loadavg.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+loadavg.o: item.h ../../../pikotools/space/space.h
 loadavg.o: ../../../pikotools/date/date.h
 loadavg.o: ../../../pikotools/convert/convert.h
 loadavg.o: ../../../pikotools/convert/inttostr.h
@@ -505,6 +502,7 @@ misc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
 misc.o: ../../../ezc/src/patternparser.h
 misc.o: ../../../winix/winixd/templates/patterncacher.h
 misc.o: ../../../winix/winixd/core/item.h
+misc.o: ../../../winix/winixd/core/winixbase.h
 misc.o: ../../../winix/winixd/templates/indexpatterns.h
 misc.o: ../../../winix/winixd/templates/patterns.h
 misc.o: ../../../winix/winixd/templates/locale.h
@@ -514,7 +512,7 @@ misc.o: ../../../winix/winixd/templates/localefilter.h
 misc.o: ../../../winix/winixd/core/config.h
 misc.o: ../../../pikotools/space/spaceparser.h
 misc.o: ../../../pikotools/space/space.h
-misc.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h textstream.h
+misc.o: ../../../pikotools/textstream/types.h log.h textstream.h
 misc.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 misc.o: ../../../winix/winixd/core/cur.h ../../../winix/winixd/core/system.h
 misc.o: ../../../winix/winixd/core/sessionmanager.h
@@ -522,7 +520,6 @@ misc.o: ../../../winix/winixd/core/htmlfilter.h ../../../winix/winixd/db/db.h
 misc.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
 misc.o: ../../../winix/winixd/db/dbtextstream.h
 misc.o: ../../../winix/winixd/core/textstream.h
-misc.o: ../../../winix/winixd/core/winixbase.h
 misc.o: ../../../winix/winixd/core/error.h
 misc.o: ../../../winix/winixd/db/dbitemquery.h
 misc.o: ../../../winix/winixd/db/dbitemcolumns.h
@@ -530,7 +527,13 @@ misc.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h
 misc.o: ../../../winix/winixd/core/dircontainer.h
 misc.o: ../../../winix/winixd/core/ugcontainer.h winixbase.h
 misc.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-misc.o: lock.h synchro.h
+misc.o: lock.h synchro.h ../../../winix/winixd/core/winixrequest.h
+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: ../../../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
 mount.o: mount.h misc.h item.h ../../../pikotools/space/space.h
 mount.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 mount.o: ../../../pikotools/convert/inttostr.h
@@ -553,8 +556,8 @@ mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h dirs.h
 mountparser.o: dircontainer.h winixbase.h ../../../winix/winixd/core/config.h
 mountparser.o: ../../../pikotools/space/spaceparser.h
 mountparser.o: ../../../pikotools/space/space.h
-mountparser.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-mountparser.o: textstream.h logmanipulators.h filelog.h
+mountparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+mountparser.o: logmanipulators.h filelog.h
 mountparser.o: ../../../winix/winixd/core/synchro.h
 mountparser.o: ../../../winix/winixd/core/log.h
 mountparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -589,9 +592,8 @@ mounts.o: ../../../pikotools/utf8/utf8.h winix_const.h dircontainer.h
 mounts.o: winixbase.h ../../../winix/winixd/core/config.h
 mounts.o: ../../../pikotools/space/spaceparser.h
 mounts.o: ../../../pikotools/space/space.h
-mounts.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-mounts.o: textstream.h logmanipulators.h filelog.h
-mounts.o: ../../../winix/winixd/core/synchro.h
+mounts.o: ../../../pikotools/textstream/types.h log.h textstream.h
+mounts.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 mounts.o: ../../../winix/winixd/core/log.h
 mounts.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 mounts.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -615,8 +617,8 @@ 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 htmlfilter.h log.h
-plugin.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+plugin.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+plugin.o: item.h ../../../pikotools/space/space.h
 plugin.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 plugin.o: ../../../pikotools/convert/inttostr.h
 plugin.o: ../../../pikotools/convert/strtoint.h
@@ -723,13 +725,13 @@ plugin.o: ../../../winix/winixd/templates/patterncacher.h
 plugin.o: ../../../winix/winixd/templates/indexpatterns.h
 plugin.o: ../../../winix/winixd/templates/patterns.h
 plugin.o: ../../../winix/winixd/templates/changepatterns.h
-plugin.o: ../../../winix/winixd/templates/htmltextstream.h winixsystem.h
+plugin.o: ../../../winix/winixd/templates/htmltextstream.h winixrequest.h
 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 htmlfilter.h log.h
-plugindata.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+plugindata.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+plugindata.o: item.h ../../../pikotools/space/space.h
 plugindata.o: ../../../pikotools/date/date.h
 plugindata.o: ../../../pikotools/convert/convert.h
 plugindata.o: ../../../pikotools/convert/inttostr.h
@@ -756,8 +758,8 @@ postmultiparser.o: ../../../pikotools/textstream/types.h config.h winixbase.h
 postmultiparser.o: ../../../winix/winixd/core/config.h
 postmultiparser.o: ../../../pikotools/space/spaceparser.h
 postmultiparser.o: ../../../pikotools/space/space.h
-postmultiparser.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-postmultiparser.o: textstream.h logmanipulators.h filelog.h
+postmultiparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+postmultiparser.o: logmanipulators.h filelog.h
 postmultiparser.o: ../../../winix/winixd/core/synchro.h
 postmultiparser.o: ../../../winix/winixd/core/log.h
 postmultiparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -775,7 +777,7 @@ rebus.o: ../../../winix/winixd/core/synchro.h rebus.h winixbase.h
 rebus.o: ../../../winix/winixd/core/config.h
 rebus.o: ../../../pikotools/space/spaceparser.h
 rebus.o: ../../../pikotools/space/space.h
-rebus.o: ../../../pikotools/textstream/types.h htmlfilter.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 cur.h
 rebus.o: request.h error.h config.h
@@ -801,15 +803,14 @@ request.o: ../../../pikotools/textstream/types.h
 request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h filelog.h
 request.o: ../../../winix/winixd/core/synchro.h plugin.h pluginmsg.h
 request.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
-request.o: ../../../pikotools/space/spaceparser.h htmlfilter.h
+request.o: ../../../pikotools/space/spaceparser.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: htmlfilter.h log.h textstream.h misc.h item.h
-run.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-run.o: ../../../pikotools/convert/convert.h
+run.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h
+run.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 run.o: ../../../pikotools/convert/inttostr.h
 run.o: ../../../pikotools/convert/strtoint.h
 run.o: ../../../pikotools/convert/text.h requesttypes.h
@@ -833,9 +834,8 @@ session.o: plugindata.h rebus.h winixbase.h
 session.o: ../../../winix/winixd/core/config.h
 session.o: ../../../pikotools/space/spaceparser.h
 session.o: ../../../pikotools/space/space.h
-session.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-session.o: textstream.h logmanipulators.h filelog.h
-session.o: ../../../winix/winixd/core/synchro.h
+session.o: ../../../pikotools/textstream/types.h log.h textstream.h
+session.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 session.o: ../../../winix/winixd/core/log.h
 session.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h
 sessioncontainer.o: sessioncontainer.h session.h item.h
@@ -853,8 +853,8 @@ sessioncontainer.o: user.h plugindata.h rebus.h winixbase.h
 sessioncontainer.o: ../../../winix/winixd/core/config.h
 sessioncontainer.o: ../../../pikotools/space/spaceparser.h
 sessioncontainer.o: ../../../pikotools/space/space.h
-sessioncontainer.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-sessioncontainer.o: textstream.h logmanipulators.h filelog.h
+sessioncontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
+sessioncontainer.o: logmanipulators.h filelog.h
 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
@@ -870,8 +870,8 @@ 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 htmlfilter.h log.h
-sessionidmanager.o: textstream.h misc.h item.h ../../../pikotools/date/date.h
+sessionidmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
+sessionidmanager.o: misc.h item.h ../../../pikotools/date/date.h
 sessionidmanager.o: ../../../pikotools/convert/convert.h
 sessionidmanager.o: ../../../pikotools/convert/inttostr.h
 sessionidmanager.o: ../../../pikotools/convert/strtoint.h
@@ -899,8 +899,8 @@ sessionmanager.o: plugindata.h rebus.h winixbase.h
 sessionmanager.o: ../../../winix/winixd/core/config.h
 sessionmanager.o: ../../../pikotools/space/spaceparser.h
 sessionmanager.o: ../../../pikotools/space/space.h
-sessionmanager.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-sessionmanager.o: textstream.h logmanipulators.h filelog.h
+sessionmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
+sessionmanager.o: logmanipulators.h filelog.h
 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
@@ -968,8 +968,8 @@ sessionparser.o: plugindata.h rebus.h winixbase.h
 sessionparser.o: ../../../winix/winixd/core/config.h
 sessionparser.o: ../../../pikotools/space/spaceparser.h
 sessionparser.o: ../../../pikotools/space/space.h
-sessionparser.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-sessionparser.o: textstream.h logmanipulators.h filelog.h
+sessionparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+sessionparser.o: logmanipulators.h filelog.h
 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
@@ -1009,19 +1009,20 @@ slog.o: ../../../pikotools/space/space.h
 slog.o: ../../../pikotools/textstream/types.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 htmlfilter.h log.h
-slog.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
+slog.o: ../../../pikotools/space/spaceparser.h log.h logmanipulators.h
+slog.o: filelog.h ../../../winix/winixd/core/synchro.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
+slog.o: ../../../winix/winixd/core/winixbase.h
 synchro.o: synchro.h
 system.o: system.h job.h basethread.h synchro.h winixmodel.h
 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 htmlfilter.h log.h
-system.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+system.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+system.o: item.h ../../../pikotools/space/space.h
 system.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 system.o: ../../../pikotools/convert/inttostr.h
 system.o: ../../../pikotools/convert/strtoint.h
@@ -1077,12 +1078,12 @@ system.o: ../../../winix/winixd/core/cur.h
 system.o: ../../../winix/winixd/core/system.h
 system.o: ../../../winix/winixd/core/sessionmanager.h
 system.o: ../../../winix/winixd/core/htmlfilter.h
-system.o: ../../../winix/winixd/functions/functions.h
-system.o: ../../../winix/winixd/functions/functionbase.h
-system.o: ../../../winix/winixd/core/request.h
 system.o: ../../../winix/winixd/core/winixrequest.h
 system.o: ../../../winix/winixd/core/winixsystem.h
 system.o: ../../../winix/winixd/core/slog.h
+system.o: ../../../winix/winixd/functions/functions.h
+system.o: ../../../winix/winixd/functions/functionbase.h
+system.o: ../../../winix/winixd/core/request.h
 system.o: ../../../winix/winixd/functions/functionparser.h
 system.o: ../../../winix/winixd/functions/account.h
 system.o: ../../../winix/winixd/functions/adduser.h
@@ -1130,8 +1131,8 @@ 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 htmlfilter.h log.h
-threadmanager.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+threadmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
+threadmanager.o: misc.h item.h ../../../pikotools/space/space.h
 threadmanager.o: ../../../pikotools/date/date.h
 threadmanager.o: ../../../pikotools/convert/convert.h
 threadmanager.o: ../../../pikotools/convert/inttostr.h
@@ -1168,9 +1169,8 @@ timezones.o: ../../../pikotools/utf8/utf8.h winix_const.h
 timezones.o: ../../../pikotools/space/spaceparser.h
 timezones.o: ../../../pikotools/space/space.h
 timezones.o: ../../../pikotools/textstream/types.h winixbase.h
-timezones.o: ../../../winix/winixd/core/config.h htmlfilter.h log.h
-timezones.o: textstream.h logmanipulators.h filelog.h
-timezones.o: ../../../winix/winixd/core/synchro.h
+timezones.o: ../../../winix/winixd/core/config.h log.h textstream.h
+timezones.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 timezones.o: ../../../winix/winixd/core/log.h
 timezones.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 user.o: user.h ../../../pikotools/space/space.h
@@ -1194,9 +1194,8 @@ users.o: winix_const.h ugcontainer.h lastcontainer.h winixbase.h
 users.o: ../../../winix/winixd/core/config.h
 users.o: ../../../pikotools/space/spaceparser.h
 users.o: ../../../pikotools/space/space.h
-users.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-users.o: textstream.h logmanipulators.h filelog.h
-users.o: ../../../winix/winixd/core/synchro.h
+users.o: ../../../pikotools/textstream/types.h log.h textstream.h
+users.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 users.o: ../../../winix/winixd/core/log.h
 users.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h cur.h
 users.o: request.h error.h config.h
@@ -1239,8 +1238,8 @@ 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 htmlfilter.h log.h
-winixbase.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+winixbase.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+winixbase.o: item.h ../../../pikotools/space/space.h
 winixbase.o: ../../../pikotools/date/date.h
 winixbase.o: ../../../pikotools/convert/convert.h
 winixbase.o: ../../../pikotools/convert/inttostr.h
@@ -1258,8 +1257,8 @@ 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 htmlfilter.h log.h
-winixmodel.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+winixmodel.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+winixmodel.o: item.h ../../../pikotools/space/space.h
 winixmodel.o: ../../../pikotools/date/date.h
 winixmodel.o: ../../../pikotools/convert/convert.h
 winixmodel.o: ../../../pikotools/convert/inttostr.h
@@ -1273,4 +1272,5 @@ winixmodel.o: filelog.h ../../../winix/winixd/core/synchro.h
 winixmodel.o: ../../../winix/winixd/core/log.h
 winixmodel.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 winixrequest.o: winixrequest.h
-winixsystem.o: winixsystem.h
+winixsystem.o: winixsystem.h ../../../winix/winixd/core/winixmodel.h
+winixsystem.o: ../../../winix/winixd/core/system.h
diff --git a/winixd/core/app.cpp b/winixd/core/app.cpp
index 81c27f3..a18338b 100644
--- a/winixd/core/app.cpp
+++ b/winixd/core/app.cpp
@@ -111,7 +111,7 @@ App::App()
 	plugin.SetTemplates(&templates);
 	//plugin.SetSynchro(&synchro);
 	plugin.SetSessionManager(&session_manager);
-	plugin.SetWinixSystem(&winix_system);
+	plugin.SetWinixRequest(&winix_request);
 
 	req.SetConfig(&config);
 
@@ -138,6 +138,7 @@ App::App()
 	system.SetFunctions(&functions);
 	system.SetSessionManager(&session_manager);
 
+	templates.set_dependency(&winix_request);
 	templates.SetConfig(&config);
 	templates.SetCur(&cur);
 	templates.SetDb(&db);
@@ -163,6 +164,9 @@ void App::InitFileLog()
 	file_log.set_synchro(&synchro);
 	file_log.set_time_zones(&system.time_zones);
 	file_log.init(config.log_file, config.log_stdout, config.log_time_zone_id);
+
+	log.SetFileLog(&file_log);
+	log.Init(config.log_level, config.log_save_each_line, config.log_request);
 }
 
 
@@ -1901,6 +1905,8 @@ void App::LogUserGroups()
 {
 	LogUsers();
 	LogGroups();
+
+	log << log3 << "base_url: " << config.base_url << logend;
 }
 
 
diff --git a/winixd/core/config.cpp b/winixd/core/config.cpp
index 4230980..099319d 100644
--- a/winixd/core/config.cpp
+++ b/winixd/core/config.cpp
@@ -324,11 +324,6 @@ void Config::AssignValues(bool stdout_is_closed)
 
 void Config::SetAdditionalVariables()
 {
-	if( html_filter_orphans_mode_str == L"160" )
-		html_filter_orphans_mode = HTMLFilter::orphan_160space;
-	else
-		html_filter_orphans_mode = HTMLFilter::orphan_nbsp;
-
 	for(size_t i=0 ; i<static_dirs.size() ; ++i)
 		NoLastSlash(static_dirs[i]);
 
diff --git a/winixd/core/config.h b/winixd/core/config.h
index 319dbd0..a7054d4 100644
--- a/winixd/core/config.h
+++ b/winixd/core/config.h
@@ -37,7 +37,6 @@
 
 #include <string>
 #include "space/spaceparser.h"
-#include "htmlfilter.h"
 #include "log.h"
 #include "filelog.h"
 
@@ -331,7 +330,6 @@ public:
 	// either: "nbsp" or "160"
 	// default: "nbsp"
 	std::wstring html_filter_orphans_mode_str;
-	HTMLFilter::OrphanMode html_filter_orphans_mode;
 
 	// the html nofilter tag
 	// content betweeng these tags (opening and closing) will not be filtered
diff --git a/winixd/core/htmlfilter.cpp b/winixd/core/htmlfilter.cpp
index dc257fa..0145958 100644
--- a/winixd/core/htmlfilter.cpp
+++ b/winixd/core/htmlfilter.cpp
@@ -234,9 +234,12 @@ void HTMLFilter::ClearOrphans()
 
 
 
-void HTMLFilter::OrphansMode(HTMLFilter::OrphanMode mode)
+void HTMLFilter::OrphansMode(const std::wstring & orphan_mode_str)
 {
-	orphan_mode = mode;
+	if( orphan_mode_str == L"160" )
+		orphan_mode = orphan_160space;
+	else
+		orphan_mode = orphan_nbsp;
 }
 
 
diff --git a/winixd/core/htmlfilter.h b/winixd/core/htmlfilter.h
index daa1643..5cabb8f 100644
--- a/winixd/core/htmlfilter.h
+++ b/winixd/core/htmlfilter.h
@@ -39,6 +39,7 @@
 #include <map>
 #include <vector>
 #include <algorithm>
+#include "core/winixbase.h"
 
 
 namespace Winix
@@ -86,7 +87,7 @@ namespace Winix
 
 	the filter recognizes xml simple tags (with / at the end) such as: <br />
 */
-class HTMLFilter
+class HTMLFilter : public WinixBase
 {
 public:
 
@@ -146,7 +147,7 @@ public:
 	// check 'orphans' for the specicic language
 	// if an orphan is detected then the non-break space ("&nbsp;" or ascii 160 code) will be put
 	// default disable (lang_none)
-	void OrphansMode(OrphanMode mode = orphan_nbsp);
+	void OrphansMode(const std::wstring & orphan_mode);
 
 	// skipping some unsafe tags
 	// (script, iframe, frame, frameset, applet, head, meta, html, link, body, ...)
diff --git a/winixd/core/plugin.cpp b/winixd/core/plugin.cpp
index 3577131..487aa35 100644
--- a/winixd/core/plugin.cpp
+++ b/winixd/core/plugin.cpp
@@ -40,13 +40,36 @@
 #include "sessionmanager.h"
 #include "functions/functions.h"
 #include "templates/templates.h"
-#include "winixsystem.h"
+#include "winixrequest.h"
+
 
 
 namespace Winix
 {
 
 
+/*
+ *
+ * PluginInfo
+ *
+ *
+ */
+
+
+void PluginInfo::set_dependency_for(WinixBase * winix_base)
+{
+	plugin->SetDependencyFor(winix_base);
+}
+
+
+
+/*
+ *
+ * Plugin
+ *
+ *
+ */
+
 
 void Plugin::UnloadPlugins()
 {
@@ -71,7 +94,7 @@ Plugin::Plugin()
 	functions       = nullptr;
 	templates       = nullptr;
 	session_manager = nullptr;
-	winix_system    = nullptr;
+	winix_request   = nullptr;
 }
 	
 
@@ -128,9 +151,9 @@ void Plugin::SetSessionManager(SessionManager * psession_manager)
 }
 
 
-void Plugin::SetWinixSystem(WinixSystem * winix_system)
+void Plugin::SetWinixRequest(WinixRequest * winix_request)
 {
-	this->winix_system = winix_system;
+	this->winix_request = winix_request;
 }
 
 
@@ -154,7 +177,7 @@ void Plugin::Unlock()
 bool Plugin::SetDependency(PluginInfo & info)
 {
 	// for safety we call a plugin function only when all our pointers are not null
-	bool res = (db && config && cur && system && functions && templates && synchro && session_manager && winix_system);
+	bool res = (db && config && cur && system && functions && templates && synchro && session_manager && winix_request);
 
 	if( !res )
 	{
@@ -171,13 +194,19 @@ bool Plugin::SetDependency(PluginInfo & info)
 	info.templates = templates;
 	info.synchro   = synchro;
 	info.session_manager = session_manager;
-	info.winix_system = winix_system;
 	info.plugin	   = this;
+
 	info.log.SetDependency(&log);
+	log.Init(config->log_level, config->log_save_each_line, config->log_request);
 
 return res;
 }
 
+void Plugin::SetDependencyFor(WinixBase * winix_base)
+{
+	winix_base->set_dependency(winix_request);
+}
+
 
 void Plugin::LoadPlugins(const std::wstring & plugins_dir, const std::vector<std::wstring> & plugins)
 {
@@ -536,5 +565,13 @@ const Plugin::Plugins * Plugin::GetPlugins()
 }
 
 
+
+
+
+
+
+
+
+
 } // namespace Winix
 
diff --git a/winixd/core/plugin.h b/winixd/core/plugin.h
index fa06515..c9b59fb 100644
--- a/winixd/core/plugin.h
+++ b/winixd/core/plugin.h
@@ -55,7 +55,7 @@ class Functions;
 class Templates;
 class SessionManager;
 
-class WinixSystem;
+class WinixRequest;
 
 
 
@@ -80,6 +80,7 @@ class Plugin;
 class Session;
 
 
+// move me to a different file
 struct PluginInfo
 {
 	// these variables are used for some purposes
@@ -103,9 +104,7 @@ struct PluginInfo
 	Synchro   * synchro;
 	SessionManager * session_manager;
 
-	// temporarily?
 	Log log;
-	WinixSystem * winix_system;
 
 	Plugin * plugin;
 
@@ -127,8 +126,17 @@ struct PluginInfo
 	// function return status
 	// default: false (if not set by the plugin)
 	bool res;
+
+
+
+	void set_dependency_for(WinixBase * winix_base);
+
+	void set_dependency_for(WinixBase & winix_base)
+	{
+		set_dependency_for(&winix_base);
+	}
 	
-	
+
 	void Clear()
 	{
 		// pointers to winix objects are not cleared here
@@ -144,6 +152,7 @@ struct PluginInfo
 
 		res = false;
 	}
+
 };
 
 
@@ -214,7 +223,7 @@ public:
 	//void SetSynchro(Synchro * psynchro);
 	void SetSessionManager(SessionManager * psession_manager);
 
-	void SetWinixSystem(WinixSystem * winix_system);
+	void SetWinixRequest(WinixRequest * winix_request);
 
 	void LoadPlugin(const wchar_t * filename);
 	void LoadPlugin(const std::wstring & filename);
@@ -268,7 +277,7 @@ private:
 	//Synchro   * synchro;
 	SessionManager * session_manager;
 
-	WinixSystem * winix_system;
+	WinixRequest * winix_request;
 
 	std::wstring temp_path;	// used when loading plugins
 
@@ -281,8 +290,11 @@ private:
 	void Call(Session * ses, int message, Slots::iterator & slot, PluginInfo & info);
 
 	bool SetDependency(PluginInfo & info);
+	void SetDependencyFor(WinixBase * winix_base);
 	void Lock();
 	void Unlock();
+
+	friend PluginInfo;
 };
 
 
diff --git a/winixd/core/winixmodel.cpp b/winixd/core/winixmodel.cpp
index ac6128b..10ddac2 100644
--- a/winixd/core/winixmodel.cpp
+++ b/winixd/core/winixmodel.cpp
@@ -78,6 +78,11 @@ void WinixModel::set_dependency(WinixModel * winix_model)
 }
 
 
+Plugin * WinixModel::get_plugin()
+{
+	return plugin;
+}
+
 
 }
 
diff --git a/winixd/core/winixmodel.h b/winixd/core/winixmodel.h
index d8fee05..a6387ac 100644
--- a/winixd/core/winixmodel.h
+++ b/winixd/core/winixmodel.h
@@ -57,6 +57,10 @@ public:
 	void set_dependency(WinixBase * winix_base);
 	void set_dependency(WinixModel * winix_model);
 
+
+	// temporarily for templates, will be removed
+	Plugin * get_plugin();
+
 protected:
 
 	morm::ModelConnector * model_connector;
diff --git a/winixd/core/winixsystem.cpp b/winixd/core/winixsystem.cpp
index 5b99abc..6813ee8 100644
--- a/winixd/core/winixsystem.cpp
+++ b/winixd/core/winixsystem.cpp
@@ -45,6 +45,11 @@ WinixSystem::WinixSystem()
 }
 
 
+WinixSystem::~WinixSystem()
+{
+}
+
+
 void WinixSystem::set_system(System * system)
 {
 	this->system = system;
diff --git a/winixd/db/Makefile.dep b/winixd/db/Makefile.dep
index 5a3c62f..492a560 100644
--- a/winixd/db/Makefile.dep
+++ b/winixd/db/Makefile.dep
@@ -15,7 +15,6 @@ db.o: ../../../winix/winixd/core/winix_const.h
 db.o: ../../../winix/winixd/core/winixbase.h
 db.o: ../../../winix/winixd/core/config.h
 db.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-db.o: ../../../winix/winixd/core/htmlfilter.h
 db.o: ../../../winix/winixd/core/log.h
 db.o: ../../../winix/winixd/core/textstream.h
 db.o: ../../../winix/winixd/core/logmanipulators.h
@@ -47,9 +46,7 @@ dbbase.o: ../../../winix/winixd/core/winix_const.h
 dbbase.o: ../../../winix/winixd/core/winixbase.h
 dbbase.o: ../../../winix/winixd/core/config.h
 dbbase.o: ../../../pikotools/space/spaceparser.h
-dbbase.o: ../../../pikotools/space/space.h
-dbbase.o: ../../../winix/winixd/core/htmlfilter.h
-dbbase.o: ../../../winix/winixd/core/log.h
+dbbase.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 dbbase.o: ../../../winix/winixd/core/textstream.h
 dbbase.o: ../../../winix/winixd/core/logmanipulators.h
 dbbase.o: ../../../winix/winixd/core/filelog.h
@@ -77,9 +74,7 @@ dbconn.o: ../../../winix/winixd/core/winix_const.h
 dbconn.o: ../../../winix/winixd/core/winixbase.h
 dbconn.o: ../../../winix/winixd/core/config.h
 dbconn.o: ../../../pikotools/space/spaceparser.h
-dbconn.o: ../../../pikotools/space/space.h
-dbconn.o: ../../../winix/winixd/core/htmlfilter.h
-dbconn.o: ../../../winix/winixd/core/log.h
+dbconn.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 dbconn.o: ../../../winix/winixd/core/textstream.h
 dbconn.o: ../../../winix/winixd/core/logmanipulators.h
 dbconn.o: ../../../winix/winixd/core/filelog.h
@@ -111,7 +106,6 @@ dbitemcolumns.o: ../../../winix/winixd/core/winixbase.h
 dbitemcolumns.o: ../../../winix/winixd/core/config.h
 dbitemcolumns.o: ../../../pikotools/space/spaceparser.h
 dbitemcolumns.o: ../../../pikotools/space/space.h
-dbitemcolumns.o: ../../../winix/winixd/core/htmlfilter.h
 dbitemcolumns.o: ../../../winix/winixd/core/log.h
 dbitemcolumns.o: ../../../winix/winixd/core/textstream.h
 dbitemcolumns.o: ../../../winix/winixd/core/logmanipulators.h
diff --git a/winixd/functions/Makefile.dep b/winixd/functions/Makefile.dep
index 8a8c171..84d1326 100644
--- a/winixd/functions/Makefile.dep
+++ b/winixd/functions/Makefile.dep
@@ -20,9 +20,7 @@ account.o: ../../../pikotools/utf8/utf8.h
 account.o: ../../../winix/winixd/core/winixbase.h
 account.o: ../../../winix/winixd/core/config.h
 account.o: ../../../pikotools/space/spaceparser.h
-account.o: ../../../pikotools/space/space.h
-account.o: ../../../winix/winixd/core/htmlfilter.h
-account.o: ../../../winix/winixd/core/log.h
+account.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 account.o: ../../../winix/winixd/core/textstream.h
 account.o: ../../../winix/winixd/core/logmanipulators.h
 account.o: ../../../winix/winixd/core/filelog.h
@@ -125,9 +123,7 @@ adduser.o: ../../../pikotools/utf8/utf8.h
 adduser.o: ../../../winix/winixd/core/winixbase.h
 adduser.o: ../../../winix/winixd/core/config.h
 adduser.o: ../../../pikotools/space/spaceparser.h
-adduser.o: ../../../pikotools/space/space.h
-adduser.o: ../../../winix/winixd/core/htmlfilter.h
-adduser.o: ../../../winix/winixd/core/log.h
+adduser.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 adduser.o: ../../../winix/winixd/core/textstream.h
 adduser.o: ../../../winix/winixd/core/logmanipulators.h
 adduser.o: ../../../winix/winixd/core/filelog.h
@@ -226,9 +222,7 @@ cat.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 cat.o: ../../../winix/winixd/core/winixbase.h
 cat.o: ../../../winix/winixd/core/config.h
 cat.o: ../../../pikotools/space/spaceparser.h
-cat.o: ../../../pikotools/space/space.h
-cat.o: ../../../winix/winixd/core/htmlfilter.h
-cat.o: ../../../winix/winixd/core/log.h
+cat.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 cat.o: ../../../winix/winixd/core/textstream.h
 cat.o: ../../../winix/winixd/core/logmanipulators.h
 cat.o: ../../../winix/winixd/core/filelog.h
@@ -317,9 +311,7 @@ chmod.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 chmod.o: ../../../winix/winixd/core/winixbase.h
 chmod.o: ../../../winix/winixd/core/config.h
 chmod.o: ../../../pikotools/space/spaceparser.h
-chmod.o: ../../../pikotools/space/space.h
-chmod.o: ../../../winix/winixd/core/htmlfilter.h
-chmod.o: ../../../winix/winixd/core/log.h
+chmod.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 chmod.o: ../../../winix/winixd/core/textstream.h
 chmod.o: ../../../winix/winixd/core/logmanipulators.h
 chmod.o: ../../../winix/winixd/core/filelog.h
@@ -413,9 +405,7 @@ chown.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 chown.o: ../../../winix/winixd/core/winixbase.h
 chown.o: ../../../winix/winixd/core/config.h
 chown.o: ../../../pikotools/space/spaceparser.h
-chown.o: ../../../pikotools/space/space.h
-chown.o: ../../../winix/winixd/core/htmlfilter.h
-chown.o: ../../../winix/winixd/core/log.h
+chown.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 chown.o: ../../../winix/winixd/core/textstream.h
 chown.o: ../../../winix/winixd/core/logmanipulators.h
 chown.o: ../../../winix/winixd/core/filelog.h
@@ -512,9 +502,7 @@ ckeditor.o: ../../../pikotools/utf8/utf8.h
 ckeditor.o: ../../../winix/winixd/core/winixbase.h
 ckeditor.o: ../../../winix/winixd/core/config.h
 ckeditor.o: ../../../pikotools/space/spaceparser.h
-ckeditor.o: ../../../pikotools/space/space.h
-ckeditor.o: ../../../winix/winixd/core/htmlfilter.h
-ckeditor.o: ../../../winix/winixd/core/log.h
+ckeditor.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 ckeditor.o: ../../../winix/winixd/core/textstream.h
 ckeditor.o: ../../../winix/winixd/core/logmanipulators.h
 ckeditor.o: ../../../winix/winixd/core/filelog.h
@@ -609,7 +597,6 @@ cp.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 cp.o: ../../../winix/winixd/core/winixbase.h
 cp.o: ../../../winix/winixd/core/config.h
 cp.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-cp.o: ../../../winix/winixd/core/htmlfilter.h
 cp.o: ../../../winix/winixd/core/log.h
 cp.o: ../../../winix/winixd/core/textstream.h
 cp.o: ../../../winix/winixd/core/logmanipulators.h
@@ -702,9 +689,7 @@ default.o: ../../../pikotools/utf8/utf8.h
 default.o: ../../../winix/winixd/core/winixbase.h
 default.o: ../../../winix/winixd/core/config.h
 default.o: ../../../pikotools/space/spaceparser.h
-default.o: ../../../pikotools/space/space.h
-default.o: ../../../winix/winixd/core/htmlfilter.h
-default.o: ../../../winix/winixd/core/log.h
+default.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 default.o: ../../../winix/winixd/core/textstream.h
 default.o: ../../../winix/winixd/core/logmanipulators.h
 default.o: ../../../winix/winixd/core/filelog.h
@@ -804,9 +789,7 @@ download.o: ../../../pikotools/utf8/utf8.h
 download.o: ../../../winix/winixd/core/winixbase.h
 download.o: ../../../winix/winixd/core/config.h
 download.o: ../../../pikotools/space/spaceparser.h
-download.o: ../../../pikotools/space/space.h
-download.o: ../../../winix/winixd/core/htmlfilter.h
-download.o: ../../../winix/winixd/core/log.h
+download.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 download.o: ../../../winix/winixd/core/textstream.h
 download.o: ../../../winix/winixd/core/logmanipulators.h
 download.o: ../../../winix/winixd/core/filelog.h
@@ -903,9 +886,7 @@ emacs.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 emacs.o: ../../../winix/winixd/core/winixbase.h
 emacs.o: ../../../winix/winixd/core/config.h
 emacs.o: ../../../pikotools/space/spaceparser.h
-emacs.o: ../../../pikotools/space/space.h
-emacs.o: ../../../winix/winixd/core/htmlfilter.h
-emacs.o: ../../../winix/winixd/core/log.h
+emacs.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 emacs.o: ../../../winix/winixd/core/textstream.h
 emacs.o: ../../../winix/winixd/core/logmanipulators.h
 emacs.o: ../../../winix/winixd/core/filelog.h
@@ -1004,9 +985,7 @@ env.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 env.o: ../../../winix/winixd/core/winixbase.h
 env.o: ../../../winix/winixd/core/config.h
 env.o: ../../../pikotools/space/spaceparser.h
-env.o: ../../../pikotools/space/space.h
-env.o: ../../../winix/winixd/core/htmlfilter.h
-env.o: ../../../winix/winixd/core/log.h
+env.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 env.o: ../../../winix/winixd/core/textstream.h
 env.o: ../../../winix/winixd/core/logmanipulators.h
 env.o: ../../../winix/winixd/core/filelog.h
@@ -1100,7 +1079,6 @@ functionbase.o: ../../../winix/winixd/core/winixbase.h
 functionbase.o: ../../../winix/winixd/core/config.h
 functionbase.o: ../../../pikotools/space/spaceparser.h
 functionbase.o: ../../../pikotools/space/space.h
-functionbase.o: ../../../winix/winixd/core/htmlfilter.h
 functionbase.o: ../../../winix/winixd/core/log.h
 functionbase.o: ../../../winix/winixd/core/textstream.h
 functionbase.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1205,7 +1183,6 @@ functionparser.o: ../../../winix/winixd/core/winixbase.h
 functionparser.o: ../../../winix/winixd/core/config.h
 functionparser.o: ../../../pikotools/space/spaceparser.h
 functionparser.o: ../../../pikotools/space/space.h
-functionparser.o: ../../../winix/winixd/core/htmlfilter.h
 functionparser.o: ../../../winix/winixd/core/log.h
 functionparser.o: ../../../winix/winixd/core/textstream.h
 functionparser.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1311,7 +1288,6 @@ functions.o: ../../../winix/winixd/core/winixbase.h
 functions.o: ../../../winix/winixd/core/config.h
 functions.o: ../../../pikotools/space/spaceparser.h
 functions.o: ../../../pikotools/space/space.h
-functions.o: ../../../winix/winixd/core/htmlfilter.h
 functions.o: ../../../winix/winixd/core/log.h
 functions.o: ../../../winix/winixd/core/textstream.h
 functions.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1423,9 +1399,7 @@ imgcrop.o: ../../../pikotools/utf8/utf8.h
 imgcrop.o: ../../../winix/winixd/core/winixbase.h
 imgcrop.o: ../../../winix/winixd/core/config.h
 imgcrop.o: ../../../pikotools/space/spaceparser.h
-imgcrop.o: ../../../pikotools/space/space.h
-imgcrop.o: ../../../winix/winixd/core/htmlfilter.h
-imgcrop.o: ../../../winix/winixd/core/log.h
+imgcrop.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 imgcrop.o: ../../../winix/winixd/core/textstream.h
 imgcrop.o: ../../../winix/winixd/core/logmanipulators.h
 imgcrop.o: ../../../winix/winixd/core/filelog.h
@@ -1522,9 +1496,7 @@ ipban.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 ipban.o: ../../../winix/winixd/core/winixbase.h
 ipban.o: ../../../winix/winixd/core/config.h
 ipban.o: ../../../pikotools/space/spaceparser.h
-ipban.o: ../../../pikotools/space/space.h
-ipban.o: ../../../winix/winixd/core/htmlfilter.h
-ipban.o: ../../../winix/winixd/core/log.h
+ipban.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 ipban.o: ../../../winix/winixd/core/textstream.h
 ipban.o: ../../../winix/winixd/core/logmanipulators.h
 ipban.o: ../../../winix/winixd/core/filelog.h
@@ -1618,9 +1590,7 @@ last.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 last.o: ../../../winix/winixd/core/winixbase.h
 last.o: ../../../winix/winixd/core/config.h
 last.o: ../../../pikotools/space/spaceparser.h
-last.o: ../../../pikotools/space/space.h
-last.o: ../../../winix/winixd/core/htmlfilter.h
-last.o: ../../../winix/winixd/core/log.h
+last.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 last.o: ../../../winix/winixd/core/textstream.h
 last.o: ../../../winix/winixd/core/logmanipulators.h
 last.o: ../../../winix/winixd/core/filelog.h
@@ -1710,7 +1680,6 @@ ln.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 ln.o: ../../../winix/winixd/core/winixbase.h
 ln.o: ../../../winix/winixd/core/config.h
 ln.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-ln.o: ../../../winix/winixd/core/htmlfilter.h
 ln.o: ../../../winix/winixd/core/log.h
 ln.o: ../../../winix/winixd/core/textstream.h
 ln.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1802,9 +1771,7 @@ locale.o: ../../../pikotools/utf8/utf8.h
 locale.o: ../../../winix/winixd/core/winixbase.h
 locale.o: ../../../winix/winixd/core/config.h
 locale.o: ../../../pikotools/space/spaceparser.h
-locale.o: ../../../pikotools/space/space.h
-locale.o: ../../../winix/winixd/core/htmlfilter.h
-locale.o: ../../../winix/winixd/core/log.h
+locale.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 locale.o: ../../../winix/winixd/core/textstream.h
 locale.o: ../../../winix/winixd/core/logmanipulators.h
 locale.o: ../../../winix/winixd/core/filelog.h
@@ -1915,9 +1882,7 @@ login.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 login.o: ../../../winix/winixd/core/winixbase.h
 login.o: ../../../winix/winixd/core/config.h
 login.o: ../../../pikotools/space/spaceparser.h
-login.o: ../../../pikotools/space/space.h
-login.o: ../../../winix/winixd/core/htmlfilter.h
-login.o: ../../../winix/winixd/core/log.h
+login.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 login.o: ../../../winix/winixd/core/logmanipulators.h
 login.o: ../../../winix/winixd/core/filelog.h
 login.o: ../../../winix/winixd/core/synchro.h
@@ -2002,9 +1967,7 @@ logout.o: ../../../pikotools/utf8/utf8.h
 logout.o: ../../../winix/winixd/core/winixbase.h
 logout.o: ../../../winix/winixd/core/config.h
 logout.o: ../../../pikotools/space/spaceparser.h
-logout.o: ../../../pikotools/space/space.h
-logout.o: ../../../winix/winixd/core/htmlfilter.h
-logout.o: ../../../winix/winixd/core/log.h
+logout.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 logout.o: ../../../winix/winixd/core/textstream.h
 logout.o: ../../../winix/winixd/core/logmanipulators.h
 logout.o: ../../../winix/winixd/core/filelog.h
@@ -2099,7 +2062,6 @@ ls.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 ls.o: ../../../winix/winixd/core/winixbase.h
 ls.o: ../../../winix/winixd/core/config.h
 ls.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-ls.o: ../../../winix/winixd/core/htmlfilter.h
 ls.o: ../../../winix/winixd/core/log.h
 ls.o: ../../../winix/winixd/core/textstream.h
 ls.o: ../../../winix/winixd/core/logmanipulators.h
@@ -2186,9 +2148,7 @@ man.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 man.o: ../../../winix/winixd/core/winixbase.h
 man.o: ../../../winix/winixd/core/config.h
 man.o: ../../../pikotools/space/spaceparser.h
-man.o: ../../../pikotools/space/space.h
-man.o: ../../../winix/winixd/core/htmlfilter.h
-man.o: ../../../winix/winixd/core/log.h
+man.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 man.o: ../../../winix/winixd/core/textstream.h
 man.o: ../../../winix/winixd/core/logmanipulators.h
 man.o: ../../../winix/winixd/core/filelog.h
@@ -2277,9 +2237,7 @@ meta.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 meta.o: ../../../winix/winixd/core/winixbase.h
 meta.o: ../../../winix/winixd/core/config.h
 meta.o: ../../../pikotools/space/spaceparser.h
-meta.o: ../../../pikotools/space/space.h
-meta.o: ../../../winix/winixd/core/htmlfilter.h
-meta.o: ../../../winix/winixd/core/log.h
+meta.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 meta.o: ../../../winix/winixd/core/textstream.h
 meta.o: ../../../winix/winixd/core/logmanipulators.h
 meta.o: ../../../winix/winixd/core/filelog.h
@@ -2371,9 +2329,7 @@ mkdir.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 mkdir.o: ../../../winix/winixd/core/winixbase.h
 mkdir.o: ../../../winix/winixd/core/config.h
 mkdir.o: ../../../pikotools/space/spaceparser.h
-mkdir.o: ../../../pikotools/space/space.h
-mkdir.o: ../../../winix/winixd/core/htmlfilter.h
-mkdir.o: ../../../winix/winixd/core/log.h
+mkdir.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 mkdir.o: ../../../winix/winixd/core/textstream.h
 mkdir.o: ../../../winix/winixd/core/logmanipulators.h
 mkdir.o: ../../../winix/winixd/core/filelog.h
@@ -2467,9 +2423,7 @@ mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 mount.o: ../../../winix/winixd/core/winixbase.h
 mount.o: ../../../winix/winixd/core/config.h
 mount.o: ../../../pikotools/space/spaceparser.h
-mount.o: ../../../pikotools/space/space.h
-mount.o: ../../../winix/winixd/core/htmlfilter.h
-mount.o: ../../../winix/winixd/core/log.h
+mount.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 mount.o: ../../../winix/winixd/core/textstream.h
 mount.o: ../../../winix/winixd/core/logmanipulators.h
 mount.o: ../../../winix/winixd/core/filelog.h
@@ -2561,7 +2515,6 @@ mv.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 mv.o: ../../../winix/winixd/core/winixbase.h
 mv.o: ../../../winix/winixd/core/config.h
 mv.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-mv.o: ../../../winix/winixd/core/htmlfilter.h
 mv.o: ../../../winix/winixd/core/log.h
 mv.o: ../../../winix/winixd/core/textstream.h
 mv.o: ../../../winix/winixd/core/logmanipulators.h
@@ -2652,9 +2605,7 @@ nicedit.o: ../../../pikotools/utf8/utf8.h
 nicedit.o: ../../../winix/winixd/core/winixbase.h
 nicedit.o: ../../../winix/winixd/core/config.h
 nicedit.o: ../../../pikotools/space/spaceparser.h
-nicedit.o: ../../../pikotools/space/space.h
-nicedit.o: ../../../winix/winixd/core/htmlfilter.h
-nicedit.o: ../../../winix/winixd/core/log.h
+nicedit.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 nicedit.o: ../../../winix/winixd/core/textstream.h
 nicedit.o: ../../../winix/winixd/core/logmanipulators.h
 nicedit.o: ../../../winix/winixd/core/filelog.h
@@ -2751,9 +2702,7 @@ node.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 node.o: ../../../winix/winixd/core/winixbase.h
 node.o: ../../../winix/winixd/core/config.h
 node.o: ../../../pikotools/space/spaceparser.h
-node.o: ../../../pikotools/space/space.h
-node.o: ../../../winix/winixd/core/htmlfilter.h
-node.o: ../../../winix/winixd/core/log.h
+node.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 node.o: ../../../winix/winixd/core/textstream.h
 node.o: ../../../winix/winixd/core/logmanipulators.h
 node.o: ../../../winix/winixd/core/filelog.h
@@ -2846,9 +2795,7 @@ passwd.o: ../../../pikotools/utf8/utf8.h
 passwd.o: ../../../winix/winixd/core/winixbase.h
 passwd.o: ../../../winix/winixd/core/config.h
 passwd.o: ../../../pikotools/space/spaceparser.h
-passwd.o: ../../../pikotools/space/space.h
-passwd.o: ../../../winix/winixd/core/htmlfilter.h
-passwd.o: ../../../winix/winixd/core/log.h
+passwd.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 passwd.o: ../../../winix/winixd/core/textstream.h
 passwd.o: ../../../winix/winixd/core/logmanipulators.h
 passwd.o: ../../../winix/winixd/core/filelog.h
@@ -2946,9 +2893,7 @@ priv.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 priv.o: ../../../winix/winixd/core/winixbase.h
 priv.o: ../../../winix/winixd/core/config.h
 priv.o: ../../../pikotools/space/spaceparser.h
-priv.o: ../../../pikotools/space/space.h
-priv.o: ../../../winix/winixd/core/htmlfilter.h
-priv.o: ../../../winix/winixd/core/log.h
+priv.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 priv.o: ../../../winix/winixd/core/textstream.h
 priv.o: ../../../winix/winixd/core/logmanipulators.h
 priv.o: ../../../winix/winixd/core/filelog.h
@@ -3053,7 +2998,6 @@ privchanger.o: ../../../winix/winixd/core/winixmodel.h
 privchanger.o: ../../../winix/winixd/core/winixbase.h
 privchanger.o: ../../../winix/winixd/core/config.h
 privchanger.o: ../../../pikotools/space/spaceparser.h
-privchanger.o: ../../../winix/winixd/core/htmlfilter.h
 privchanger.o: ../../../winix/winixd/core/log.h
 privchanger.o: ../../../winix/winixd/core/logmanipulators.h
 privchanger.o: ../../../winix/winixd/core/filelog.h
@@ -3142,7 +3086,6 @@ pw.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 pw.o: ../../../winix/winixd/core/winixbase.h
 pw.o: ../../../winix/winixd/core/config.h
 pw.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-pw.o: ../../../winix/winixd/core/htmlfilter.h
 pw.o: ../../../winix/winixd/core/log.h
 pw.o: ../../../winix/winixd/core/textstream.h
 pw.o: ../../../winix/winixd/core/logmanipulators.h
@@ -3233,9 +3176,7 @@ reload.o: ../../../pikotools/utf8/utf8.h
 reload.o: ../../../winix/winixd/core/winixbase.h
 reload.o: ../../../winix/winixd/core/config.h
 reload.o: ../../../pikotools/space/spaceparser.h
-reload.o: ../../../pikotools/space/space.h
-reload.o: ../../../winix/winixd/core/htmlfilter.h
-reload.o: ../../../winix/winixd/core/log.h
+reload.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 reload.o: ../../../winix/winixd/core/textstream.h
 reload.o: ../../../winix/winixd/core/logmanipulators.h
 reload.o: ../../../winix/winixd/core/filelog.h
@@ -3336,7 +3277,6 @@ rm.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 rm.o: ../../../winix/winixd/core/winixbase.h
 rm.o: ../../../winix/winixd/core/config.h
 rm.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-rm.o: ../../../winix/winixd/core/htmlfilter.h
 rm.o: ../../../winix/winixd/core/log.h
 rm.o: ../../../winix/winixd/core/textstream.h
 rm.o: ../../../winix/winixd/core/logmanipulators.h
@@ -3433,9 +3373,7 @@ rmuser.o: ../../../pikotools/utf8/utf8.h
 rmuser.o: ../../../winix/winixd/core/winixbase.h
 rmuser.o: ../../../winix/winixd/core/config.h
 rmuser.o: ../../../pikotools/space/spaceparser.h
-rmuser.o: ../../../pikotools/space/space.h
-rmuser.o: ../../../winix/winixd/core/htmlfilter.h
-rmuser.o: ../../../winix/winixd/core/log.h
+rmuser.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 rmuser.o: ../../../winix/winixd/core/textstream.h
 rmuser.o: ../../../winix/winixd/core/logmanipulators.h
 rmuser.o: ../../../winix/winixd/core/filelog.h
@@ -3535,9 +3473,7 @@ run.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 run.o: ../../../winix/winixd/core/winixbase.h
 run.o: ../../../winix/winixd/core/config.h
 run.o: ../../../pikotools/space/spaceparser.h
-run.o: ../../../pikotools/space/space.h
-run.o: ../../../winix/winixd/core/htmlfilter.h
-run.o: ../../../winix/winixd/core/log.h
+run.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 run.o: ../../../winix/winixd/core/textstream.h
 run.o: ../../../winix/winixd/core/logmanipulators.h
 run.o: ../../../winix/winixd/core/filelog.h
@@ -3626,9 +3562,7 @@ sort.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 sort.o: ../../../winix/winixd/core/winixbase.h
 sort.o: ../../../winix/winixd/core/config.h
 sort.o: ../../../pikotools/space/spaceparser.h
-sort.o: ../../../pikotools/space/space.h
-sort.o: ../../../winix/winixd/core/htmlfilter.h
-sort.o: ../../../winix/winixd/core/log.h
+sort.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 sort.o: ../../../winix/winixd/core/textstream.h
 sort.o: ../../../winix/winixd/core/logmanipulators.h
 sort.o: ../../../winix/winixd/core/filelog.h
@@ -3727,7 +3661,6 @@ specialdefault.o: ../../../winix/winixd/core/winixbase.h
 specialdefault.o: ../../../winix/winixd/core/config.h
 specialdefault.o: ../../../pikotools/space/spaceparser.h
 specialdefault.o: ../../../pikotools/space/space.h
-specialdefault.o: ../../../winix/winixd/core/htmlfilter.h
 specialdefault.o: ../../../winix/winixd/core/log.h
 specialdefault.o: ../../../winix/winixd/core/textstream.h
 specialdefault.o: ../../../winix/winixd/core/logmanipulators.h
@@ -3829,9 +3762,7 @@ stat.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 stat.o: ../../../winix/winixd/core/winixbase.h
 stat.o: ../../../winix/winixd/core/config.h
 stat.o: ../../../pikotools/space/spaceparser.h
-stat.o: ../../../pikotools/space/space.h
-stat.o: ../../../winix/winixd/core/htmlfilter.h
-stat.o: ../../../winix/winixd/core/log.h
+stat.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 stat.o: ../../../winix/winixd/core/textstream.h
 stat.o: ../../../winix/winixd/core/logmanipulators.h
 stat.o: ../../../winix/winixd/core/filelog.h
@@ -3926,9 +3857,7 @@ subject.o: ../../../pikotools/utf8/utf8.h
 subject.o: ../../../winix/winixd/core/winixbase.h
 subject.o: ../../../winix/winixd/core/config.h
 subject.o: ../../../pikotools/space/spaceparser.h
-subject.o: ../../../pikotools/space/space.h
-subject.o: ../../../winix/winixd/core/htmlfilter.h
-subject.o: ../../../winix/winixd/core/log.h
+subject.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 subject.o: ../../../winix/winixd/core/textstream.h
 subject.o: ../../../winix/winixd/core/logmanipulators.h
 subject.o: ../../../winix/winixd/core/filelog.h
@@ -4028,9 +3957,7 @@ template.o: ../../../pikotools/utf8/utf8.h
 template.o: ../../../winix/winixd/core/winixbase.h
 template.o: ../../../winix/winixd/core/config.h
 template.o: ../../../pikotools/space/spaceparser.h
-template.o: ../../../pikotools/space/space.h
-template.o: ../../../winix/winixd/core/htmlfilter.h
-template.o: ../../../winix/winixd/core/log.h
+template.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 template.o: ../../../winix/winixd/core/textstream.h
 template.o: ../../../winix/winixd/core/logmanipulators.h
 template.o: ../../../winix/winixd/core/filelog.h
@@ -4132,9 +4059,7 @@ timezone.o: ../../../pikotools/utf8/utf8.h
 timezone.o: ../../../winix/winixd/core/winixbase.h
 timezone.o: ../../../winix/winixd/core/config.h
 timezone.o: ../../../pikotools/space/spaceparser.h
-timezone.o: ../../../pikotools/space/space.h
-timezone.o: ../../../winix/winixd/core/htmlfilter.h
-timezone.o: ../../../winix/winixd/core/log.h
+timezone.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 timezone.o: ../../../winix/winixd/core/textstream.h
 timezone.o: ../../../winix/winixd/core/logmanipulators.h
 timezone.o: ../../../winix/winixd/core/filelog.h
@@ -4234,9 +4159,7 @@ tinymce.o: ../../../pikotools/utf8/utf8.h
 tinymce.o: ../../../winix/winixd/core/winixbase.h
 tinymce.o: ../../../winix/winixd/core/config.h
 tinymce.o: ../../../pikotools/space/spaceparser.h
-tinymce.o: ../../../pikotools/space/space.h
-tinymce.o: ../../../winix/winixd/core/htmlfilter.h
-tinymce.o: ../../../winix/winixd/core/log.h
+tinymce.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 tinymce.o: ../../../winix/winixd/core/textstream.h
 tinymce.o: ../../../winix/winixd/core/logmanipulators.h
 tinymce.o: ../../../winix/winixd/core/filelog.h
@@ -4333,9 +4256,7 @@ uname.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 uname.o: ../../../winix/winixd/core/winixbase.h
 uname.o: ../../../winix/winixd/core/config.h
 uname.o: ../../../pikotools/space/spaceparser.h
-uname.o: ../../../pikotools/space/space.h
-uname.o: ../../../winix/winixd/core/htmlfilter.h
-uname.o: ../../../winix/winixd/core/log.h
+uname.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 uname.o: ../../../winix/winixd/core/textstream.h
 uname.o: ../../../winix/winixd/core/logmanipulators.h
 uname.o: ../../../winix/winixd/core/filelog.h
@@ -4430,9 +4351,7 @@ upload.o: ../../../pikotools/utf8/utf8.h
 upload.o: ../../../winix/winixd/core/winixbase.h
 upload.o: ../../../winix/winixd/core/config.h
 upload.o: ../../../pikotools/space/spaceparser.h
-upload.o: ../../../pikotools/space/space.h
-upload.o: ../../../winix/winixd/core/htmlfilter.h
-upload.o: ../../../winix/winixd/core/log.h
+upload.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 upload.o: ../../../winix/winixd/core/textstream.h
 upload.o: ../../../winix/winixd/core/logmanipulators.h
 upload.o: ../../../winix/winixd/core/filelog.h
@@ -4539,9 +4458,7 @@ uptime.o: ../../../pikotools/utf8/utf8.h
 uptime.o: ../../../winix/winixd/core/winixbase.h
 uptime.o: ../../../winix/winixd/core/config.h
 uptime.o: ../../../pikotools/space/spaceparser.h
-uptime.o: ../../../pikotools/space/space.h
-uptime.o: ../../../winix/winixd/core/htmlfilter.h
-uptime.o: ../../../winix/winixd/core/log.h
+uptime.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 uptime.o: ../../../winix/winixd/core/textstream.h
 uptime.o: ../../../winix/winixd/core/logmanipulators.h
 uptime.o: ../../../winix/winixd/core/filelog.h
@@ -4637,9 +4554,7 @@ vim.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 vim.o: ../../../winix/winixd/core/winixbase.h
 vim.o: ../../../winix/winixd/core/config.h
 vim.o: ../../../pikotools/space/spaceparser.h
-vim.o: ../../../pikotools/space/space.h
-vim.o: ../../../winix/winixd/core/htmlfilter.h
-vim.o: ../../../winix/winixd/core/log.h
+vim.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 vim.o: ../../../winix/winixd/core/textstream.h
 vim.o: ../../../winix/winixd/core/logmanipulators.h
 vim.o: ../../../winix/winixd/core/filelog.h
@@ -4727,9 +4642,7 @@ who.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 who.o: ../../../winix/winixd/core/winixbase.h
 who.o: ../../../winix/winixd/core/config.h
 who.o: ../../../pikotools/space/spaceparser.h
-who.o: ../../../pikotools/space/space.h
-who.o: ../../../winix/winixd/core/htmlfilter.h
-who.o: ../../../winix/winixd/core/log.h
+who.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 who.o: ../../../winix/winixd/core/textstream.h
 who.o: ../../../winix/winixd/core/logmanipulators.h
 who.o: ../../../winix/winixd/core/filelog.h
diff --git a/winixd/functions/functions.h b/winixd/functions/functions.h
index 071beec..b784d19 100644
--- a/winixd/functions/functions.h
+++ b/winixd/functions/functions.h
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/winixd/functions/sort.cpp b/winixd/functions/sort.cpp
index f099f62..1ff01c9 100644
--- a/winixd/functions/sort.cpp
+++ b/winixd/functions/sort.cpp
@@ -32,6 +32,7 @@
  * 
  */
  
+#include <algorithm>
 #include "sort.h"
 #include "core/plugin.h"
 
diff --git a/winixd/main/Makefile.dep b/winixd/main/Makefile.dep
index 4a9b86e..9edd6ce 100644
--- a/winixd/main/Makefile.dep
+++ b/winixd/main/Makefile.dep
@@ -16,9 +16,7 @@ main.o: ../../../winix/winixd/core/rebus.h
 main.o: ../../../winix/winixd/core/winixbase.h
 main.o: ../../../winix/winixd/core/config.h
 main.o: ../../../pikotools/space/spaceparser.h
-main.o: ../../../pikotools/space/space.h
-main.o: ../../../winix/winixd/core/htmlfilter.h
-main.o: ../../../winix/winixd/core/log.h
+main.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 main.o: ../../../winix/winixd/core/textstream.h
 main.o: ../../../pikotools/textstream/textstream.h
 main.o: ../../../pikotools/membuffer/membuffer.h
diff --git a/winixd/main/main.cpp b/winixd/main/main.cpp
index 227c25c..2f129a2 100644
--- a/winixd/main/main.cpp
+++ b/winixd/main/main.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2014, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
 #include "core/version.h"
 #include "utf8/utf8.h"
 #include "core/filelog.h"
+#include "core/log.h"
 
 
 
@@ -98,7 +99,7 @@ void CloseDescriptors()
 }
 
 
-void LogInfo(LogManipulators log_level, const char * msg, bool put_version, const char * msg2)
+void LogInfo(Log & log, LogManipulators log_level, const char * msg, bool put_version, const char * msg2)
 {
 	log << log_level;
 	log.PrintDate(PT::Date(std::time(0)));
@@ -115,7 +116,7 @@ void LogInfo(LogManipulators log_level, const char * msg, bool put_version, cons
 }
 
 
-void SavePidFile()
+void SavePidFile(Log & log)
 {
 	if( !app.config.pid_file.empty() )
 	{
@@ -158,6 +159,10 @@ using Winix::app;
 
 	std::srand(std::time(0));
 
+	Winix::TextStream<std::wstring> log_buffer;
+	Winix::Log log; // log only for main() function
+	log.SetLogBuffer(&log_buffer);
+
 	if( argv != 2 )
 	{
 		Winix::print_syntax();
@@ -186,11 +191,10 @@ using Winix::app;
 
 
 	app.InitFileLog();
+	log.SetFileLog(&app.file_log);
+	log.Init(app.config.log_level, app.config.log_save_each_line, app.config.log_request);
 
-	Winix::log.SetFileLog(&app.file_log); // IMPROVE ME the singleton will be removed
-	Winix::log.Init(app.config.log_level, app.config.log_save_each_line, app.config.log_request);
-
-	Winix::LogInfo(Winix::log3, "booting Winix", true, "");
+	Winix::LogInfo(log, Winix::log3, "booting Winix", true, "");
 
 	if( !app.InitFCGI() )
 		return 5;
@@ -199,8 +203,7 @@ using Winix::app;
 		return 3;
 
 	app.LogUserGroups();
-	Winix::log << Winix::log3 << "base_url: " << app.config.base_url << Winix::logend;
-	Winix::SavePidFile();
+	Winix::SavePidFile(log);
 
 	// load plugins before loading sessions - session_manager.LoadSessions()
 	// because some of the plugins can init its own sessions dates
@@ -218,8 +221,8 @@ using Winix::app;
 
 	// saving all starting logs
 	app.Lock();
-	Winix::LogInfo(Winix::log1, "Winix", true, "started");
-	Winix::log << Winix::logsave;
+	Winix::LogInfo(log, Winix::log1, "Winix", true, "started");
+	log << Winix::logsave;
 	app.Unlock();
 
 	// main loop
@@ -227,8 +230,9 @@ using Winix::app;
 
 	app.Close();
 
-	Winix::LogInfo(Winix::log1, "Winix", true, "stopped");
+	Winix::LogInfo(log, Winix::log1, "Winix", true, "stopped");
 	Winix::RemovePidFile();
+	log << Winix::logsave;
 
 return 0;
 }
diff --git a/winixd/notify/Makefile.dep b/winixd/notify/Makefile.dep
index b47ff8b..3ef5a14 100644
--- a/winixd/notify/Makefile.dep
+++ b/winixd/notify/Makefile.dep
@@ -12,30 +12,30 @@ notify.o: ../../../pikotools/convert/strtoint.h
 notify.o: ../../../pikotools/convert/text.h ../../../pikotools/convert/misc.h
 notify.o: ../../../pikotools/membuffer/membuffer.h
 notify.o: ../../../pikotools/textstream/types.h
-notify.o: ../../../winix/winixd/templates/patterns.h
-notify.o: ../../../winix/winixd/templates/locale.h
-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: ../../../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
-notify.o: ../../../winix/winixd/core/basethread.h
-notify.o: ../../../winix/winixd/core/synchro.h
-notify.o: ../../../winix/winixd/core/winixmodel.h
 notify.o: ../../../winix/winixd/core/winixbase.h
 notify.o: ../../../winix/winixd/core/config.h
-notify.o: ../../../winix/winixd/core/htmlfilter.h
 notify.o: ../../../winix/winixd/core/log.h
 notify.o: ../../../winix/winixd/core/textstream.h
+notify.o: ../../../pikotools/utf8/utf8.h
 notify.o: ../../../winix/winixd/core/logmanipulators.h
 notify.o: ../../../winix/winixd/core/filelog.h
 notify.o: ../../../winix/winixd/core/synchro.h
 notify.o: ../../../winix/winixd/core/log.h
 notify.o: ../../../winix/winixd/core/filelog.h
 notify.o: ../../../winix/winixd/core/lock.h
+notify.o: ../../../winix/winixd/core/synchro.h
+notify.o: ../../../winix/winixd/templates/patterns.h
+notify.o: ../../../winix/winixd/templates/locale.h
+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: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
+notify.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
+notify.o: ../../../ezc/src/expressionparser.h
+notify.o: ../../../ezc/src/patternparser.h notifythread.h
+notify.o: ../../../winix/winixd/core/basethread.h
+notify.o: ../../../winix/winixd/core/winixmodel.h
 notify.o: ../../../winix/winixd/core/plugin.h
 notify.o: ../../../winix/winixd/core/pluginmsg.h
 notify.o: ../../../winix/winixd/core/plugindata.h
@@ -98,6 +98,9 @@ notify.o: ../../../winix/winixd/core/system.h
 notify.o: ../../../winix/winixd/core/sessionidmanager.h
 notify.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 notify.o: ../../../winix/winixd/core/htmlfilter.h
+notify.o: ../../../winix/winixd/core/winixrequest.h
+notify.o: ../../../winix/winixd/core/winixsystem.h
+notify.o: ../../../winix/winixd/core/slog.h
 notify.o: ../../../winix/winixd/core/request.h
 notify.o: ../../../winix/winixd/core/dirs.h
 notify.o: ../../../winix/winixd/core/plugin.h
@@ -114,6 +117,18 @@ notifypool.o: ../../../pikotools/convert/text.h
 notifypool.o: ../../../pikotools/convert/misc.h
 notifypool.o: ../../../pikotools/membuffer/membuffer.h
 notifypool.o: ../../../pikotools/textstream/types.h
+notifypool.o: ../../../winix/winixd/core/winixbase.h
+notifypool.o: ../../../winix/winixd/core/config.h
+notifypool.o: ../../../winix/winixd/core/log.h
+notifypool.o: ../../../winix/winixd/core/textstream.h
+notifypool.o: ../../../pikotools/utf8/utf8.h
+notifypool.o: ../../../winix/winixd/core/logmanipulators.h
+notifypool.o: ../../../winix/winixd/core/filelog.h
+notifypool.o: ../../../winix/winixd/core/synchro.h
+notifypool.o: ../../../winix/winixd/core/log.h
+notifypool.o: ../../../winix/winixd/core/filelog.h
+notifypool.o: ../../../winix/winixd/core/lock.h
+notifypool.o: ../../../winix/winixd/core/synchro.h
 notifythread.o: notifythread.h ../../../winix/winixd/core/basethread.h
 notifythread.o: ../../../winix/winixd/core/synchro.h
 notifythread.o: ../../../winix/winixd/core/winixmodel.h
@@ -122,7 +137,6 @@ 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: ../../../winix/winixd/core/htmlfilter.h
 notifythread.o: ../../../winix/winixd/core/log.h
 notifythread.o: ../../../winix/winixd/core/textstream.h
 notifythread.o: ../../../pikotools/convert/misc.h
@@ -209,6 +223,17 @@ templatesnotify.o: ../../../pikotools/convert/text.h
 templatesnotify.o: ../../../pikotools/convert/misc.h
 templatesnotify.o: ../../../pikotools/membuffer/membuffer.h
 templatesnotify.o: ../../../pikotools/textstream/types.h
+templatesnotify.o: ../../../winix/winixd/core/winixbase.h
+templatesnotify.o: ../../../winix/winixd/core/config.h
+templatesnotify.o: ../../../winix/winixd/core/log.h
+templatesnotify.o: ../../../winix/winixd/core/textstream.h
+templatesnotify.o: ../../../winix/winixd/core/logmanipulators.h
+templatesnotify.o: ../../../winix/winixd/core/filelog.h
+templatesnotify.o: ../../../winix/winixd/core/synchro.h
+templatesnotify.o: ../../../winix/winixd/core/log.h
+templatesnotify.o: ../../../winix/winixd/core/filelog.h
+templatesnotify.o: ../../../winix/winixd/core/lock.h
+templatesnotify.o: ../../../winix/winixd/core/synchro.h
 templatesnotify.o: ../../../winix/winixd/core/misc.h
 templatesnotify.o: ../../../winix/winixd/core/requesttypes.h
 templatesnotify.o: ../../../winix/winixd/core/winix_const.h
diff --git a/winixd/plugins/export/Makefile.dep b/winixd/plugins/export/Makefile.dep
index dc8b925..8d0a8dd 100644
--- a/winixd/plugins/export/Makefile.dep
+++ b/winixd/plugins/export/Makefile.dep
@@ -23,7 +23,6 @@ edb.o: ../../../../winix/winixd/core/winixbase.h
 edb.o: ../../../../winix/winixd/core/config.h
 edb.o: ../../../../pikotools/space/spaceparser.h
 edb.o: ../../../../pikotools/space/space.h
-edb.o: ../../../../winix/winixd/core/htmlfilter.h
 edb.o: ../../../../winix/winixd/core/log.h
 edb.o: ../../../../winix/winixd/core/textstream.h
 edb.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -65,7 +64,6 @@ exportinfo.o: ../../../../winix/winixd/core/winixbase.h
 exportinfo.o: ../../../../winix/winixd/core/config.h
 exportinfo.o: ../../../../pikotools/space/spaceparser.h
 exportinfo.o: ../../../../pikotools/space/space.h
-exportinfo.o: ../../../../winix/winixd/core/htmlfilter.h
 exportinfo.o: ../../../../winix/winixd/core/log.h
 exportinfo.o: ../../../../winix/winixd/core/textstream.h
 exportinfo.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -209,7 +207,6 @@ 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: ../../../../winix/winixd/core/htmlfilter.h
 funexport.o: ../../../../winix/winixd/core/log.h
 funexport.o: ../../../../winix/winixd/core/logmanipulators.h
 funexport.o: ../../../../winix/winixd/core/filelog.h
@@ -296,7 +293,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
 init.o: ../../../../winix/winixd/core/config.h
 init.o: ../../../../pikotools/space/spaceparser.h
 init.o: ../../../../pikotools/space/space.h
-init.o: ../../../../winix/winixd/core/htmlfilter.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -390,3 +386,48 @@ init.o: ../../../../winix/winixd/core/system.h
 init.o: ../../../../winix/winixd/core/sessionidmanager.h
 init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 init.o: ../../../../winix/winixd/core/slog.h
+init.o: ../../../../winix/winixd/functions/functions.h
+init.o: ../../../../winix/winixd/functions/functionbase.h
+init.o: ../../../../winix/winixd/functions/functionparser.h
+init.o: ../../../../winix/winixd/functions/account.h
+init.o: ../../../../winix/winixd/functions/adduser.h
+init.o: ../../../../winix/winixd/functions/cat.h
+init.o: ../../../../winix/winixd/functions/chmod.h
+init.o: ../../../../winix/winixd/functions/privchanger.h
+init.o: ../../../../winix/winixd/functions/chown.h
+init.o: ../../../../winix/winixd/functions/ckeditor.h
+init.o: ../../../../winix/winixd/functions/cp.h
+init.o: ../../../../winix/winixd/functions/default.h
+init.o: ../../../../winix/winixd/functions/download.h
+init.o: ../../../../winix/winixd/functions/emacs.h
+init.o: ../../../../winix/winixd/functions/env.h
+init.o: ../../../../winix/winixd/functions/imgcrop.h
+init.o: ../../../../winix/winixd/functions/last.h
+init.o: ../../../../winix/winixd/functions/login.h
+init.o: ../../../../winix/winixd/functions/logout.h
+init.o: ../../../../winix/winixd/functions/ln.h
+init.o: ../../../../winix/winixd/functions/ls.h
+init.o: ../../../../winix/winixd/functions/man.h
+init.o: ../../../../winix/winixd/functions/meta.h
+init.o: ../../../../winix/winixd/functions/mkdir.h
+init.o: ../../../../winix/winixd/functions/mv.h
+init.o: ../../../../winix/winixd/functions/nicedit.h
+init.o: ../../../../winix/winixd/functions/node.h
+init.o: ../../../../winix/winixd/functions/passwd.h
+init.o: ../../../../winix/winixd/functions/priv.h
+init.o: ../../../../winix/winixd/functions/pw.h
+init.o: ../../../../winix/winixd/functions/reload.h
+init.o: ../../../../winix/winixd/functions/rm.h
+init.o: ../../../../winix/winixd/functions/rmuser.h
+init.o: ../../../../winix/winixd/functions/sort.h
+init.o: ../../../../winix/winixd/functions/specialdefault.h
+init.o: ../../../../winix/winixd/functions/stat.h
+init.o: ../../../../winix/winixd/functions/subject.h
+init.o: ../../../../winix/winixd/functions/template.h
+init.o: ../../../../winix/winixd/functions/tinymce.h
+init.o: ../../../../winix/winixd/functions/uname.h
+init.o: ../../../../winix/winixd/functions/upload.h
+init.o: ../../../../winix/winixd/functions/uptime.h
+init.o: ../../../../winix/winixd/functions/who.h
+init.o: ../../../../winix/winixd/functions/vim.h
+init.o: ../../../../winix/winixd/core/htmlfilter.h
diff --git a/winixd/plugins/export/edb.cpp b/winixd/plugins/export/edb.cpp
index 8dd72f6..b1929e0 100644
--- a/winixd/plugins/export/edb.cpp
+++ b/winixd/plugins/export/edb.cpp
@@ -204,7 +204,7 @@ bool EDb::GetExportDirs(std::vector<ExportDir> & export_tab, bool clear_tab)
 			}
 			else
 			{
-				slog << "There is not such a directory: " << dir_temp << " (skipping)" << logend;
+				//slog << "There is not such a directory: " << dir_temp << " (skipping)" << logend;
 			}
 		}
 	}
diff --git a/winixd/plugins/export/exportinfo.cpp b/winixd/plugins/export/exportinfo.cpp
index 170af5b..d9d13dd 100644
--- a/winixd/plugins/export/exportinfo.cpp
+++ b/winixd/plugins/export/exportinfo.cpp
@@ -32,6 +32,7 @@
  * 
  */
 
+#include <algorithm>
 #include "core/log.h"
 #include "exportinfo.h"
 #include "convert/text.h"
diff --git a/winixd/plugins/export/exportinfo.h b/winixd/plugins/export/exportinfo.h
index 4b5a773..1a56271 100644
--- a/winixd/plugins/export/exportinfo.h
+++ b/winixd/plugins/export/exportinfo.h
@@ -41,17 +41,18 @@
 #include "edb.h"
 #include "message.h"
 #include "exportthread.h"
+#include "core/winixbase.h"
+
+
 
 namespace Winix
 {
 
-
-
 namespace Export
 {
 
 
-class ExportInfo
+class ExportInfo : public WinixBase
 {
 public:
 
diff --git a/winixd/plugins/export/init.cpp b/winixd/plugins/export/init.cpp
index f53c544..11e5a22 100644
--- a/winixd/plugins/export/init.cpp
+++ b/winixd/plugins/export/init.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2014, Tomasz Sowa
+ * Copyright (c) 2011-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -39,12 +39,13 @@
 #include "exportinfo.h"
 #include "edb.h"
 #include "funexport.h"
+#include "functions/functions.h"
+
 
 namespace Winix
 {
 
 
-
 extern "C" void Init(PluginInfo &);
 
 
@@ -71,9 +72,7 @@ void AddWinixFunctions(PluginInfo & info)
 
 void AddMountParams(PluginInfo & info)
 {
-using TemplatesFunctions::system;
-
-	mount_par_export_conf = system->mounts.AddMountPar(L"export_conf");
+	mount_par_export_conf = info.system->mounts.AddMountPar(L"export_conf");
 }
 
 
@@ -252,9 +251,12 @@ void Init(PluginInfo & info)
 {
 using namespace Export;
 
+	info.set_dependency_for(edb);
 	edb.SetConn(info.db->GetConn());
 	edb.LogQueries(info.config->log_db_query);
 	edb.SetDirs(&info.system->dirs);
+
+	info.set_dependency_for(export_info);
 	export_info.SetSystem(info.system);
 	export_info.SetConfig(info.config);
 	export_info.SetEDb(&edb);
diff --git a/winixd/plugins/gallery/Makefile.dep b/winixd/plugins/gallery/Makefile.dep
index 27b5411..e305665 100644
--- a/winixd/plugins/gallery/Makefile.dep
+++ b/winixd/plugins/gallery/Makefile.dep
@@ -23,7 +23,6 @@ gallery.o: ../../../../winix/winixd/core/winixbase.h
 gallery.o: ../../../../winix/winixd/core/config.h
 gallery.o: ../../../../pikotools/space/spaceparser.h
 gallery.o: ../../../../pikotools/space/space.h
-gallery.o: ../../../../winix/winixd/core/htmlfilter.h
 gallery.o: ../../../../winix/winixd/core/log.h
 gallery.o: ../../../../winix/winixd/core/textstream.h
 gallery.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -137,7 +136,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
 init.o: ../../../../winix/winixd/core/config.h
 init.o: ../../../../pikotools/space/spaceparser.h
 init.o: ../../../../pikotools/space/space.h
-init.o: ../../../../winix/winixd/core/htmlfilter.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -221,6 +219,51 @@ init.o: ../../../../winix/winixd/core/sessionidmanager.h
 init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 init.o: ../../../../winix/winixd/core/slog.h galleryinfo.h
 init.o: ../../../../winix/winixd/core/plugin.h
+init.o: ../../../../winix/winixd/functions/functions.h
+init.o: ../../../../winix/winixd/functions/functionbase.h
+init.o: ../../../../winix/winixd/functions/functionparser.h
+init.o: ../../../../winix/winixd/functions/account.h
+init.o: ../../../../winix/winixd/functions/adduser.h
+init.o: ../../../../winix/winixd/functions/cat.h
+init.o: ../../../../winix/winixd/functions/chmod.h
+init.o: ../../../../winix/winixd/functions/privchanger.h
+init.o: ../../../../winix/winixd/functions/chown.h
+init.o: ../../../../winix/winixd/functions/ckeditor.h
+init.o: ../../../../winix/winixd/functions/cp.h
+init.o: ../../../../winix/winixd/functions/default.h
+init.o: ../../../../winix/winixd/functions/download.h
+init.o: ../../../../winix/winixd/functions/emacs.h
+init.o: ../../../../winix/winixd/functions/env.h
+init.o: ../../../../winix/winixd/functions/imgcrop.h
+init.o: ../../../../winix/winixd/functions/last.h
+init.o: ../../../../winix/winixd/functions/login.h
+init.o: ../../../../winix/winixd/functions/logout.h
+init.o: ../../../../winix/winixd/functions/ln.h
+init.o: ../../../../winix/winixd/functions/ls.h
+init.o: ../../../../winix/winixd/functions/man.h
+init.o: ../../../../winix/winixd/functions/meta.h
+init.o: ../../../../winix/winixd/functions/mkdir.h
+init.o: ../../../../winix/winixd/functions/mv.h
+init.o: ../../../../winix/winixd/functions/nicedit.h
+init.o: ../../../../winix/winixd/functions/node.h
+init.o: ../../../../winix/winixd/functions/passwd.h
+init.o: ../../../../winix/winixd/functions/priv.h
+init.o: ../../../../winix/winixd/functions/pw.h
+init.o: ../../../../winix/winixd/functions/reload.h
+init.o: ../../../../winix/winixd/functions/rm.h
+init.o: ../../../../winix/winixd/functions/rmuser.h
+init.o: ../../../../winix/winixd/functions/sort.h
+init.o: ../../../../winix/winixd/functions/specialdefault.h
+init.o: ../../../../winix/winixd/functions/stat.h
+init.o: ../../../../winix/winixd/functions/subject.h
+init.o: ../../../../winix/winixd/functions/template.h
+init.o: ../../../../winix/winixd/functions/tinymce.h
+init.o: ../../../../winix/winixd/functions/uname.h
+init.o: ../../../../winix/winixd/functions/upload.h
+init.o: ../../../../winix/winixd/functions/uptime.h
+init.o: ../../../../winix/winixd/functions/who.h
+init.o: ../../../../winix/winixd/functions/vim.h
+init.o: ../../../../winix/winixd/core/htmlfilter.h
 templates.o: gallery.h ../../../../winix/winixd/functions/functionbase.h
 templates.o: ../../../../winix/winixd/core/item.h
 templates.o: ../../../../pikotools/space/space.h
@@ -244,7 +287,6 @@ templates.o: ../../../../winix/winixd/core/winixbase.h
 templates.o: ../../../../winix/winixd/core/config.h
 templates.o: ../../../../pikotools/space/spaceparser.h
 templates.o: ../../../../pikotools/space/space.h
-templates.o: ../../../../winix/winixd/core/htmlfilter.h
 templates.o: ../../../../winix/winixd/core/log.h
 templates.o: ../../../../winix/winixd/core/textstream.h
 templates.o: ../../../../winix/winixd/core/logmanipulators.h
diff --git a/winixd/plugins/gallery/init.cpp b/winixd/plugins/gallery/init.cpp
index 0c001c3..a1c3a99 100644
--- a/winixd/plugins/gallery/init.cpp
+++ b/winixd/plugins/gallery/init.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2014, Tomasz Sowa
+ * Copyright (c) 2011-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,8 @@
 #include "gallery.h"
 #include "core/log.h"
 #include "core/plugin.h"
+#include "functions/functions.h"
+
 
 namespace Winix
 {
diff --git a/winixd/plugins/group/Makefile.dep b/winixd/plugins/group/Makefile.dep
index 8ab28a6..acac0bb 100644
--- a/winixd/plugins/group/Makefile.dep
+++ b/winixd/plugins/group/Makefile.dep
@@ -3,6 +3,14 @@
 groupinfo.o: groupinfo.h groups.h ../../../../pikotools/space/spaceparser.h
 groupinfo.o: ../../../../pikotools/space/space.h
 groupinfo.o: ../../../../pikotools/textstream/types.h
+groupinfo.o: ../../../../winix/winixd/core/winixrequest.h
+groupinfo.o: ../../../../winix/winixd/core/winixsystem.h
+groupinfo.o: ../../../../winix/winixd/core/winixmodel.h
+groupinfo.o: ../../../../winix/winixd/core/winixbase.h
+groupinfo.o: ../../../../winix/winixd/core/config.h
+groupinfo.o: ../../../../winix/winixd/core/log.h
+groupinfo.o: ../../../../winix/winixd/core/textstream.h
+groupinfo.o: ../../../../winix/winixd/core/misc.h
 groupinfo.o: ../../../../winix/winixd/core/item.h
 groupinfo.o: ../../../../pikotools/space/space.h
 groupinfo.o: ../../../../pikotools/date/date.h
@@ -10,33 +18,28 @@ groupinfo.o: ../../../../pikotools/convert/convert.h
 groupinfo.o: ../../../../pikotools/convert/inttostr.h
 groupinfo.o: ../../../../pikotools/convert/strtoint.h
 groupinfo.o: ../../../../pikotools/convert/text.h
-groupinfo.o: ../../../../pikotools/convert/misc.h
-groupinfo.o: ../../../../winix/winixd/core/system.h
-groupinfo.o: ../../../../winix/winixd/core/job.h
-groupinfo.o: ../../../../winix/winixd/core/basethread.h
-groupinfo.o: ../../../../winix/winixd/core/synchro.h
-groupinfo.o: ../../../../winix/winixd/core/winixmodel.h
-groupinfo.o: ../../../../winix/winixd/core/winixbase.h
-groupinfo.o: ../../../../winix/winixd/core/config.h
-groupinfo.o: ../../../../winix/winixd/core/htmlfilter.h
-groupinfo.o: ../../../../winix/winixd/core/log.h
-groupinfo.o: ../../../../winix/winixd/core/textstream.h
+groupinfo.o: ../../../../winix/winixd/core/requesttypes.h
 groupinfo.o: ../../../../pikotools/textstream/textstream.h
 groupinfo.o: ../../../../pikotools/membuffer/membuffer.h
 groupinfo.o: ../../../../pikotools/textstream/types.h
 groupinfo.o: ../../../../pikotools/utf8/utf8.h
+groupinfo.o: ../../../../winix/winixd/core/winix_const.h
 groupinfo.o: ../../../../winix/winixd/core/logmanipulators.h
 groupinfo.o: ../../../../winix/winixd/core/filelog.h
 groupinfo.o: ../../../../winix/winixd/core/synchro.h
 groupinfo.o: ../../../../winix/winixd/core/log.h
 groupinfo.o: ../../../../winix/winixd/core/filelog.h
 groupinfo.o: ../../../../winix/winixd/core/lock.h
+groupinfo.o: ../../../../winix/winixd/core/synchro.h
 groupinfo.o: ../../../../winix/winixd/core/plugin.h
 groupinfo.o: ../../../../winix/winixd/core/pluginmsg.h
 groupinfo.o: ../../../../winix/winixd/core/plugindata.h
 groupinfo.o: ../../../../winix/winixd/core/winixbase.h
+groupinfo.o: ../../../../winix/winixd/core/system.h
+groupinfo.o: ../../../../winix/winixd/core/job.h
+groupinfo.o: ../../../../winix/winixd/core/basethread.h
+groupinfo.o: ../../../../winix/winixd/core/winixmodel.h
 groupinfo.o: ../../../../winix/winixd/core/dirs.h
-groupinfo.o: ../../../../winix/winixd/core/item.h
 groupinfo.o: ../../../../winix/winixd/core/dircontainer.h
 groupinfo.o: ../../../../winix/winixd/db/db.h
 groupinfo.o: ../../../../winix/winixd/db/dbbase.h
@@ -45,13 +48,13 @@ groupinfo.o: ../../../../winix/winixd/db/dbtextstream.h
 groupinfo.o: ../../../../winix/winixd/core/textstream.h
 groupinfo.o: ../../../../winix/winixd/core/error.h
 groupinfo.o: ../../../../winix/winixd/db/dbitemquery.h
+groupinfo.o: ../../../../winix/winixd/core/item.h
 groupinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h
 groupinfo.o: ../../../../winix/winixd/core/user.h
 groupinfo.o: ../../../../winix/winixd/core/group.h
 groupinfo.o: ../../../../winix/winixd/core/dircontainer.h
 groupinfo.o: ../../../../winix/winixd/core/ugcontainer.h
 groupinfo.o: ../../../../winix/winixd/core/request.h
-groupinfo.o: ../../../../winix/winixd/core/requesttypes.h
 groupinfo.o: ../../../../winix/winixd/core/error.h
 groupinfo.o: ../../../../winix/winixd/core/config.h
 groupinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
@@ -89,13 +92,118 @@ groupinfo.o: ../../../../winix/winixd/notify/notifythread.h
 groupinfo.o: ../../../../winix/winixd/core/basethread.h
 groupinfo.o: ../../../../winix/winixd/notify/templatesnotify.h
 groupinfo.o: ../../../../winix/winixd/core/users.h
-groupinfo.o: ../../../../winix/winixd/core/winixmodel.h
 groupinfo.o: ../../../../winix/winixd/core/timezones.h
 groupinfo.o: ../../../../winix/winixd/core/timezone.h
+groupinfo.o: ../../../../winix/winixd/core/cur.h
+groupinfo.o: ../../../../winix/winixd/core/sessionmanager.h
+groupinfo.o: ../../../../winix/winixd/core/sessioncontainer.h
+groupinfo.o: ../../../../winix/winixd/core/ipbancontainer.h
+groupinfo.o: ../../../../winix/winixd/core/system.h
+groupinfo.o: ../../../../winix/winixd/core/sessionidmanager.h
+groupinfo.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
+groupinfo.o: ../../../../winix/winixd/core/slog.h
 groups.o: groups.h ../../../../pikotools/space/spaceparser.h
 groups.o: ../../../../pikotools/space/space.h
 groups.o: ../../../../pikotools/textstream/types.h
+groups.o: ../../../../winix/winixd/core/winixrequest.h
+groups.o: ../../../../winix/winixd/core/winixsystem.h
+groups.o: ../../../../winix/winixd/core/winixmodel.h
+groups.o: ../../../../winix/winixd/core/winixbase.h
+groups.o: ../../../../winix/winixd/core/config.h
 groups.o: ../../../../winix/winixd/core/log.h
+groups.o: ../../../../winix/winixd/core/textstream.h
+groups.o: ../../../../winix/winixd/core/misc.h
+groups.o: ../../../../winix/winixd/core/item.h
+groups.o: ../../../../pikotools/space/space.h
+groups.o: ../../../../pikotools/date/date.h
+groups.o: ../../../../pikotools/convert/convert.h
+groups.o: ../../../../pikotools/convert/inttostr.h
+groups.o: ../../../../pikotools/convert/strtoint.h
+groups.o: ../../../../pikotools/convert/text.h
+groups.o: ../../../../winix/winixd/core/requesttypes.h
+groups.o: ../../../../pikotools/textstream/textstream.h
+groups.o: ../../../../pikotools/membuffer/membuffer.h
+groups.o: ../../../../pikotools/textstream/types.h
+groups.o: ../../../../pikotools/utf8/utf8.h
+groups.o: ../../../../winix/winixd/core/winix_const.h
+groups.o: ../../../../winix/winixd/core/logmanipulators.h
+groups.o: ../../../../winix/winixd/core/filelog.h
+groups.o: ../../../../winix/winixd/core/synchro.h
+groups.o: ../../../../winix/winixd/core/log.h
+groups.o: ../../../../winix/winixd/core/filelog.h
+groups.o: ../../../../winix/winixd/core/lock.h
+groups.o: ../../../../winix/winixd/core/synchro.h
+groups.o: ../../../../winix/winixd/core/plugin.h
+groups.o: ../../../../winix/winixd/core/pluginmsg.h
+groups.o: ../../../../winix/winixd/core/plugindata.h
+groups.o: ../../../../winix/winixd/core/winixbase.h
+groups.o: ../../../../winix/winixd/core/system.h
+groups.o: ../../../../winix/winixd/core/job.h
+groups.o: ../../../../winix/winixd/core/basethread.h
+groups.o: ../../../../winix/winixd/core/winixmodel.h
+groups.o: ../../../../winix/winixd/core/dirs.h
+groups.o: ../../../../winix/winixd/core/dircontainer.h
+groups.o: ../../../../winix/winixd/db/db.h
+groups.o: ../../../../winix/winixd/db/dbbase.h
+groups.o: ../../../../winix/winixd/db/dbconn.h
+groups.o: ../../../../winix/winixd/db/dbtextstream.h
+groups.o: ../../../../winix/winixd/core/textstream.h
+groups.o: ../../../../winix/winixd/core/error.h
+groups.o: ../../../../winix/winixd/db/dbitemquery.h
+groups.o: ../../../../winix/winixd/core/item.h
+groups.o: ../../../../winix/winixd/db/dbitemcolumns.h
+groups.o: ../../../../winix/winixd/core/user.h
+groups.o: ../../../../winix/winixd/core/group.h
+groups.o: ../../../../winix/winixd/core/dircontainer.h
+groups.o: ../../../../winix/winixd/core/ugcontainer.h
+groups.o: ../../../../winix/winixd/core/request.h
+groups.o: ../../../../winix/winixd/core/error.h
+groups.o: ../../../../winix/winixd/core/config.h
+groups.o: ../../../../winix/winixd/templates/htmltextstream.h
+groups.o: ../../../../pikotools/space/spacetojson.h
+groups.o: ../../../../ezc/src/outstreams.h
+groups.o: ../../../../winix/winixd/core/mounts.h
+groups.o: ../../../../winix/winixd/core/mount.h
+groups.o: ../../../../winix/winixd/core/mountparser.h
+groups.o: ../../../../winix/winixd/core/crypt.h
+groups.o: ../../../../winix/winixd/core/run.h
+groups.o: ../../../../winix/winixd/core/user.h
+groups.o: ../../../../winix/winixd/core/users.h
+groups.o: ../../../../winix/winixd/core/ugcontainer.h
+groups.o: ../../../../winix/winixd/core/lastcontainer.h
+groups.o: ../../../../winix/winixd/core/cur.h
+groups.o: ../../../../winix/winixd/core/session.h
+groups.o: ../../../../winix/winixd/core/rebus.h
+groups.o: ../../../../winix/winixd/core/ipban.h
+groups.o: ../../../../winix/winixd/core/loadavg.h
+groups.o: ../../../../winix/winixd/core/image.h
+groups.o: ../../../../winix/winixd/core/threadmanager.h
+groups.o: ../../../../winix/winixd/notify/notify.h
+groups.o: ../../../../winix/winixd/notify/notifypool.h
+groups.o: ../../../../winix/winixd/templates/locale.h
+groups.o: ../../../../winix/winixd/templates/patterns.h
+groups.o: ../../../../winix/winixd/templates/locale.h
+groups.o: ../../../../winix/winixd/templates/localefilter.h
+groups.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
+groups.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
+groups.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
+groups.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
+groups.o: ../../../../ezc/src/expressionparser.h
+groups.o: ../../../../ezc/src/patternparser.h
+groups.o: ../../../../winix/winixd/notify/notifythread.h
+groups.o: ../../../../winix/winixd/core/basethread.h
+groups.o: ../../../../winix/winixd/notify/templatesnotify.h
+groups.o: ../../../../winix/winixd/core/users.h
+groups.o: ../../../../winix/winixd/core/timezones.h
+groups.o: ../../../../winix/winixd/core/timezone.h
+groups.o: ../../../../winix/winixd/core/cur.h
+groups.o: ../../../../winix/winixd/core/sessionmanager.h
+groups.o: ../../../../winix/winixd/core/sessioncontainer.h
+groups.o: ../../../../winix/winixd/core/ipbancontainer.h
+groups.o: ../../../../winix/winixd/core/system.h
+groups.o: ../../../../winix/winixd/core/sessionidmanager.h
+groups.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
+groups.o: ../../../../winix/winixd/core/slog.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/plugin.h
 init.o: ../../../../winix/winixd/core/pluginmsg.h
@@ -104,35 +212,38 @@ init.o: ../../../../winix/winixd/core/winixbase.h groupinfo.h groups.h
 init.o: ../../../../pikotools/space/spaceparser.h
 init.o: ../../../../pikotools/space/space.h
 init.o: ../../../../pikotools/textstream/types.h
+init.o: ../../../../winix/winixd/core/winixrequest.h
+init.o: ../../../../winix/winixd/core/winixsystem.h
+init.o: ../../../../winix/winixd/core/winixmodel.h
+init.o: ../../../../winix/winixd/core/winixbase.h
+init.o: ../../../../winix/winixd/core/config.h
+init.o: ../../../../winix/winixd/core/log.h
+init.o: ../../../../winix/winixd/core/textstream.h
+init.o: ../../../../winix/winixd/core/misc.h
 init.o: ../../../../winix/winixd/core/item.h
 init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
 init.o: ../../../../pikotools/convert/convert.h
 init.o: ../../../../pikotools/convert/inttostr.h
 init.o: ../../../../pikotools/convert/strtoint.h
 init.o: ../../../../pikotools/convert/text.h
-init.o: ../../../../pikotools/convert/misc.h
-init.o: ../../../../winix/winixd/core/system.h
-init.o: ../../../../winix/winixd/core/job.h
-init.o: ../../../../winix/winixd/core/basethread.h
-init.o: ../../../../winix/winixd/core/synchro.h
-init.o: ../../../../winix/winixd/core/winixmodel.h
-init.o: ../../../../winix/winixd/core/winixbase.h
-init.o: ../../../../winix/winixd/core/config.h
-init.o: ../../../../winix/winixd/core/htmlfilter.h
-init.o: ../../../../winix/winixd/core/log.h
-init.o: ../../../../winix/winixd/core/textstream.h
+init.o: ../../../../winix/winixd/core/requesttypes.h
 init.o: ../../../../pikotools/textstream/textstream.h
 init.o: ../../../../pikotools/membuffer/membuffer.h
 init.o: ../../../../pikotools/textstream/types.h
 init.o: ../../../../pikotools/utf8/utf8.h
+init.o: ../../../../winix/winixd/core/winix_const.h
 init.o: ../../../../winix/winixd/core/logmanipulators.h
 init.o: ../../../../winix/winixd/core/filelog.h
 init.o: ../../../../winix/winixd/core/synchro.h
 init.o: ../../../../winix/winixd/core/filelog.h
 init.o: ../../../../winix/winixd/core/lock.h
+init.o: ../../../../winix/winixd/core/synchro.h
 init.o: ../../../../winix/winixd/core/plugin.h
+init.o: ../../../../winix/winixd/core/system.h
+init.o: ../../../../winix/winixd/core/job.h
+init.o: ../../../../winix/winixd/core/basethread.h
+init.o: ../../../../winix/winixd/core/winixmodel.h
 init.o: ../../../../winix/winixd/core/dirs.h
-init.o: ../../../../winix/winixd/core/item.h
 init.o: ../../../../winix/winixd/core/dircontainer.h
 init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
 init.o: ../../../../winix/winixd/db/dbconn.h
@@ -140,13 +251,13 @@ init.o: ../../../../winix/winixd/db/dbtextstream.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/error.h
 init.o: ../../../../winix/winixd/db/dbitemquery.h
+init.o: ../../../../winix/winixd/core/item.h
 init.o: ../../../../winix/winixd/db/dbitemcolumns.h
 init.o: ../../../../winix/winixd/core/user.h
 init.o: ../../../../winix/winixd/core/group.h
 init.o: ../../../../winix/winixd/core/dircontainer.h
 init.o: ../../../../winix/winixd/core/ugcontainer.h
 init.o: ../../../../winix/winixd/core/request.h
-init.o: ../../../../winix/winixd/core/requesttypes.h
 init.o: ../../../../winix/winixd/core/error.h
 init.o: ../../../../winix/winixd/core/config.h
 init.o: ../../../../winix/winixd/templates/htmltextstream.h
@@ -184,28 +295,100 @@ init.o: ../../../../winix/winixd/notify/notifythread.h
 init.o: ../../../../winix/winixd/core/basethread.h
 init.o: ../../../../winix/winixd/notify/templatesnotify.h
 init.o: ../../../../winix/winixd/core/users.h
-init.o: ../../../../winix/winixd/core/winixmodel.h
 init.o: ../../../../winix/winixd/core/timezones.h
 init.o: ../../../../winix/winixd/core/timezone.h
+init.o: ../../../../winix/winixd/core/cur.h
+init.o: ../../../../winix/winixd/core/sessionmanager.h
+init.o: ../../../../winix/winixd/core/sessioncontainer.h
+init.o: ../../../../winix/winixd/core/ipbancontainer.h
+init.o: ../../../../winix/winixd/core/system.h
+init.o: ../../../../winix/winixd/core/sessionidmanager.h
+init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
+init.o: ../../../../winix/winixd/core/slog.h
+init.o: ../../../../winix/winixd/functions/functions.h
+init.o: ../../../../winix/winixd/functions/functionbase.h
+init.o: ../../../../winix/winixd/core/request.h
+init.o: ../../../../winix/winixd/functions/functionparser.h
+init.o: ../../../../winix/winixd/functions/account.h
+init.o: ../../../../winix/winixd/functions/adduser.h
+init.o: ../../../../winix/winixd/functions/cat.h
+init.o: ../../../../winix/winixd/functions/chmod.h
+init.o: ../../../../winix/winixd/functions/privchanger.h
+init.o: ../../../../winix/winixd/functions/chown.h
+init.o: ../../../../winix/winixd/functions/ckeditor.h
+init.o: ../../../../winix/winixd/functions/cp.h
+init.o: ../../../../winix/winixd/functions/default.h
+init.o: ../../../../winix/winixd/functions/download.h
+init.o: ../../../../winix/winixd/functions/emacs.h
+init.o: ../../../../winix/winixd/functions/env.h
+init.o: ../../../../winix/winixd/functions/imgcrop.h
+init.o: ../../../../winix/winixd/functions/last.h
+init.o: ../../../../winix/winixd/functions/login.h
+init.o: ../../../../winix/winixd/functions/logout.h
+init.o: ../../../../winix/winixd/functions/ln.h
+init.o: ../../../../winix/winixd/functions/ls.h
+init.o: ../../../../winix/winixd/functions/man.h
+init.o: ../../../../winix/winixd/functions/meta.h
+init.o: ../../../../winix/winixd/functions/mkdir.h
+init.o: ../../../../winix/winixd/functions/mv.h
+init.o: ../../../../winix/winixd/functions/nicedit.h
+init.o: ../../../../winix/winixd/functions/node.h
+init.o: ../../../../winix/winixd/functions/passwd.h
+init.o: ../../../../winix/winixd/functions/priv.h
+init.o: ../../../../winix/winixd/functions/pw.h
+init.o: ../../../../winix/winixd/functions/reload.h
+init.o: ../../../../winix/winixd/functions/rm.h
+init.o: ../../../../winix/winixd/functions/rmuser.h
+init.o: ../../../../winix/winixd/functions/sort.h
+init.o: ../../../../winix/winixd/functions/specialdefault.h
+init.o: ../../../../winix/winixd/functions/stat.h
+init.o: ../../../../winix/winixd/functions/subject.h
+init.o: ../../../../winix/winixd/functions/template.h
+init.o: ../../../../winix/winixd/functions/tinymce.h
+init.o: ../../../../winix/winixd/functions/uname.h
+init.o: ../../../../winix/winixd/functions/upload.h
+init.o: ../../../../winix/winixd/functions/uptime.h
+init.o: ../../../../winix/winixd/functions/who.h
+init.o: ../../../../winix/winixd/functions/vim.h
+init.o: ../../../../winix/winixd/core/htmlfilter.h
 templates.o: ../../../../winix/winixd/templates/templates.h
 templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
 templates.o: ../../../../ezc/src/blocks.h
-templates.o: ../../../../winix/winixd/core/item.h ../../../../ezc/src/cache.h
-templates.o: ../../../../ezc/src/functions.h
-templates.o: ../../../../pikotools/utf8/utf8.h ../../../../ezc/src/funinfo.h
-templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
-templates.o: ../../../../ezc/src/outstreams.h
-templates.o: ../../../../ezc/src/expressionparser.h
-templates.o: ../../../../ezc/src/patternparser.h
-templates.o: ../../../../pikotools/convert/misc.h
-templates.o: ../../../../pikotools/convert/text.h
-templates.o: ../../../../winix/winixd/templates/patterncacher.h
 templates.o: ../../../../winix/winixd/core/item.h
 templates.o: ../../../../pikotools/space/space.h
 templates.o: ../../../../pikotools/date/date.h
 templates.o: ../../../../pikotools/convert/convert.h
 templates.o: ../../../../pikotools/convert/inttostr.h
 templates.o: ../../../../pikotools/convert/strtoint.h
+templates.o: ../../../../pikotools/convert/text.h
+templates.o: ../../../../winix/winixd/core/misc.h
+templates.o: ../../../../winix/winixd/core/requesttypes.h
+templates.o: ../../../../pikotools/textstream/textstream.h
+templates.o: ../../../../pikotools/membuffer/membuffer.h
+templates.o: ../../../../pikotools/textstream/types.h
+templates.o: ../../../../pikotools/utf8/utf8.h
+templates.o: ../../../../winix/winixd/core/winix_const.h
+templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
+templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
+templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
+templates.o: ../../../../ezc/src/expressionparser.h
+templates.o: ../../../../ezc/src/patternparser.h
+templates.o: ../../../../winix/winixd/templates/patterncacher.h
+templates.o: ../../../../winix/winixd/core/item.h
+templates.o: ../../../../winix/winixd/core/winixbase.h
+templates.o: ../../../../winix/winixd/core/config.h
+templates.o: ../../../../pikotools/space/spaceparser.h
+templates.o: ../../../../pikotools/space/space.h
+templates.o: ../../../../pikotools/textstream/types.h
+templates.o: ../../../../winix/winixd/core/log.h
+templates.o: ../../../../winix/winixd/core/textstream.h
+templates.o: ../../../../winix/winixd/core/logmanipulators.h
+templates.o: ../../../../winix/winixd/core/filelog.h
+templates.o: ../../../../winix/winixd/core/synchro.h
+templates.o: ../../../../winix/winixd/core/log.h
+templates.o: ../../../../winix/winixd/core/filelog.h
+templates.o: ../../../../winix/winixd/core/lock.h
+templates.o: ../../../../winix/winixd/core/synchro.h
 templates.o: ../../../../winix/winixd/templates/indexpatterns.h
 templates.o: ../../../../winix/winixd/templates/patterns.h
 templates.o: ../../../../winix/winixd/templates/locale.h
@@ -213,46 +396,14 @@ templates.o: ../../../../winix/winixd/templates/localefilter.h
 templates.o: ../../../../winix/winixd/templates/changepatterns.h
 templates.o: ../../../../winix/winixd/templates/htmltextstream.h
 templates.o: ../../../../winix/winixd/core/textstream.h
-templates.o: ../../../../winix/winixd/core/config.h
-templates.o: ../../../../pikotools/space/spaceparser.h
-templates.o: ../../../../pikotools/space/space.h
-templates.o: ../../../../pikotools/textstream/types.h
-templates.o: ../../../../winix/winixd/core/htmlfilter.h
-templates.o: ../../../../winix/winixd/core/log.h
-templates.o: ../../../../winix/winixd/core/textstream.h
-templates.o: ../../../../pikotools/textstream/textstream.h
-templates.o: ../../../../pikotools/membuffer/membuffer.h
-templates.o: ../../../../pikotools/textstream/types.h
-templates.o: ../../../../winix/winixd/core/logmanipulators.h
-templates.o: ../../../../winix/winixd/core/filelog.h
-templates.o: ../../../../winix/winixd/core/synchro.h
 templates.o: ../../../../winix/winixd/core/cur.h
-templates.o: ../../../../winix/winixd/core/request.h
-templates.o: ../../../../winix/winixd/core/requesttypes.h
-templates.o: ../../../../winix/winixd/core/error.h
-templates.o: ../../../../winix/winixd/core/config.h
-templates.o: ../../../../winix/winixd/templates/htmltextstream.h
-templates.o: ../../../../pikotools/space/spacetojson.h
-templates.o: ../../../../winix/winixd/core/session.h
-templates.o: ../../../../winix/winixd/core/user.h
-templates.o: ../../../../winix/winixd/core/plugindata.h
-templates.o: ../../../../winix/winixd/core/rebus.h
-templates.o: ../../../../winix/winixd/core/winixbase.h
-templates.o: ../../../../winix/winixd/core/ipban.h
-templates.o: ../../../../winix/winixd/core/mount.h
 templates.o: ../../../../winix/winixd/core/system.h
 templates.o: ../../../../winix/winixd/core/job.h
 templates.o: ../../../../winix/winixd/core/basethread.h
-templates.o: ../../../../winix/winixd/core/synchro.h
 templates.o: ../../../../winix/winixd/core/winixmodel.h
-templates.o: ../../../../winix/winixd/core/winixbase.h
-templates.o: ../../../../winix/winixd/core/log.h
-templates.o: ../../../../winix/winixd/core/filelog.h
-templates.o: ../../../../winix/winixd/core/lock.h
-templates.o: ../../../../winix/winixd/core/plugin.h
-templates.o: ../../../../winix/winixd/core/pluginmsg.h
 templates.o: ../../../../winix/winixd/core/dirs.h
 templates.o: ../../../../winix/winixd/core/dircontainer.h
+templates.o: ../../../../winix/winixd/core/winixbase.h
 templates.o: ../../../../winix/winixd/db/db.h
 templates.o: ../../../../winix/winixd/db/dbbase.h
 templates.o: ../../../../winix/winixd/db/dbconn.h
@@ -264,35 +415,50 @@ templates.o: ../../../../winix/winixd/core/user.h
 templates.o: ../../../../winix/winixd/core/group.h
 templates.o: ../../../../winix/winixd/core/dircontainer.h
 templates.o: ../../../../winix/winixd/core/ugcontainer.h
+templates.o: ../../../../winix/winixd/core/request.h
+templates.o: ../../../../winix/winixd/core/error.h
+templates.o: ../../../../winix/winixd/core/config.h
+templates.o: ../../../../winix/winixd/templates/htmltextstream.h
+templates.o: ../../../../pikotools/space/spacetojson.h
 templates.o: ../../../../winix/winixd/core/mounts.h
+templates.o: ../../../../winix/winixd/core/mount.h
 templates.o: ../../../../winix/winixd/core/mountparser.h
 templates.o: ../../../../winix/winixd/core/crypt.h
 templates.o: ../../../../winix/winixd/core/run.h
+templates.o: ../../../../winix/winixd/core/user.h
 templates.o: ../../../../winix/winixd/core/users.h
 templates.o: ../../../../winix/winixd/core/ugcontainer.h
 templates.o: ../../../../winix/winixd/core/lastcontainer.h
-templates.o: ../../../../winix/winixd/core/cur.h groups.h
-templates.o: ../../../../winix/winixd/core/loadavg.h
-templates.o: ../../../../winix/winixd/core/image.h
-templates.o: ../../../../winix/winixd/core/threadmanager.h
-templates.o: ../../../../winix/winixd/notify/notify.h
-templates.o: ../../../../winix/winixd/notify/notifypool.h
-templates.o: ../../../../winix/winixd/templates/locale.h
-templates.o: ../../../../winix/winixd/templates/patterns.h
-templates.o: ../../../../winix/winixd/notify/notifythread.h
-templates.o: ../../../../winix/winixd/core/basethread.h
-templates.o: ../../../../winix/winixd/notify/templatesnotify.h
-templates.o: ../../../../winix/winixd/core/users.h
+templates.o: ../../../../winix/winixd/core/cur.h
+templates.o: ../../../../winix/winixd/core/session.h
+templates.o: ../../../../winix/winixd/core/plugindata.h
+templates.o: ../../../../winix/winixd/core/rebus.h
+templates.o: ../../../../winix/winixd/core/ipban.h groups.h
+templates.o: ../../../../winix/winixd/core/winixrequest.h
+templates.o: ../../../../winix/winixd/core/winixsystem.h
 templates.o: ../../../../winix/winixd/core/winixmodel.h
-templates.o: ../../../../winix/winixd/core/timezones.h
-templates.o: ../../../../winix/winixd/core/timezone.h
+templates.o: ../../../../winix/winixd/core/plugin.h
+templates.o: ../../../../winix/winixd/core/pluginmsg.h
 templates.o: ../../../../winix/winixd/core/sessionmanager.h
 templates.o: ../../../../winix/winixd/core/sessioncontainer.h
 templates.o: ../../../../winix/winixd/core/ipbancontainer.h
 templates.o: ../../../../winix/winixd/core/system.h
 templates.o: ../../../../winix/winixd/core/sessionidmanager.h
 templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
+templates.o: ../../../../winix/winixd/core/slog.h
+templates.o: ../../../../winix/winixd/templates/locale.h
+templates.o: ../../../../winix/winixd/core/loadavg.h
+templates.o: ../../../../winix/winixd/core/image.h
+templates.o: ../../../../winix/winixd/core/threadmanager.h
+templates.o: ../../../../winix/winixd/notify/notify.h
+templates.o: ../../../../winix/winixd/notify/notifypool.h
+templates.o: ../../../../winix/winixd/templates/patterns.h
+templates.o: ../../../../winix/winixd/notify/notifythread.h
+templates.o: ../../../../winix/winixd/core/basethread.h
+templates.o: ../../../../winix/winixd/notify/templatesnotify.h
+templates.o: ../../../../winix/winixd/core/users.h
+templates.o: ../../../../winix/winixd/core/timezones.h
+templates.o: ../../../../winix/winixd/core/timezone.h
 templates.o: ../../../../winix/winixd/core/htmlfilter.h
 templates.o: ../../../../winix/winixd/core/plugin.h groupinfo.h
 templates.o: ../../../../winix/winixd/core/misc.h
-templates.o: ../../../../winix/winixd/core/winix_const.h
diff --git a/winixd/plugins/group/groupinfo.cpp b/winixd/plugins/group/groupinfo.cpp
index 6a7fdd1..d8afc35 100644
--- a/winixd/plugins/group/groupinfo.cpp
+++ b/winixd/plugins/group/groupinfo.cpp
@@ -171,6 +171,7 @@ void GroupInfo::ReadGroupsConf(Mounts & mounts, bool skip_existing_configs)
 				{
 					log << log3 << "GroupItem: parsing conf file: " << config_file.url << logend;
 					groups_wrap[mount.dir_id].file_name = file_name;
+					groups_wrap[mount.dir_id].groups.set_dependency(this);
 
 					if( !ParseGroups(config_file.content, groups_wrap[mount.dir_id].groups) )
 						groups_wrap[mount.dir_id].to_delete = true;
diff --git a/winixd/plugins/group/groupinfo.h b/winixd/plugins/group/groupinfo.h
index 41b64e7..240120b 100644
--- a/winixd/plugins/group/groupinfo.h
+++ b/winixd/plugins/group/groupinfo.h
@@ -42,6 +42,8 @@
 #include "core/item.h"
 #include "core/system.h"
 #include "core/config.h"
+#include "core/winixrequest.h"
+
 
 namespace Winix
 {
@@ -66,7 +68,7 @@ struct GroupsWrapItem
 
 
 
-class GroupInfo
+class GroupInfo : public WinixRequest
 {
 
 public:
diff --git a/winixd/plugins/group/groups.cpp b/winixd/plugins/group/groups.cpp
index 94c1fde..758effb 100644
--- a/winixd/plugins/group/groups.cpp
+++ b/winixd/plugins/group/groups.cpp
@@ -32,6 +32,7 @@
  * 
  */
 
+#include <algorithm>
 #include <limits>
 #include "groups.h"
 #include "core/log.h"
diff --git a/winixd/plugins/group/groups.h b/winixd/plugins/group/groups.h
index 579c2f9..b019249 100644
--- a/winixd/plugins/group/groups.h
+++ b/winixd/plugins/group/groups.h
@@ -39,6 +39,8 @@
 #include <vector>
 #include <string>
 #include "space/spaceparser.h"
+#include "core/winixrequest.h"
+
 
 namespace Winix
 {
@@ -47,7 +49,7 @@ namespace GroupItem
 {
 
 
-class Groups
+class Groups : public WinixRequest
 {
 public:
 
diff --git a/winixd/plugins/group/init.cpp b/winixd/plugins/group/init.cpp
index 00d9fd0..23bdbd7 100644
--- a/winixd/plugins/group/init.cpp
+++ b/winixd/plugins/group/init.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2014, Tomasz Sowa
+ * Copyright (c) 2011-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,8 @@
 #include "core/log.h"
 #include "core/plugin.h"
 #include "groupinfo.h"
+#include "functions/functions.h"
+
 
 namespace Winix
 {
@@ -95,6 +97,7 @@ using namespace GroupItem;
 	info.plugin->Assign(WINIX_FSTAB_CHANGED,					FstabChanged);
 	info.plugin->Assign(WINIX_PROCESS_REQUEST,				ProcessRequest);
 
+	info.set_dependency_for(group_info);
 	group_info.SetSystem(info.system);
 	group_info.SetConfig(info.config);
 
diff --git a/winixd/plugins/mailregister/Makefile.dep b/winixd/plugins/mailregister/Makefile.dep
index 876c391..e65c7df 100644
--- a/winixd/plugins/mailregister/Makefile.dep
+++ b/winixd/plugins/mailregister/Makefile.dep
@@ -24,7 +24,6 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/winixbase.h
 funregistermail_showusers.o: ../../../../winix/winixd/core/config.h
 funregistermail_showusers.o: ../../../../pikotools/space/spaceparser.h
 funregistermail_showusers.o: ../../../../pikotools/space/space.h
-funregistermail_showusers.o: ../../../../winix/winixd/core/htmlfilter.h
 funregistermail_showusers.o: ../../../../winix/winixd/core/log.h
 funregistermail_showusers.o: ../../../../winix/winixd/core/textstream.h
 funregistermail_showusers.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -139,7 +138,6 @@ funregistermail.o: ../../../../winix/winixd/core/winixbase.h
 funregistermail.o: ../../../../winix/winixd/core/config.h
 funregistermail.o: ../../../../pikotools/space/spaceparser.h
 funregistermail.o: ../../../../pikotools/space/space.h
-funregistermail.o: ../../../../winix/winixd/core/htmlfilter.h
 funregistermail.o: ../../../../winix/winixd/core/log.h
 funregistermail.o: ../../../../winix/winixd/core/textstream.h
 funregistermail.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -255,7 +253,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
 init.o: ../../../../winix/winixd/core/config.h
 init.o: ../../../../pikotools/space/spaceparser.h
 init.o: ../../../../pikotools/space/space.h
-init.o: ../../../../winix/winixd/core/htmlfilter.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -335,6 +332,51 @@ init.o: ../../../../winix/winixd/core/sessionidmanager.h
 init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 init.o: ../../../../winix/winixd/core/slog.h registermail_info.h
 init.o: funregistermail_showusers.h
+init.o: ../../../../winix/winixd/functions/functions.h
+init.o: ../../../../winix/winixd/functions/functionbase.h
+init.o: ../../../../winix/winixd/functions/functionparser.h
+init.o: ../../../../winix/winixd/functions/account.h
+init.o: ../../../../winix/winixd/functions/adduser.h
+init.o: ../../../../winix/winixd/functions/cat.h
+init.o: ../../../../winix/winixd/functions/chmod.h
+init.o: ../../../../winix/winixd/functions/privchanger.h
+init.o: ../../../../winix/winixd/functions/chown.h
+init.o: ../../../../winix/winixd/functions/ckeditor.h
+init.o: ../../../../winix/winixd/functions/cp.h
+init.o: ../../../../winix/winixd/functions/default.h
+init.o: ../../../../winix/winixd/functions/download.h
+init.o: ../../../../winix/winixd/functions/emacs.h
+init.o: ../../../../winix/winixd/functions/env.h
+init.o: ../../../../winix/winixd/functions/imgcrop.h
+init.o: ../../../../winix/winixd/functions/last.h
+init.o: ../../../../winix/winixd/functions/login.h
+init.o: ../../../../winix/winixd/functions/logout.h
+init.o: ../../../../winix/winixd/functions/ln.h
+init.o: ../../../../winix/winixd/functions/ls.h
+init.o: ../../../../winix/winixd/functions/man.h
+init.o: ../../../../winix/winixd/functions/meta.h
+init.o: ../../../../winix/winixd/functions/mkdir.h
+init.o: ../../../../winix/winixd/functions/mv.h
+init.o: ../../../../winix/winixd/functions/nicedit.h
+init.o: ../../../../winix/winixd/functions/node.h
+init.o: ../../../../winix/winixd/functions/passwd.h
+init.o: ../../../../winix/winixd/functions/priv.h
+init.o: ../../../../winix/winixd/functions/pw.h
+init.o: ../../../../winix/winixd/functions/reload.h
+init.o: ../../../../winix/winixd/functions/rm.h
+init.o: ../../../../winix/winixd/functions/rmuser.h
+init.o: ../../../../winix/winixd/functions/sort.h
+init.o: ../../../../winix/winixd/functions/specialdefault.h
+init.o: ../../../../winix/winixd/functions/stat.h
+init.o: ../../../../winix/winixd/functions/subject.h
+init.o: ../../../../winix/winixd/functions/template.h
+init.o: ../../../../winix/winixd/functions/tinymce.h
+init.o: ../../../../winix/winixd/functions/uname.h
+init.o: ../../../../winix/winixd/functions/upload.h
+init.o: ../../../../winix/winixd/functions/uptime.h
+init.o: ../../../../winix/winixd/functions/who.h
+init.o: ../../../../winix/winixd/functions/vim.h
+init.o: ../../../../winix/winixd/core/htmlfilter.h
 mdb.o: mdb.h ../../../../winix/winixd/db/dbbase.h
 mdb.o: ../../../../winix/winixd/core/dirs.h
 mdb.o: ../../../../winix/winixd/core/log.h
@@ -359,6 +401,22 @@ templates.o: ../../../../pikotools/date/date.h
 templates.o: ../../../../pikotools/convert/convert.h
 templates.o: ../../../../pikotools/convert/inttostr.h
 templates.o: ../../../../pikotools/convert/strtoint.h
+templates.o: ../../../../winix/winixd/core/winixbase.h
+templates.o: ../../../../winix/winixd/core/config.h
+templates.o: ../../../../pikotools/space/spaceparser.h
+templates.o: ../../../../pikotools/space/space.h
+templates.o: ../../../../winix/winixd/core/log.h
+templates.o: ../../../../winix/winixd/core/textstream.h
+templates.o: ../../../../winix/winixd/core/logmanipulators.h
+templates.o: ../../../../pikotools/textstream/textstream.h
+templates.o: ../../../../pikotools/membuffer/membuffer.h
+templates.o: ../../../../pikotools/textstream/types.h
+templates.o: ../../../../winix/winixd/core/filelog.h
+templates.o: ../../../../winix/winixd/core/synchro.h
+templates.o: ../../../../winix/winixd/core/log.h
+templates.o: ../../../../winix/winixd/core/filelog.h
+templates.o: ../../../../winix/winixd/core/lock.h
+templates.o: ../../../../winix/winixd/core/synchro.h
 templates.o: ../../../../winix/winixd/templates/indexpatterns.h
 templates.o: ../../../../winix/winixd/templates/patterns.h
 templates.o: ../../../../winix/winixd/templates/locale.h
@@ -366,28 +424,11 @@ templates.o: ../../../../winix/winixd/templates/localefilter.h
 templates.o: ../../../../winix/winixd/templates/changepatterns.h
 templates.o: ../../../../winix/winixd/templates/htmltextstream.h
 templates.o: ../../../../winix/winixd/core/textstream.h
-templates.o: ../../../../pikotools/textstream/textstream.h
-templates.o: ../../../../pikotools/membuffer/membuffer.h
-templates.o: ../../../../pikotools/textstream/types.h
-templates.o: ../../../../winix/winixd/core/config.h
-templates.o: ../../../../pikotools/space/spaceparser.h
-templates.o: ../../../../pikotools/space/space.h
-templates.o: ../../../../winix/winixd/core/htmlfilter.h
-templates.o: ../../../../winix/winixd/core/log.h
-templates.o: ../../../../winix/winixd/core/textstream.h
-templates.o: ../../../../winix/winixd/core/logmanipulators.h
-templates.o: ../../../../winix/winixd/core/filelog.h
-templates.o: ../../../../winix/winixd/core/synchro.h
 templates.o: ../../../../winix/winixd/core/cur.h
 templates.o: ../../../../winix/winixd/core/system.h
 templates.o: ../../../../winix/winixd/core/job.h
 templates.o: ../../../../winix/winixd/core/basethread.h
-templates.o: ../../../../winix/winixd/core/synchro.h
 templates.o: ../../../../winix/winixd/core/winixmodel.h
-templates.o: ../../../../winix/winixd/core/winixbase.h
-templates.o: ../../../../winix/winixd/core/log.h
-templates.o: ../../../../winix/winixd/core/filelog.h
-templates.o: ../../../../winix/winixd/core/lock.h
 templates.o: ../../../../winix/winixd/core/plugin.h
 templates.o: ../../../../winix/winixd/core/pluginmsg.h
 templates.o: ../../../../winix/winixd/core/plugindata.h
@@ -444,6 +485,9 @@ templates.o: ../../../../winix/winixd/core/system.h
 templates.o: ../../../../winix/winixd/core/sessionidmanager.h
 templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 templates.o: ../../../../winix/winixd/core/htmlfilter.h
+templates.o: ../../../../winix/winixd/core/winixrequest.h
+templates.o: ../../../../winix/winixd/core/winixsystem.h
+templates.o: ../../../../winix/winixd/core/slog.h
 templates.o: ../../../../winix/winixd/core/plugin.h
 templates.o: ../../../../winix/winixd/core/misc.h
 templates.o: ../../../../winix/winixd/core/requesttypes.h
diff --git a/winixd/plugins/mailregister/init.cpp b/winixd/plugins/mailregister/init.cpp
index 9db774e..d69dea6 100644
--- a/winixd/plugins/mailregister/init.cpp
+++ b/winixd/plugins/mailregister/init.cpp
@@ -39,6 +39,7 @@
 #include "funregistermail.h"
 #include "registermail_info.h"
 #include "funregistermail_showusers.h"
+#include "functions/functions.h"
 
 
 namespace Winix
diff --git a/winixd/plugins/menu/Makefile.dep b/winixd/plugins/menu/Makefile.dep
index 4f8398b..9a17b1b 100644
--- a/winixd/plugins/menu/Makefile.dep
+++ b/winixd/plugins/menu/Makefile.dep
@@ -16,7 +16,6 @@ cache.o: ../../../../winix/winixd/core/winixbase.h
 cache.o: ../../../../winix/winixd/core/config.h
 cache.o: ../../../../pikotools/space/spaceparser.h
 cache.o: ../../../../pikotools/space/space.h
-cache.o: ../../../../winix/winixd/core/htmlfilter.h
 cache.o: ../../../../winix/winixd/core/log.h
 cache.o: ../../../../winix/winixd/core/textstream.h
 cache.o: ../../../../pikotools/textstream/textstream.h
@@ -64,7 +63,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
 init.o: ../../../../winix/winixd/core/config.h
 init.o: ../../../../pikotools/space/spaceparser.h
 init.o: ../../../../pikotools/space/space.h
-init.o: ../../../../winix/winixd/core/htmlfilter.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../pikotools/convert/misc.h
@@ -110,6 +108,108 @@ init.o: ../../../../pikotools/space/spacetojson.h
 init.o: ../../../../ezc/src/outstreams.h
 init.o: ../../../../winix/winixd/core/winixmodel.h
 init.o: ../../../../winix/winixd/core/plugin.h
+init.o: ../../../../winix/winixd/templates/templates.h
+init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
+init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/pattern.h
+init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
+init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/expressionparser.h
+init.o: ../../../../ezc/src/patternparser.h
+init.o: ../../../../winix/winixd/templates/patterncacher.h
+init.o: ../../../../winix/winixd/templates/indexpatterns.h
+init.o: ../../../../winix/winixd/templates/patterns.h
+init.o: ../../../../winix/winixd/templates/locale.h
+init.o: ../../../../winix/winixd/templates/localefilter.h
+init.o: ../../../../winix/winixd/templates/changepatterns.h
+init.o: ../../../../winix/winixd/templates/htmltextstream.h
+init.o: ../../../../winix/winixd/core/cur.h
+init.o: ../../../../winix/winixd/core/session.h
+init.o: ../../../../winix/winixd/core/user.h
+init.o: ../../../../winix/winixd/core/rebus.h
+init.o: ../../../../winix/winixd/core/ipban.h
+init.o: ../../../../winix/winixd/core/mount.h
+init.o: ../../../../winix/winixd/core/system.h
+init.o: ../../../../winix/winixd/core/job.h
+init.o: ../../../../winix/winixd/core/basethread.h
+init.o: ../../../../winix/winixd/core/dirs.h
+init.o: ../../../../winix/winixd/core/mounts.h
+init.o: ../../../../winix/winixd/core/mountparser.h
+init.o: ../../../../winix/winixd/core/crypt.h
+init.o: ../../../../winix/winixd/core/run.h
+init.o: ../../../../winix/winixd/core/users.h
+init.o: ../../../../winix/winixd/core/ugcontainer.h
+init.o: ../../../../winix/winixd/core/lastcontainer.h
+init.o: ../../../../winix/winixd/core/cur.h
+init.o: ../../../../winix/winixd/core/groups.h
+init.o: ../../../../winix/winixd/core/group.h
+init.o: ../../../../winix/winixd/core/loadavg.h
+init.o: ../../../../winix/winixd/core/image.h
+init.o: ../../../../winix/winixd/core/threadmanager.h
+init.o: ../../../../winix/winixd/notify/notify.h
+init.o: ../../../../winix/winixd/notify/notifypool.h
+init.o: ../../../../winix/winixd/templates/locale.h
+init.o: ../../../../winix/winixd/templates/patterns.h
+init.o: ../../../../winix/winixd/notify/notifythread.h
+init.o: ../../../../winix/winixd/core/basethread.h
+init.o: ../../../../winix/winixd/notify/templatesnotify.h
+init.o: ../../../../winix/winixd/core/users.h
+init.o: ../../../../winix/winixd/core/winixmodel.h
+init.o: ../../../../winix/winixd/core/timezones.h
+init.o: ../../../../winix/winixd/core/timezone.h
+init.o: ../../../../winix/winixd/core/sessionmanager.h
+init.o: ../../../../winix/winixd/core/sessioncontainer.h
+init.o: ../../../../winix/winixd/core/ipbancontainer.h
+init.o: ../../../../winix/winixd/core/system.h
+init.o: ../../../../winix/winixd/core/sessionidmanager.h
+init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
+init.o: ../../../../winix/winixd/core/htmlfilter.h
+init.o: ../../../../winix/winixd/core/winixrequest.h
+init.o: ../../../../winix/winixd/core/winixsystem.h
+init.o: ../../../../winix/winixd/core/slog.h
+init.o: ../../../../winix/winixd/functions/functions.h
+init.o: ../../../../winix/winixd/functions/functionbase.h
+init.o: ../../../../winix/winixd/core/request.h
+init.o: ../../../../winix/winixd/functions/functionparser.h
+init.o: ../../../../winix/winixd/functions/account.h
+init.o: ../../../../winix/winixd/functions/adduser.h
+init.o: ../../../../winix/winixd/functions/cat.h
+init.o: ../../../../winix/winixd/functions/chmod.h
+init.o: ../../../../winix/winixd/functions/privchanger.h
+init.o: ../../../../winix/winixd/functions/chown.h
+init.o: ../../../../winix/winixd/functions/ckeditor.h
+init.o: ../../../../winix/winixd/functions/cp.h
+init.o: ../../../../winix/winixd/functions/default.h
+init.o: ../../../../winix/winixd/functions/download.h
+init.o: ../../../../winix/winixd/functions/emacs.h
+init.o: ../../../../winix/winixd/functions/env.h
+init.o: ../../../../winix/winixd/functions/imgcrop.h
+init.o: ../../../../winix/winixd/functions/last.h
+init.o: ../../../../winix/winixd/functions/login.h
+init.o: ../../../../winix/winixd/functions/logout.h
+init.o: ../../../../winix/winixd/functions/ln.h
+init.o: ../../../../winix/winixd/functions/ls.h
+init.o: ../../../../winix/winixd/functions/man.h
+init.o: ../../../../winix/winixd/functions/meta.h
+init.o: ../../../../winix/winixd/functions/mkdir.h
+init.o: ../../../../winix/winixd/functions/mv.h
+init.o: ../../../../winix/winixd/functions/nicedit.h
+init.o: ../../../../winix/winixd/functions/node.h
+init.o: ../../../../winix/winixd/functions/passwd.h
+init.o: ../../../../winix/winixd/functions/priv.h
+init.o: ../../../../winix/winixd/functions/pw.h
+init.o: ../../../../winix/winixd/functions/reload.h
+init.o: ../../../../winix/winixd/functions/rm.h
+init.o: ../../../../winix/winixd/functions/rmuser.h
+init.o: ../../../../winix/winixd/functions/sort.h
+init.o: ../../../../winix/winixd/functions/specialdefault.h
+init.o: ../../../../winix/winixd/functions/stat.h
+init.o: ../../../../winix/winixd/functions/subject.h
+init.o: ../../../../winix/winixd/functions/template.h
+init.o: ../../../../winix/winixd/functions/tinymce.h
+init.o: ../../../../winix/winixd/functions/uname.h
+init.o: ../../../../winix/winixd/functions/upload.h
+init.o: ../../../../winix/winixd/functions/uptime.h
+init.o: ../../../../winix/winixd/functions/who.h
+init.o: ../../../../winix/winixd/functions/vim.h
 templates.o: ../../../../winix/winixd/templates/templates.h
 templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
 templates.o: ../../../../ezc/src/blocks.h
@@ -129,7 +229,6 @@ templates.o: ../../../../winix/winixd/core/winixbase.h
 templates.o: ../../../../winix/winixd/core/config.h
 templates.o: ../../../../pikotools/space/spaceparser.h
 templates.o: ../../../../pikotools/space/space.h
-templates.o: ../../../../winix/winixd/core/htmlfilter.h
 templates.o: ../../../../winix/winixd/core/log.h
 templates.o: ../../../../winix/winixd/core/textstream.h
 templates.o: ../../../../pikotools/textstream/textstream.h
@@ -219,6 +318,9 @@ templates.o: ../../../../winix/winixd/core/system.h
 templates.o: ../../../../winix/winixd/core/sessionidmanager.h
 templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 templates.o: ../../../../winix/winixd/core/htmlfilter.h
+templates.o: ../../../../winix/winixd/core/winixrequest.h
+templates.o: ../../../../winix/winixd/core/winixsystem.h
+templates.o: ../../../../winix/winixd/core/slog.h
 templates.o: ../../../../winix/winixd/core/plugin.h
 templates.o: ../../../../winix/winixd/core/misc.h
 templates.o: ../../../../winix/winixd/core/winix_const.h
diff --git a/winixd/plugins/menu/init.cpp b/winixd/plugins/menu/init.cpp
index f946fe0..49e8f82 100644
--- a/winixd/plugins/menu/init.cpp
+++ b/winixd/plugins/menu/init.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2014, Tomasz Sowa
+ * Copyright (c) 2011-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,9 @@
 #include "core/log.h"
 #include "core/plugin.h"
 #include "cache.h"
+#include "templates/templates.h"
+#include "functions/functions.h"
+
 
 namespace Winix
 {
diff --git a/winixd/plugins/stats/Makefile.dep b/winixd/plugins/stats/Makefile.dep
index 8cfee36..8cab5e6 100644
--- a/winixd/plugins/stats/Makefile.dep
+++ b/winixd/plugins/stats/Makefile.dep
@@ -26,7 +26,6 @@ init.o: ../../../../winix/winixd/core/error.h
 init.o: ../../../../winix/winixd/core/config.h
 init.o: ../../../../pikotools/space/spaceparser.h
 init.o: ../../../../pikotools/space/space.h
-init.o: ../../../../winix/winixd/core/htmlfilter.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/templates/htmltextstream.h
 init.o: ../../../../winix/winixd/core/textstream.h
diff --git a/winixd/plugins/stats/init.cpp b/winixd/plugins/stats/init.cpp
index 6153470..c5b2949 100644
--- a/winixd/plugins/stats/init.cpp
+++ b/winixd/plugins/stats/init.cpp
@@ -234,7 +234,7 @@ using namespace Stats;
 	info.plugin->Assign(WINIX_FILE_REMOVED,					RemoveFile);
 	info.plugin->Assign(WINIX_DIR_PREPARE_TO_REMOVE,		RemoveDir);
 
-	stats.set_dependency(reinterpret_cast<WinixModel*>(info.winix_system));
+	info.set_dependency_for(stats);
 	stats.ReadConfig(info.config);
 	stats.ReadStats();
 
diff --git a/winixd/plugins/thread/Makefile.dep b/winixd/plugins/thread/Makefile.dep
index 905e203..9df2fed 100644
--- a/winixd/plugins/thread/Makefile.dep
+++ b/winixd/plugins/thread/Makefile.dep
@@ -24,7 +24,6 @@ createthread.o: ../../../../winix/winixd/core/winixbase.h
 createthread.o: ../../../../winix/winixd/core/config.h
 createthread.o: ../../../../pikotools/space/spaceparser.h
 createthread.o: ../../../../pikotools/space/space.h
-createthread.o: ../../../../winix/winixd/core/htmlfilter.h
 createthread.o: ../../../../winix/winixd/core/log.h
 createthread.o: ../../../../winix/winixd/core/textstream.h
 createthread.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -179,7 +178,6 @@ funthread.o: ../../../../winix/winixd/core/winixbase.h
 funthread.o: ../../../../winix/winixd/core/config.h
 funthread.o: ../../../../pikotools/space/spaceparser.h
 funthread.o: ../../../../pikotools/space/space.h
-funthread.o: ../../../../winix/winixd/core/htmlfilter.h
 funthread.o: ../../../../winix/winixd/core/log.h
 funthread.o: ../../../../winix/winixd/core/textstream.h
 funthread.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -284,7 +282,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
 init.o: ../../../../winix/winixd/core/config.h
 init.o: ../../../../pikotools/space/spaceparser.h
 init.o: ../../../../pikotools/space/space.h
-init.o: ../../../../winix/winixd/core/htmlfilter.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -365,10 +362,54 @@ init.o: ../../../../winix/winixd/core/system.h
 init.o: ../../../../winix/winixd/core/sessionidmanager.h
 init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 init.o: ../../../../winix/winixd/core/slog.h threadinfo.h funthread.h
-init.o: createthread.h showthreads.h ../../../../winix/winixd/core/plugin.h
-init.o: templates.h
-reply.o: ../../../../winix/winixd/core/plugin.h reply.h
-reply.o: ../../../../winix/winixd/functions/functionbase.h
+init.o: createthread.h showthreads.h templates.h
+init.o: ../../../../winix/winixd/core/plugin.h
+init.o: ../../../../winix/winixd/functions/functions.h
+init.o: ../../../../winix/winixd/functions/functionbase.h
+init.o: ../../../../winix/winixd/functions/functionparser.h
+init.o: ../../../../winix/winixd/functions/account.h
+init.o: ../../../../winix/winixd/functions/adduser.h
+init.o: ../../../../winix/winixd/functions/cat.h
+init.o: ../../../../winix/winixd/functions/chmod.h
+init.o: ../../../../winix/winixd/functions/privchanger.h
+init.o: ../../../../winix/winixd/functions/chown.h
+init.o: ../../../../winix/winixd/functions/ckeditor.h
+init.o: ../../../../winix/winixd/functions/cp.h
+init.o: ../../../../winix/winixd/functions/default.h
+init.o: ../../../../winix/winixd/functions/download.h
+init.o: ../../../../winix/winixd/functions/emacs.h
+init.o: ../../../../winix/winixd/functions/env.h
+init.o: ../../../../winix/winixd/functions/imgcrop.h
+init.o: ../../../../winix/winixd/functions/last.h
+init.o: ../../../../winix/winixd/functions/login.h
+init.o: ../../../../winix/winixd/functions/logout.h
+init.o: ../../../../winix/winixd/functions/ln.h
+init.o: ../../../../winix/winixd/functions/ls.h
+init.o: ../../../../winix/winixd/functions/man.h
+init.o: ../../../../winix/winixd/functions/meta.h
+init.o: ../../../../winix/winixd/functions/mkdir.h
+init.o: ../../../../winix/winixd/functions/mv.h
+init.o: ../../../../winix/winixd/functions/nicedit.h
+init.o: ../../../../winix/winixd/functions/node.h
+init.o: ../../../../winix/winixd/functions/passwd.h
+init.o: ../../../../winix/winixd/functions/priv.h
+init.o: ../../../../winix/winixd/functions/pw.h
+init.o: ../../../../winix/winixd/functions/reload.h
+init.o: ../../../../winix/winixd/functions/rm.h
+init.o: ../../../../winix/winixd/functions/rmuser.h
+init.o: ../../../../winix/winixd/functions/sort.h
+init.o: ../../../../winix/winixd/functions/specialdefault.h
+init.o: ../../../../winix/winixd/functions/stat.h
+init.o: ../../../../winix/winixd/functions/subject.h
+init.o: ../../../../winix/winixd/functions/template.h
+init.o: ../../../../winix/winixd/functions/tinymce.h
+init.o: ../../../../winix/winixd/functions/uname.h
+init.o: ../../../../winix/winixd/functions/upload.h
+init.o: ../../../../winix/winixd/functions/uptime.h
+init.o: ../../../../winix/winixd/functions/who.h
+init.o: ../../../../winix/winixd/functions/vim.h
+init.o: ../../../../winix/winixd/core/htmlfilter.h
+reply.o: reply.h ../../../../winix/winixd/functions/functionbase.h
 reply.o: ../../../../winix/winixd/core/item.h
 reply.o: ../../../../pikotools/space/space.h
 reply.o: ../../../../pikotools/textstream/types.h
@@ -391,7 +432,6 @@ reply.o: ../../../../winix/winixd/core/winixbase.h
 reply.o: ../../../../winix/winixd/core/config.h
 reply.o: ../../../../pikotools/space/spaceparser.h
 reply.o: ../../../../pikotools/space/space.h
-reply.o: ../../../../winix/winixd/core/htmlfilter.h
 reply.o: ../../../../winix/winixd/core/log.h
 reply.o: ../../../../winix/winixd/core/textstream.h
 reply.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -545,7 +585,6 @@ showthreads.o: ../../../../winix/winixd/core/winixbase.h
 showthreads.o: ../../../../winix/winixd/core/config.h
 showthreads.o: ../../../../pikotools/space/spaceparser.h
 showthreads.o: ../../../../pikotools/space/space.h
-showthreads.o: ../../../../winix/winixd/core/htmlfilter.h
 showthreads.o: ../../../../winix/winixd/core/log.h
 showthreads.o: ../../../../winix/winixd/core/textstream.h
 showthreads.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -655,7 +694,6 @@ templates.o: ../../../../winix/winixd/core/winixbase.h
 templates.o: ../../../../winix/winixd/core/config.h
 templates.o: ../../../../pikotools/space/spaceparser.h
 templates.o: ../../../../pikotools/space/space.h
-templates.o: ../../../../winix/winixd/core/htmlfilter.h
 templates.o: ../../../../winix/winixd/core/log.h
 templates.o: ../../../../winix/winixd/core/textstream.h
 templates.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -815,7 +853,6 @@ threadinfo.o: ../../../../winix/winixd/core/winixbase.h
 threadinfo.o: ../../../../winix/winixd/core/config.h
 threadinfo.o: ../../../../pikotools/space/spaceparser.h
 threadinfo.o: ../../../../pikotools/space/space.h
-threadinfo.o: ../../../../winix/winixd/core/htmlfilter.h
 threadinfo.o: ../../../../winix/winixd/core/log.h
 threadinfo.o: ../../../../winix/winixd/core/textstream.h
 threadinfo.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -888,4 +925,3 @@ threadinfo.o: ../../../../winix/winixd/core/winixmodel.h
 threadinfo.o: ../../../../winix/winixd/core/timezones.h
 threadinfo.o: ../../../../winix/winixd/core/timezone.h thread.h tdb.h
 threadinfo.o: ../../../../winix/winixd/db/dbbase.h
-threadinfo.o: ../../../../winix/winixd/core/plugin.h
diff --git a/winixd/plugins/thread/init.cpp b/winixd/plugins/thread/init.cpp
index 89183cb..6b37f1e 100644
--- a/winixd/plugins/thread/init.cpp
+++ b/winixd/plugins/thread/init.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -38,9 +38,11 @@
 #include "createthread.h"
 #include "showthreads.h"
 #include "core/log.h"
-#include "core/plugin.h"
 #include "pluginmsg.h"
 #include "templates.h"
+#include "functions/functions.h"
+
+
 
 namespace Winix
 {
@@ -124,7 +126,7 @@ void SetSortTab(PluginInfo & info)
 {
 	if( !info.p1 )
 	{
-		log << log1 << "Thread: sort_tab pointer is not set" << logend;
+		info.log << log1 << "Thread: sort_tab pointer is not set" << logend;
 		return;
 	}
 
@@ -168,9 +170,9 @@ void Rescan(PluginInfo & info)
 {
 	if( info.config->Bool(L"thread_rescan", false) == true )
 	{
-		log << log1 << "----------  rescanning thread db ------------- " << logend;
+		info.log << log1 << "----------  rescanning thread db ------------- " << logend;
 		thread_info.Repair();
-		log << log1 << "----------  thread db rescanning is finished ------------- " << logend;
+		info.log << log1 << "----------  thread db rescanning is finished ------------- " << logend;
 	}
 }
 
@@ -185,27 +187,29 @@ void Init(PluginInfo & info)
 {
 using namespace Thread;
 
-	plugin.Assign(WINIX_CREATE_FUNCTIONS,			 AddFunctions);
-	plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION,	 SelectDefaultFunction);
-	plugin.Assign(WINIX_ADD_MOUNTS,					 AddMounts);
-	plugin.Assign(WINIX_FILE_REMOVED,				 RemoveThread);
-	plugin.Assign(WINIX_NOTIFY_ADD_TEMPLATE,		 AddNotifyTemplate);
-	plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS,	 AddEzcFunctions);
-	plugin.Assign(WINIX_END_REQUEST,                 EndRequest);
+	info.plugin->Assign(WINIX_CREATE_FUNCTIONS,				AddFunctions);
+	info.plugin->Assign(WINIX_SELECT_DEFAULT_FUNCTION,		SelectDefaultFunction);
+	info.plugin->Assign(WINIX_ADD_MOUNTS,					AddMounts);
+	info.plugin->Assign(WINIX_FILE_REMOVED,					RemoveThread);
+	info.plugin->Assign(WINIX_NOTIFY_ADD_TEMPLATE,			AddNotifyTemplate);
+	info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS,	AddEzcFunctions);
+	info.plugin->Assign(WINIX_END_REQUEST,					EndRequest);
 
 	// for other plugins
-	plugin.Assign(WINIX_PL_THREAD_SET_SORTTAB,       SetSortTab);
-	plugin.Assign(WINIX_PL_THREAD_READ_THREADS,      ReadThreads);
-	plugin.Assign(WINIX_PL_THREAD_SET_SORTTAB_INDEX, SetSortTabIndex);
-	plugin.Assign(WINIX_PL_THREAD_PREPARE_THREAD,    PrepareThread);
+	info.plugin->Assign(WINIX_PL_THREAD_SET_SORTTAB,		SetSortTab);
+	info.plugin->Assign(WINIX_PL_THREAD_READ_THREADS,		ReadThreads);
+	info.plugin->Assign(WINIX_PL_THREAD_SET_SORTTAB_INDEX,	SetSortTabIndex);
+	info.plugin->Assign(WINIX_PL_THREAD_PREPARE_THREAD,		PrepareThread);
 
 	// temporarily
-	plugin.Assign(WINIX_PLUGIN_INIT, Rescan);
+	info.plugin->Assign(WINIX_PLUGIN_INIT, Rescan);
 
 	tdb.SetConn(info.db->GetConn());
 	tdb.LogQueries(info.config->log_db_query);
 
 	// thread_info and fun_show_threads are used in 'ticket' plugins too
+	info.set_dependency_for(thread_info);
+
 	thread_info.SetDb(info.db);
 	thread_info.SetTDb(&tdb);
 	thread_info.SetSystem(info.system);
diff --git a/winixd/plugins/thread/reply.cpp b/winixd/plugins/thread/reply.cpp
index 4b89984..9776e79 100644
--- a/winixd/plugins/thread/reply.cpp
+++ b/winixd/plugins/thread/reply.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -32,11 +32,9 @@
  * 
  */
 
-#include "core/plugin.h"
 #include "reply.h"
 #include "functions/functions.h"
 #include "core/misc.h"
-#include "core/plugin.h"
 #include "pluginmsg.h"
 
 namespace Winix
@@ -135,7 +133,7 @@ void Reply::MakePost()
 	if( functions->CheckAbuse() )
 		return;
 
-	plugin.Call(WINIX_PL_THREAD_PREPARE_TO_REPLY_IN_THREAD, &answer);
+	plugin->Call(WINIX_PL_THREAD_PREPARE_TO_REPLY_IN_THREAD, &answer);
 
 	cur->request->status = system->AddFile(answer);
 
diff --git a/winixd/plugins/thread/threadinfo.cpp b/winixd/plugins/thread/threadinfo.cpp
index 2ede5fc..816a0a9 100644
--- a/winixd/plugins/thread/threadinfo.cpp
+++ b/winixd/plugins/thread/threadinfo.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,9 @@
  */
  
 #include "threadinfo.h"
-#include "core/plugin.h"
 #include "pluginmsg.h"
 
+
 namespace Winix
 {
 
@@ -74,7 +74,7 @@ void ThreadInfo::Clear()
 Item * ThreadInfo::FindThreadDir()
 {
 	Item * plugin_dir = 0;
-	plugin.Call(WINIX_PL_THREAD_SEARCH_THREAD_DIR, &plugin_dir);
+	plugin->Call(WINIX_PL_THREAD_SEARCH_THREAD_DIR, &plugin_dir);
 
 	if( plugin_dir )
 		return plugin_dir;
@@ -171,7 +171,7 @@ void ThreadInfo::Repair()
 
 void ThreadInfo::MakeRedirectIfPossible(const Item & item)
 {
-	PluginRes res = plugin.Call(WINIX_PL_THREAD_CAN_MAKE_REDIRECT);
+	PluginRes res = plugin->Call(WINIX_PL_THREAD_CAN_MAKE_REDIRECT);
 
 	if( res.res_false > 0 )
 	{
diff --git a/winixd/plugins/thread/threadinfo.h b/winixd/plugins/thread/threadinfo.h
index 87971f0..f1036a3 100644
--- a/winixd/plugins/thread/threadinfo.h
+++ b/winixd/plugins/thread/threadinfo.h
@@ -41,6 +41,9 @@
 #include "db/db.h"
 #include "thread.h"
 #include "tdb.h"
+#include "core/winixmodel.h"
+
+
 
 namespace Winix
 {
@@ -49,7 +52,7 @@ namespace Winix
 namespace Thread
 {
 
-class ThreadInfo
+class ThreadInfo : public WinixModel
 {
 public:
 
diff --git a/winixd/plugins/ticket/Makefile.dep b/winixd/plugins/ticket/Makefile.dep
index bc8f519..d500632 100644
--- a/winixd/plugins/ticket/Makefile.dep
+++ b/winixd/plugins/ticket/Makefile.dep
@@ -1,18 +1,14 @@
 # DO NOT DELETE
 
-createticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
-createticket.o: ../../../../winix/winixd/core/plugindata.h
-createticket.o: ../../../../winix/winixd/core/winixbase.h
-createticket.o: ../../../../winix/winixd/core/config.h
-createticket.o: ../../../../pikotools/space/spaceparser.h
-createticket.o: ../../../../pikotools/space/space.h
-createticket.o: ../../../../pikotools/textstream/types.h
-createticket.o: ../../../../winix/winixd/core/htmlfilter.h
-createticket.o: ../../../../winix/winixd/core/log.h
+createticket.o: createticket.h tdb.h ticket.h
+createticket.o: ../../../../winix/winixd/db/dbbase.h
+createticket.o: ../../../../winix/winixd/db/dbconn.h
+createticket.o: ../../../../winix/winixd/db/dbtextstream.h
 createticket.o: ../../../../winix/winixd/core/textstream.h
 createticket.o: ../../../../winix/winixd/core/misc.h
 createticket.o: ../../../../winix/winixd/core/item.h
 createticket.o: ../../../../pikotools/space/space.h
+createticket.o: ../../../../pikotools/textstream/types.h
 createticket.o: ../../../../pikotools/date/date.h
 createticket.o: ../../../../pikotools/convert/convert.h
 createticket.o: ../../../../pikotools/convert/inttostr.h
@@ -24,18 +20,19 @@ createticket.o: ../../../../pikotools/membuffer/membuffer.h
 createticket.o: ../../../../pikotools/textstream/types.h
 createticket.o: ../../../../pikotools/utf8/utf8.h
 createticket.o: ../../../../winix/winixd/core/winix_const.h
+createticket.o: ../../../../winix/winixd/core/winixbase.h
+createticket.o: ../../../../winix/winixd/core/config.h
+createticket.o: ../../../../pikotools/space/spaceparser.h
+createticket.o: ../../../../pikotools/space/space.h
+createticket.o: ../../../../winix/winixd/core/log.h
+createticket.o: ../../../../winix/winixd/core/textstream.h
 createticket.o: ../../../../winix/winixd/core/logmanipulators.h
 createticket.o: ../../../../winix/winixd/core/filelog.h
 createticket.o: ../../../../winix/winixd/core/synchro.h
 createticket.o: ../../../../winix/winixd/core/log.h
 createticket.o: ../../../../winix/winixd/core/filelog.h
 createticket.o: ../../../../winix/winixd/core/lock.h
-createticket.o: ../../../../winix/winixd/core/synchro.h createticket.h tdb.h
-createticket.o: ticket.h ../../../../winix/winixd/db/dbbase.h
-createticket.o: ../../../../winix/winixd/db/dbconn.h
-createticket.o: ../../../../winix/winixd/db/dbtextstream.h
-createticket.o: ../../../../winix/winixd/core/textstream.h
-createticket.o: ../../../../winix/winixd/core/winixbase.h
+createticket.o: ../../../../winix/winixd/core/synchro.h
 createticket.o: ../../../../winix/winixd/core/error.h
 createticket.o: ../../../../winix/winixd/functions/functionbase.h
 createticket.o: ../../../../winix/winixd/core/item.h
@@ -46,6 +43,7 @@ createticket.o: ../../../../winix/winixd/db/dbitemcolumns.h
 createticket.o: ../../../../winix/winixd/core/user.h
 createticket.o: ../../../../winix/winixd/core/group.h
 createticket.o: ../../../../winix/winixd/core/dircontainer.h
+createticket.o: ../../../../winix/winixd/core/winixbase.h
 createticket.o: ../../../../winix/winixd/core/ugcontainer.h
 createticket.o: ../../../../winix/winixd/core/request.h
 createticket.o: ../../../../winix/winixd/core/error.h
@@ -57,7 +55,8 @@ createticket.o: ../../../../winix/winixd/core/system.h
 createticket.o: ../../../../winix/winixd/core/job.h
 createticket.o: ../../../../winix/winixd/core/basethread.h
 createticket.o: ../../../../winix/winixd/core/winixmodel.h
-createticket.o: ../../../../winix/winixd/core/plugin.h
+createticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
+createticket.o: ../../../../winix/winixd/core/plugindata.h
 createticket.o: ../../../../winix/winixd/core/dirs.h
 createticket.o: ../../../../winix/winixd/core/dircontainer.h
 createticket.o: ../../../../winix/winixd/core/request.h
@@ -160,32 +159,43 @@ editticket.o: ../../../../winix/winixd/db/dbbase.h
 editticket.o: ../../../../winix/winixd/db/dbconn.h
 editticket.o: ../../../../winix/winixd/db/dbtextstream.h
 editticket.o: ../../../../winix/winixd/core/textstream.h
-editticket.o: ../../../../pikotools/textstream/textstream.h
+editticket.o: ../../../../winix/winixd/core/misc.h
+editticket.o: ../../../../winix/winixd/core/item.h
 editticket.o: ../../../../pikotools/space/space.h
+editticket.o: ../../../../pikotools/textstream/types.h
 editticket.o: ../../../../pikotools/date/date.h
 editticket.o: ../../../../pikotools/convert/convert.h
 editticket.o: ../../../../pikotools/convert/inttostr.h
 editticket.o: ../../../../pikotools/convert/strtoint.h
 editticket.o: ../../../../pikotools/convert/text.h
-editticket.o: ../../../../winix/winixd/core/misc.h
-editticket.o: ../../../../winix/winixd/core/item.h
 editticket.o: ../../../../winix/winixd/core/requesttypes.h
-editticket.o: ../../../../pikotools/utf8/utf8.h
-editticket.o: ../../../../winix/winixd/core/winix_const.h
+editticket.o: ../../../../pikotools/textstream/textstream.h
 editticket.o: ../../../../pikotools/membuffer/membuffer.h
 editticket.o: ../../../../pikotools/textstream/types.h
+editticket.o: ../../../../pikotools/utf8/utf8.h
+editticket.o: ../../../../winix/winixd/core/winix_const.h
 editticket.o: ../../../../winix/winixd/core/winixbase.h
-editticket.o: ../../../../winix/winixd/core/error.h
+editticket.o: ../../../../winix/winixd/core/config.h
 editticket.o: ../../../../pikotools/space/spaceparser.h
 editticket.o: ../../../../pikotools/space/space.h
-editticket.o: ../../../../pikotools/textstream/types.h ticketinfo.h
+editticket.o: ../../../../winix/winixd/core/log.h
+editticket.o: ../../../../winix/winixd/core/textstream.h
+editticket.o: ../../../../winix/winixd/core/logmanipulators.h
+editticket.o: ../../../../winix/winixd/core/filelog.h
+editticket.o: ../../../../winix/winixd/core/synchro.h
+editticket.o: ../../../../winix/winixd/core/log.h
+editticket.o: ../../../../winix/winixd/core/filelog.h
+editticket.o: ../../../../winix/winixd/core/lock.h
+editticket.o: ../../../../winix/winixd/core/synchro.h
+editticket.o: ../../../../winix/winixd/core/error.h ticketinfo.h
 editticket.o: ../../../../winix/winixd/core/item.h
 editticket.o: ../../../../winix/winixd/core/system.h
 editticket.o: ../../../../winix/winixd/core/job.h
 editticket.o: ../../../../winix/winixd/core/basethread.h
-editticket.o: ../../../../winix/winixd/core/synchro.h
 editticket.o: ../../../../winix/winixd/core/winixmodel.h
-editticket.o: ../../../../winix/winixd/core/plugin.h
+editticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
+editticket.o: ../../../../winix/winixd/core/plugindata.h
+editticket.o: ../../../../winix/winixd/core/winixbase.h
 editticket.o: ../../../../winix/winixd/core/dirs.h
 editticket.o: ../../../../winix/winixd/core/dircontainer.h
 editticket.o: ../../../../winix/winixd/db/db.h
@@ -195,17 +205,6 @@ editticket.o: ../../../../winix/winixd/db/dbitemcolumns.h
 editticket.o: ../../../../winix/winixd/core/user.h
 editticket.o: ../../../../winix/winixd/core/group.h
 editticket.o: ../../../../winix/winixd/core/dircontainer.h
-editticket.o: ../../../../winix/winixd/core/winixbase.h
-editticket.o: ../../../../winix/winixd/core/config.h
-editticket.o: ../../../../winix/winixd/core/htmlfilter.h
-editticket.o: ../../../../winix/winixd/core/log.h
-editticket.o: ../../../../winix/winixd/core/textstream.h
-editticket.o: ../../../../winix/winixd/core/logmanipulators.h
-editticket.o: ../../../../winix/winixd/core/filelog.h
-editticket.o: ../../../../winix/winixd/core/synchro.h
-editticket.o: ../../../../winix/winixd/core/log.h
-editticket.o: ../../../../winix/winixd/core/filelog.h
-editticket.o: ../../../../winix/winixd/core/lock.h
 editticket.o: ../../../../winix/winixd/core/ugcontainer.h
 editticket.o: ../../../../winix/winixd/core/request.h
 editticket.o: ../../../../winix/winixd/core/mounts.h
@@ -221,7 +220,6 @@ editticket.o: ../../../../winix/winixd/core/ugcontainer.h
 editticket.o: ../../../../winix/winixd/core/lastcontainer.h
 editticket.o: ../../../../winix/winixd/core/cur.h
 editticket.o: ../../../../winix/winixd/core/session.h
-editticket.o: ../../../../winix/winixd/core/plugindata.h
 editticket.o: ../../../../winix/winixd/core/rebus.h
 editticket.o: ../../../../winix/winixd/core/ipban.h
 editticket.o: ../../../../winix/winixd/core/groups.h
@@ -310,37 +308,47 @@ editticket.o: ../../../../winix/winixd/core/slog.h
 editticket.o: ../../../../winix/winixd/functions/functionbase.h sessiondata.h
 editticket.o: ../../../../winix/winixd/core/plugindata.h
 editticket.o: ../../../../winix/winixd/functions/rm.h
-editticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
 funticket.o: funticket.h tdb.h ticket.h ../../../../winix/winixd/db/dbbase.h
 funticket.o: ../../../../winix/winixd/db/dbconn.h
 funticket.o: ../../../../winix/winixd/db/dbtextstream.h
 funticket.o: ../../../../winix/winixd/core/textstream.h
-funticket.o: ../../../../pikotools/textstream/textstream.h
+funticket.o: ../../../../winix/winixd/core/misc.h
+funticket.o: ../../../../winix/winixd/core/item.h
 funticket.o: ../../../../pikotools/space/space.h
+funticket.o: ../../../../pikotools/textstream/types.h
 funticket.o: ../../../../pikotools/date/date.h
 funticket.o: ../../../../pikotools/convert/convert.h
 funticket.o: ../../../../pikotools/convert/inttostr.h
 funticket.o: ../../../../pikotools/convert/strtoint.h
 funticket.o: ../../../../pikotools/convert/text.h
-funticket.o: ../../../../winix/winixd/core/misc.h
-funticket.o: ../../../../winix/winixd/core/item.h
 funticket.o: ../../../../winix/winixd/core/requesttypes.h
-funticket.o: ../../../../pikotools/utf8/utf8.h
-funticket.o: ../../../../winix/winixd/core/winix_const.h
+funticket.o: ../../../../pikotools/textstream/textstream.h
 funticket.o: ../../../../pikotools/membuffer/membuffer.h
 funticket.o: ../../../../pikotools/textstream/types.h
+funticket.o: ../../../../pikotools/utf8/utf8.h
+funticket.o: ../../../../winix/winixd/core/winix_const.h
 funticket.o: ../../../../winix/winixd/core/winixbase.h
-funticket.o: ../../../../winix/winixd/core/error.h
+funticket.o: ../../../../winix/winixd/core/config.h
 funticket.o: ../../../../pikotools/space/spaceparser.h
 funticket.o: ../../../../pikotools/space/space.h
-funticket.o: ../../../../pikotools/textstream/types.h ticketinfo.h
+funticket.o: ../../../../winix/winixd/core/log.h
+funticket.o: ../../../../winix/winixd/core/textstream.h
+funticket.o: ../../../../winix/winixd/core/logmanipulators.h
+funticket.o: ../../../../winix/winixd/core/filelog.h
+funticket.o: ../../../../winix/winixd/core/synchro.h
+funticket.o: ../../../../winix/winixd/core/log.h
+funticket.o: ../../../../winix/winixd/core/filelog.h
+funticket.o: ../../../../winix/winixd/core/lock.h
+funticket.o: ../../../../winix/winixd/core/synchro.h
+funticket.o: ../../../../winix/winixd/core/error.h ticketinfo.h
 funticket.o: ../../../../winix/winixd/core/item.h
 funticket.o: ../../../../winix/winixd/core/system.h
 funticket.o: ../../../../winix/winixd/core/job.h
 funticket.o: ../../../../winix/winixd/core/basethread.h
-funticket.o: ../../../../winix/winixd/core/synchro.h
 funticket.o: ../../../../winix/winixd/core/winixmodel.h
-funticket.o: ../../../../winix/winixd/core/plugin.h
+funticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
+funticket.o: ../../../../winix/winixd/core/plugindata.h
+funticket.o: ../../../../winix/winixd/core/winixbase.h
 funticket.o: ../../../../winix/winixd/core/dirs.h
 funticket.o: ../../../../winix/winixd/core/dircontainer.h
 funticket.o: ../../../../winix/winixd/db/db.h
@@ -350,17 +358,6 @@ funticket.o: ../../../../winix/winixd/db/dbitemcolumns.h
 funticket.o: ../../../../winix/winixd/core/user.h
 funticket.o: ../../../../winix/winixd/core/group.h
 funticket.o: ../../../../winix/winixd/core/dircontainer.h
-funticket.o: ../../../../winix/winixd/core/winixbase.h
-funticket.o: ../../../../winix/winixd/core/config.h
-funticket.o: ../../../../winix/winixd/core/htmlfilter.h
-funticket.o: ../../../../winix/winixd/core/log.h
-funticket.o: ../../../../winix/winixd/core/textstream.h
-funticket.o: ../../../../winix/winixd/core/logmanipulators.h
-funticket.o: ../../../../winix/winixd/core/filelog.h
-funticket.o: ../../../../winix/winixd/core/synchro.h
-funticket.o: ../../../../winix/winixd/core/log.h
-funticket.o: ../../../../winix/winixd/core/filelog.h
-funticket.o: ../../../../winix/winixd/core/lock.h
 funticket.o: ../../../../winix/winixd/core/ugcontainer.h
 funticket.o: ../../../../winix/winixd/core/request.h
 funticket.o: ../../../../winix/winixd/core/mounts.h
@@ -376,7 +373,6 @@ funticket.o: ../../../../winix/winixd/core/ugcontainer.h
 funticket.o: ../../../../winix/winixd/core/lastcontainer.h
 funticket.o: ../../../../winix/winixd/core/cur.h
 funticket.o: ../../../../winix/winixd/core/session.h
-funticket.o: ../../../../winix/winixd/core/plugindata.h
 funticket.o: ../../../../winix/winixd/core/rebus.h
 funticket.o: ../../../../winix/winixd/core/ipban.h
 funticket.o: ../../../../winix/winixd/core/groups.h
@@ -463,48 +459,30 @@ funticket.o: ../../../../winix/winixd/core/sessionidmanager.h
 funticket.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 funticket.o: ../../../../winix/winixd/core/slog.h
 funticket.o: ../../../../winix/winixd/functions/functionbase.h
-funticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
 funticket.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
 init.o: tdb.h ticket.h ../../../../winix/winixd/db/dbbase.h
 init.o: ../../../../winix/winixd/db/dbconn.h
 init.o: ../../../../winix/winixd/db/dbtextstream.h
 init.o: ../../../../winix/winixd/core/textstream.h
-init.o: ../../../../pikotools/textstream/textstream.h
-init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
+init.o: ../../../../winix/winixd/core/misc.h
+init.o: ../../../../winix/winixd/core/item.h
+init.o: ../../../../pikotools/space/space.h
+init.o: ../../../../pikotools/textstream/types.h
+init.o: ../../../../pikotools/date/date.h
 init.o: ../../../../pikotools/convert/convert.h
 init.o: ../../../../pikotools/convert/inttostr.h
 init.o: ../../../../pikotools/convert/strtoint.h
 init.o: ../../../../pikotools/convert/text.h
-init.o: ../../../../winix/winixd/core/misc.h
-init.o: ../../../../winix/winixd/core/item.h
 init.o: ../../../../winix/winixd/core/requesttypes.h
-init.o: ../../../../pikotools/utf8/utf8.h
-init.o: ../../../../winix/winixd/core/winix_const.h
+init.o: ../../../../pikotools/textstream/textstream.h
 init.o: ../../../../pikotools/membuffer/membuffer.h
 init.o: ../../../../pikotools/textstream/types.h
-init.o: ../../../../winix/winixd/core/winixbase.h
-init.o: ../../../../winix/winixd/core/error.h
-init.o: ../../../../pikotools/space/spaceparser.h
-init.o: ../../../../pikotools/space/space.h
-init.o: ../../../../pikotools/textstream/types.h funticket.h ticketinfo.h
-init.o: ../../../../winix/winixd/core/item.h
-init.o: ../../../../winix/winixd/core/system.h
-init.o: ../../../../winix/winixd/core/job.h
-init.o: ../../../../winix/winixd/core/basethread.h
-init.o: ../../../../winix/winixd/core/synchro.h
-init.o: ../../../../winix/winixd/core/winixmodel.h
-init.o: ../../../../winix/winixd/core/plugin.h
-init.o: ../../../../winix/winixd/core/dirs.h
-init.o: ../../../../winix/winixd/core/dircontainer.h
-init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
-init.o: ../../../../winix/winixd/db/dbitemquery.h
-init.o: ../../../../winix/winixd/db/dbitemcolumns.h
-init.o: ../../../../winix/winixd/core/user.h
-init.o: ../../../../winix/winixd/core/group.h
-init.o: ../../../../winix/winixd/core/dircontainer.h
+init.o: ../../../../pikotools/utf8/utf8.h
+init.o: ../../../../winix/winixd/core/winix_const.h
 init.o: ../../../../winix/winixd/core/winixbase.h
 init.o: ../../../../winix/winixd/core/config.h
-init.o: ../../../../winix/winixd/core/htmlfilter.h
+init.o: ../../../../pikotools/space/spaceparser.h
+init.o: ../../../../pikotools/space/space.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -513,6 +491,24 @@ init.o: ../../../../winix/winixd/core/synchro.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/filelog.h
 init.o: ../../../../winix/winixd/core/lock.h
+init.o: ../../../../winix/winixd/core/synchro.h
+init.o: ../../../../winix/winixd/core/error.h funticket.h ticketinfo.h
+init.o: ../../../../winix/winixd/core/item.h
+init.o: ../../../../winix/winixd/core/system.h
+init.o: ../../../../winix/winixd/core/job.h
+init.o: ../../../../winix/winixd/core/basethread.h
+init.o: ../../../../winix/winixd/core/winixmodel.h
+init.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
+init.o: ../../../../winix/winixd/core/plugindata.h
+init.o: ../../../../winix/winixd/core/winixbase.h
+init.o: ../../../../winix/winixd/core/dirs.h
+init.o: ../../../../winix/winixd/core/dircontainer.h
+init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
+init.o: ../../../../winix/winixd/db/dbitemquery.h
+init.o: ../../../../winix/winixd/db/dbitemcolumns.h
+init.o: ../../../../winix/winixd/core/user.h
+init.o: ../../../../winix/winixd/core/group.h
+init.o: ../../../../winix/winixd/core/dircontainer.h
 init.o: ../../../../winix/winixd/core/ugcontainer.h
 init.o: ../../../../winix/winixd/core/request.h
 init.o: ../../../../winix/winixd/core/mounts.h
@@ -528,7 +524,6 @@ init.o: ../../../../winix/winixd/core/ugcontainer.h
 init.o: ../../../../winix/winixd/core/lastcontainer.h
 init.o: ../../../../winix/winixd/core/cur.h
 init.o: ../../../../winix/winixd/core/session.h
-init.o: ../../../../winix/winixd/core/plugindata.h
 init.o: ../../../../winix/winixd/core/rebus.h
 init.o: ../../../../winix/winixd/core/ipban.h
 init.o: ../../../../winix/winixd/core/groups.h
@@ -615,8 +610,8 @@ init.o: ../../../../winix/winixd/core/sessionidmanager.h
 init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 init.o: ../../../../winix/winixd/core/slog.h
 init.o: ../../../../winix/winixd/functions/functionbase.h editticket.h
-init.o: createticket.h showtickets.h ../../../../winix/winixd/core/plugin.h
-init.o: pluginmsg.h sessiondata.h ../../../../winix/winixd/core/plugindata.h
+init.o: createticket.h showtickets.h sessiondata.h
+init.o: ../../../../winix/winixd/core/plugindata.h
 init.o: ../../../../winix/winixd/functions/rm.h
 init.o: ../../../../winix/winixd/plugins/thread/showthreads.h
 init.o: ../../../../winix/winixd/plugins/thread/threadinfo.h
@@ -625,37 +620,49 @@ init.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
 sessiondata.o: sessiondata.h ../../../../winix/winixd/core/plugindata.h
 sessiondata.o: ticket.h ../../../../winix/winixd/functions/rm.h
 sessiondata.o: ../../../../pikotools/space/space.h
+sessiondata.o: ../../../../pikotools/textstream/types.h
 showtickets.o: showtickets.h tdb.h ticket.h
 showtickets.o: ../../../../winix/winixd/db/dbbase.h
 showtickets.o: ../../../../winix/winixd/db/dbconn.h
 showtickets.o: ../../../../winix/winixd/db/dbtextstream.h
 showtickets.o: ../../../../winix/winixd/core/textstream.h
-showtickets.o: ../../../../pikotools/textstream/textstream.h
+showtickets.o: ../../../../winix/winixd/core/misc.h
+showtickets.o: ../../../../winix/winixd/core/item.h
 showtickets.o: ../../../../pikotools/space/space.h
+showtickets.o: ../../../../pikotools/textstream/types.h
 showtickets.o: ../../../../pikotools/date/date.h
 showtickets.o: ../../../../pikotools/convert/convert.h
 showtickets.o: ../../../../pikotools/convert/inttostr.h
 showtickets.o: ../../../../pikotools/convert/strtoint.h
 showtickets.o: ../../../../pikotools/convert/text.h
-showtickets.o: ../../../../winix/winixd/core/misc.h
-showtickets.o: ../../../../winix/winixd/core/item.h
 showtickets.o: ../../../../winix/winixd/core/requesttypes.h
-showtickets.o: ../../../../pikotools/utf8/utf8.h
-showtickets.o: ../../../../winix/winixd/core/winix_const.h
+showtickets.o: ../../../../pikotools/textstream/textstream.h
 showtickets.o: ../../../../pikotools/membuffer/membuffer.h
 showtickets.o: ../../../../pikotools/textstream/types.h
+showtickets.o: ../../../../pikotools/utf8/utf8.h
+showtickets.o: ../../../../winix/winixd/core/winix_const.h
 showtickets.o: ../../../../winix/winixd/core/winixbase.h
-showtickets.o: ../../../../winix/winixd/core/error.h
+showtickets.o: ../../../../winix/winixd/core/config.h
 showtickets.o: ../../../../pikotools/space/spaceparser.h
 showtickets.o: ../../../../pikotools/space/space.h
-showtickets.o: ../../../../pikotools/textstream/types.h ticketinfo.h
+showtickets.o: ../../../../winix/winixd/core/log.h
+showtickets.o: ../../../../winix/winixd/core/textstream.h
+showtickets.o: ../../../../winix/winixd/core/logmanipulators.h
+showtickets.o: ../../../../winix/winixd/core/filelog.h
+showtickets.o: ../../../../winix/winixd/core/synchro.h
+showtickets.o: ../../../../winix/winixd/core/log.h
+showtickets.o: ../../../../winix/winixd/core/filelog.h
+showtickets.o: ../../../../winix/winixd/core/lock.h
+showtickets.o: ../../../../winix/winixd/core/synchro.h
+showtickets.o: ../../../../winix/winixd/core/error.h ticketinfo.h
 showtickets.o: ../../../../winix/winixd/core/item.h
 showtickets.o: ../../../../winix/winixd/core/system.h
 showtickets.o: ../../../../winix/winixd/core/job.h
 showtickets.o: ../../../../winix/winixd/core/basethread.h
-showtickets.o: ../../../../winix/winixd/core/synchro.h
 showtickets.o: ../../../../winix/winixd/core/winixmodel.h
-showtickets.o: ../../../../winix/winixd/core/plugin.h
+showtickets.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
+showtickets.o: ../../../../winix/winixd/core/plugindata.h
+showtickets.o: ../../../../winix/winixd/core/winixbase.h
 showtickets.o: ../../../../winix/winixd/core/dirs.h
 showtickets.o: ../../../../winix/winixd/core/dircontainer.h
 showtickets.o: ../../../../winix/winixd/db/db.h
@@ -665,17 +672,6 @@ showtickets.o: ../../../../winix/winixd/db/dbitemcolumns.h
 showtickets.o: ../../../../winix/winixd/core/user.h
 showtickets.o: ../../../../winix/winixd/core/group.h
 showtickets.o: ../../../../winix/winixd/core/dircontainer.h
-showtickets.o: ../../../../winix/winixd/core/winixbase.h
-showtickets.o: ../../../../winix/winixd/core/config.h
-showtickets.o: ../../../../winix/winixd/core/htmlfilter.h
-showtickets.o: ../../../../winix/winixd/core/log.h
-showtickets.o: ../../../../winix/winixd/core/textstream.h
-showtickets.o: ../../../../winix/winixd/core/logmanipulators.h
-showtickets.o: ../../../../winix/winixd/core/filelog.h
-showtickets.o: ../../../../winix/winixd/core/synchro.h
-showtickets.o: ../../../../winix/winixd/core/log.h
-showtickets.o: ../../../../winix/winixd/core/filelog.h
-showtickets.o: ../../../../winix/winixd/core/lock.h
 showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
 showtickets.o: ../../../../winix/winixd/core/request.h
 showtickets.o: ../../../../winix/winixd/core/mounts.h
@@ -691,7 +687,6 @@ showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
 showtickets.o: ../../../../winix/winixd/core/lastcontainer.h
 showtickets.o: ../../../../winix/winixd/core/cur.h
 showtickets.o: ../../../../winix/winixd/core/session.h
-showtickets.o: ../../../../winix/winixd/core/plugindata.h
 showtickets.o: ../../../../winix/winixd/core/rebus.h
 showtickets.o: ../../../../winix/winixd/core/ipban.h
 showtickets.o: ../../../../winix/winixd/core/groups.h
@@ -777,36 +772,46 @@ showtickets.o: ../../../../winix/winixd/core/system.h
 showtickets.o: ../../../../winix/winixd/core/sessionidmanager.h
 showtickets.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
 showtickets.o: ../../../../winix/winixd/core/slog.h
-showtickets.o: ../../../../winix/winixd/functions/functionbase.h pluginmsg.h
+showtickets.o: ../../../../winix/winixd/functions/functionbase.h
 showtickets.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
-showtickets.o: ../../../../winix/winixd/core/plugin.h
 tdb.o: tdb.h ticket.h ../../../../winix/winixd/db/dbbase.h
 tdb.o: ../../../../winix/winixd/db/dbconn.h
 tdb.o: ../../../../winix/winixd/db/dbtextstream.h
 tdb.o: ../../../../winix/winixd/core/textstream.h
-tdb.o: ../../../../pikotools/textstream/textstream.h
-tdb.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
+tdb.o: ../../../../winix/winixd/core/misc.h
+tdb.o: ../../../../winix/winixd/core/item.h
+tdb.o: ../../../../pikotools/space/space.h
+tdb.o: ../../../../pikotools/textstream/types.h
+tdb.o: ../../../../pikotools/date/date.h
 tdb.o: ../../../../pikotools/convert/convert.h
 tdb.o: ../../../../pikotools/convert/inttostr.h
 tdb.o: ../../../../pikotools/convert/strtoint.h
 tdb.o: ../../../../pikotools/convert/text.h
-tdb.o: ../../../../winix/winixd/core/misc.h
-tdb.o: ../../../../winix/winixd/core/item.h
 tdb.o: ../../../../winix/winixd/core/requesttypes.h
-tdb.o: ../../../../pikotools/utf8/utf8.h
-tdb.o: ../../../../winix/winixd/core/winix_const.h
+tdb.o: ../../../../pikotools/textstream/textstream.h
 tdb.o: ../../../../pikotools/membuffer/membuffer.h
 tdb.o: ../../../../pikotools/textstream/types.h
+tdb.o: ../../../../pikotools/utf8/utf8.h
+tdb.o: ../../../../winix/winixd/core/winix_const.h
 tdb.o: ../../../../winix/winixd/core/winixbase.h
-tdb.o: ../../../../winix/winixd/core/error.h
+tdb.o: ../../../../winix/winixd/core/config.h
 tdb.o: ../../../../pikotools/space/spaceparser.h
 tdb.o: ../../../../pikotools/space/space.h
-tdb.o: ../../../../pikotools/textstream/types.h
 tdb.o: ../../../../winix/winixd/core/log.h
+tdb.o: ../../../../winix/winixd/core/textstream.h
+tdb.o: ../../../../winix/winixd/core/logmanipulators.h
+tdb.o: ../../../../winix/winixd/core/filelog.h
+tdb.o: ../../../../winix/winixd/core/synchro.h
+tdb.o: ../../../../winix/winixd/core/log.h
+tdb.o: ../../../../winix/winixd/core/filelog.h
+tdb.o: ../../../../winix/winixd/core/lock.h
+tdb.o: ../../../../winix/winixd/core/synchro.h
+tdb.o: ../../../../winix/winixd/core/error.h
 templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
 templates.o: ../../../../ezc/src/blocks.h
 templates.o: ../../../../winix/winixd/core/item.h
 templates.o: ../../../../pikotools/space/space.h
+templates.o: ../../../../pikotools/textstream/types.h
 templates.o: ../../../../pikotools/date/date.h
 templates.o: ../../../../pikotools/convert/convert.h
 templates.o: ../../../../pikotools/convert/inttostr.h
@@ -831,7 +836,20 @@ templates.o: ../../../../winix/winixd/core/basethread.h
 templates.o: ../../../../winix/winixd/core/synchro.h
 templates.o: ../../../../winix/winixd/core/winixmodel.h
 templates.o: ../../../../winix/winixd/core/winixbase.h
-templates.o: ../../../../winix/winixd/core/plugin.h
+templates.o: ../../../../winix/winixd/core/config.h
+templates.o: ../../../../pikotools/space/spaceparser.h
+templates.o: ../../../../pikotools/space/space.h
+templates.o: ../../../../winix/winixd/core/log.h
+templates.o: ../../../../winix/winixd/core/textstream.h
+templates.o: ../../../../winix/winixd/core/logmanipulators.h
+templates.o: ../../../../winix/winixd/core/filelog.h
+templates.o: ../../../../winix/winixd/core/synchro.h
+templates.o: ../../../../winix/winixd/core/log.h
+templates.o: ../../../../winix/winixd/core/filelog.h
+templates.o: ../../../../winix/winixd/core/lock.h
+templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
+templates.o: ../../../../winix/winixd/core/plugindata.h
+templates.o: ../../../../winix/winixd/core/winixbase.h
 templates.o: ../../../../winix/winixd/core/dirs.h
 templates.o: ../../../../winix/winixd/core/dircontainer.h
 templates.o: ../../../../winix/winixd/db/db.h
@@ -841,20 +859,6 @@ templates.o: ../../../../winix/winixd/db/dbitemcolumns.h
 templates.o: ../../../../winix/winixd/core/user.h
 templates.o: ../../../../winix/winixd/core/group.h
 templates.o: ../../../../winix/winixd/core/dircontainer.h
-templates.o: ../../../../winix/winixd/core/winixbase.h
-templates.o: ../../../../winix/winixd/core/config.h
-templates.o: ../../../../pikotools/space/spaceparser.h
-templates.o: ../../../../pikotools/space/space.h
-templates.o: ../../../../pikotools/textstream/types.h
-templates.o: ../../../../winix/winixd/core/htmlfilter.h
-templates.o: ../../../../winix/winixd/core/log.h
-templates.o: ../../../../winix/winixd/core/textstream.h
-templates.o: ../../../../winix/winixd/core/logmanipulators.h
-templates.o: ../../../../winix/winixd/core/filelog.h
-templates.o: ../../../../winix/winixd/core/synchro.h
-templates.o: ../../../../winix/winixd/core/log.h
-templates.o: ../../../../winix/winixd/core/filelog.h
-templates.o: ../../../../winix/winixd/core/lock.h
 templates.o: ../../../../winix/winixd/core/ugcontainer.h
 templates.o: ../../../../winix/winixd/core/request.h
 templates.o: ../../../../winix/winixd/core/mounts.h
@@ -870,7 +874,6 @@ templates.o: ../../../../winix/winixd/core/ugcontainer.h
 templates.o: ../../../../winix/winixd/core/lastcontainer.h
 templates.o: ../../../../winix/winixd/core/cur.h
 templates.o: ../../../../winix/winixd/core/session.h
-templates.o: ../../../../winix/winixd/core/plugindata.h
 templates.o: ../../../../winix/winixd/core/rebus.h
 templates.o: ../../../../winix/winixd/core/ipban.h
 templates.o: ../../../../winix/winixd/core/groups.h
@@ -956,7 +959,7 @@ templates.o: ../../../../winix/winixd/db/dbtextstream.h
 templates.o: ../../../../winix/winixd/core/error.h editticket.h
 templates.o: ../../../../winix/winixd/functions/functionbase.h createticket.h
 templates.o: ../../../../winix/winixd/core/misc.h
-templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
+templates.o: ../../../../winix/winixd/core/plugin.h
 templates.o: ../../../../winix/winixd/templates/templates.h
 templates.o: ../../../../winix/winixd/templates/patterncacher.h
 templates.o: ../../../../winix/winixd/templates/indexpatterns.h
@@ -975,22 +978,36 @@ ticketinfo.o: ../../../../winix/winixd/core/basethread.h
 ticketinfo.o: ../../../../winix/winixd/core/synchro.h
 ticketinfo.o: ../../../../winix/winixd/core/winixmodel.h
 ticketinfo.o: ../../../../winix/winixd/core/winixbase.h
-ticketinfo.o: ../../../../winix/winixd/core/plugin.h
+ticketinfo.o: ../../../../winix/winixd/core/config.h
+ticketinfo.o: ../../../../pikotools/space/spaceparser.h
 ticketinfo.o: ../../../../pikotools/space/space.h
-ticketinfo.o: ../../../../winix/winixd/core/dirs.h
-ticketinfo.o: ../../../../winix/winixd/core/item.h
+ticketinfo.o: ../../../../winix/winixd/core/log.h
+ticketinfo.o: ../../../../winix/winixd/core/textstream.h
+ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h
+ticketinfo.o: ../../../../pikotools/textstream/textstream.h
+ticketinfo.o: ../../../../pikotools/space/space.h
+ticketinfo.o: ../../../../pikotools/textstream/types.h
 ticketinfo.o: ../../../../pikotools/date/date.h
 ticketinfo.o: ../../../../pikotools/convert/convert.h
 ticketinfo.o: ../../../../pikotools/convert/inttostr.h
 ticketinfo.o: ../../../../pikotools/convert/strtoint.h
 ticketinfo.o: ../../../../pikotools/convert/text.h
 ticketinfo.o: ../../../../winix/winixd/core/misc.h
+ticketinfo.o: ../../../../winix/winixd/core/item.h
 ticketinfo.o: ../../../../winix/winixd/core/requesttypes.h
-ticketinfo.o: ../../../../pikotools/textstream/textstream.h
-ticketinfo.o: ../../../../pikotools/membuffer/membuffer.h
-ticketinfo.o: ../../../../pikotools/textstream/types.h
 ticketinfo.o: ../../../../pikotools/utf8/utf8.h
 ticketinfo.o: ../../../../winix/winixd/core/winix_const.h
+ticketinfo.o: ../../../../pikotools/membuffer/membuffer.h
+ticketinfo.o: ../../../../pikotools/textstream/types.h
+ticketinfo.o: ../../../../winix/winixd/core/filelog.h
+ticketinfo.o: ../../../../winix/winixd/core/synchro.h
+ticketinfo.o: ../../../../winix/winixd/core/log.h
+ticketinfo.o: ../../../../winix/winixd/core/filelog.h
+ticketinfo.o: ../../../../winix/winixd/core/lock.h
+ticketinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
+ticketinfo.o: ../../../../winix/winixd/core/plugindata.h
+ticketinfo.o: ../../../../winix/winixd/core/winixbase.h
+ticketinfo.o: ../../../../winix/winixd/core/dirs.h
 ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h
 ticketinfo.o: ../../../../winix/winixd/db/db.h
 ticketinfo.o: ../../../../winix/winixd/db/dbbase.h
@@ -999,20 +1016,6 @@ ticketinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h
 ticketinfo.o: ../../../../winix/winixd/core/user.h
 ticketinfo.o: ../../../../winix/winixd/core/group.h
 ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h
-ticketinfo.o: ../../../../winix/winixd/core/winixbase.h
-ticketinfo.o: ../../../../winix/winixd/core/config.h
-ticketinfo.o: ../../../../pikotools/space/spaceparser.h
-ticketinfo.o: ../../../../pikotools/space/space.h
-ticketinfo.o: ../../../../pikotools/textstream/types.h
-ticketinfo.o: ../../../../winix/winixd/core/htmlfilter.h
-ticketinfo.o: ../../../../winix/winixd/core/log.h
-ticketinfo.o: ../../../../winix/winixd/core/textstream.h
-ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h
-ticketinfo.o: ../../../../winix/winixd/core/filelog.h
-ticketinfo.o: ../../../../winix/winixd/core/synchro.h
-ticketinfo.o: ../../../../winix/winixd/core/log.h
-ticketinfo.o: ../../../../winix/winixd/core/filelog.h
-ticketinfo.o: ../../../../winix/winixd/core/lock.h
 ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
 ticketinfo.o: ../../../../winix/winixd/core/request.h
 ticketinfo.o: ../../../../winix/winixd/core/mounts.h
@@ -1028,7 +1031,6 @@ ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
 ticketinfo.o: ../../../../winix/winixd/core/lastcontainer.h
 ticketinfo.o: ../../../../winix/winixd/core/cur.h
 ticketinfo.o: ../../../../winix/winixd/core/session.h
-ticketinfo.o: ../../../../winix/winixd/core/plugindata.h
 ticketinfo.o: ../../../../winix/winixd/core/rebus.h
 ticketinfo.o: ../../../../winix/winixd/core/ipban.h
 ticketinfo.o: ../../../../winix/winixd/core/groups.h
@@ -1119,8 +1121,7 @@ ticketinfo.o: ../../../../winix/winixd/db/dbbase.h
 ticketinfo.o: ../../../../winix/winixd/db/dbconn.h
 ticketinfo.o: ../../../../winix/winixd/db/dbtextstream.h
 ticketinfo.o: ../../../../winix/winixd/core/error.h
-ticketinfo.o: ../../../../winix/winixd/core/misc.h
-ticketinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
-ticketinfo.o: sessiondata.h ../../../../winix/winixd/core/plugindata.h
+ticketinfo.o: ../../../../winix/winixd/core/misc.h sessiondata.h
+ticketinfo.o: ../../../../winix/winixd/core/plugindata.h
 ticketinfo.o: ../../../../winix/winixd/functions/rm.h
 ticketinfo.o: ../../../../pikotools/convert/text.h
diff --git a/winixd/plugins/ticket/createticket.cpp b/winixd/plugins/ticket/createticket.cpp
index cdcf012..2c33dc9 100644
--- a/winixd/plugins/ticket/createticket.cpp
+++ b/winixd/plugins/ticket/createticket.cpp
@@ -32,7 +32,6 @@
  * 
  */
  
-#include "core/plugin.h"
 #include "createticket.h"
 #include "functions/functions.h"
 #include "sessiondata.h"
@@ -100,7 +99,7 @@ void CreateTicket::AddTicket(Ticket & ticket, Item & item)
 		system->notify.ItemChanged(notify_msg);
 
 		// sending a message
-		plugin.Call(WINIX_PL_TICKET_ADDED_NEW, &ticket, &item);
+		plugin->Call(WINIX_PL_TICKET_ADDED_NEW, &ticket, &item);
 	}
 }
 
@@ -116,7 +115,7 @@ void CreateTicket::Submit(Ticket & ticket, Item & item)
 	item.privileges = system->NewFilePrivileges();
 	item.parent_id  = cur->request->dir_tab.back()->id;
 
-	plugin.Call(WINIX_PL_TICKET_PREPARE_TO_ADD_TICKET, &item, &ticket);
+	plugin->Call(WINIX_PL_TICKET_PREPARE_TO_ADD_TICKET, &item, &ticket);
 
 	// adding without notificating
 	cur->request->status = system->AddFile(item, false);
diff --git a/winixd/plugins/ticket/editticket.cpp b/winixd/plugins/ticket/editticket.cpp
index 0a2c0f2..de517bf 100644
--- a/winixd/plugins/ticket/editticket.cpp
+++ b/winixd/plugins/ticket/editticket.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2014, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,6 @@
 #include "editticket.h"
 #include "functions/functions.h"
 #include "sessiondata.h"
-#include "core/plugin.h"
 #include "pluginmsg.h"
 
 namespace Winix
@@ -107,7 +106,7 @@ void EditTicket::ChangeTicket(Ticket & ticket, Item & item)
 		system->notify.ItemChanged(notify_msg);
 
 		// sending a message
-		plugin.Call(WINIX_PL_TICKET_CHANGED, &ticket, &item);
+		plugin->Call(WINIX_PL_TICKET_CHANGED, &ticket, &item);
 	}
 }
 
@@ -234,7 +233,7 @@ void EditTicket::MakePost()
 	if( cur->request->IsParam(L"close") )
 	{
 		if( CloseTicket() )
-			plugin.Call(WINIX_PL_TICKET_CLOSED, ticket_info->item, ticket_info->ticket);
+			plugin->Call(WINIX_PL_TICKET_CLOSED, ticket_info->item, ticket_info->ticket);
 
 		ticket_info->MakeRedirectIfPossible(*cur->request->last_item);
 	}
diff --git a/winixd/plugins/ticket/funticket.cpp b/winixd/plugins/ticket/funticket.cpp
index 34fda95..1c911d8 100644
--- a/winixd/plugins/ticket/funticket.cpp
+++ b/winixd/plugins/ticket/funticket.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2014, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,6 @@
  */
  
 #include "funticket.h"
-#include "core/plugin.h"
 #include "plugins/thread/pluginmsg.h"
 
 namespace Winix
@@ -79,7 +78,7 @@ void FunTicket::MakeGet()
 
 	tdb->GetTicket(cur->request->item.id, ticket);
 
-	plugin.Call(WINIX_PL_THREAD_PREPARE_THREAD, cur->request->item.id);
+	plugin->Call(WINIX_PL_THREAD_PREPARE_THREAD, cur->request->item.id);
 }
 
 
diff --git a/winixd/plugins/ticket/init.cpp b/winixd/plugins/ticket/init.cpp
index a53d1d4..1cea44c 100644
--- a/winixd/plugins/ticket/init.cpp
+++ b/winixd/plugins/ticket/init.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,6 @@
 #include "editticket.h"
 #include "createticket.h"
 #include "showtickets.h"
-#include "core/log.h"
-#include "core/plugin.h"
 #include "sessiondata.h"
 #include "plugins/thread/showthreads.h"
 #include "plugins/thread/pluginmsg.h"
@@ -147,7 +145,7 @@ void CreateSession(PluginInfo & info)
 
 	p->fun_rm = &info.functions->fun_rm;
 	info.session->plugin_data.Assign(info.plugin->current_plugin, p);
-	log << log4 << "Ticket: created ticket plugin data: " << (void*)p << logend;
+	info.log << log4 << "Ticket: created ticket plugin data: " << (void*)p << logend;
 }
 
 
@@ -157,7 +155,7 @@ void RemoveSession(PluginInfo & info)
 	{
 		info.plugin_data_base->Clear();
 		delete info.plugin_data_base;
-		log << log4 << "Ticket: removed ticket plugin data: " << (void*)info.plugin_data_base << logend;
+		info.log << log4 << "Ticket: removed ticket plugin data: " << (void*)info.plugin_data_base << logend;
 	}
 }
 
@@ -188,24 +186,25 @@ void Init(PluginInfo & info)
 {
 using namespace Ticket;
 
-	plugin.Assign(WINIX_PLUGIN_INIT,                InitTicket);
-	plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS,	AddEzcFunctions);
-	plugin.Assign(WINIX_CREATE_FUNCTIONS,			AddFunctions);
-	plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION,	SelectDefaultFunction);
-	plugin.Assign(WINIX_ADD_MOUNTS,					AddMounts);
-	plugin.Assign(WINIX_FSTAB_CHANGED,				FstabChanged);
-	plugin.Assign(WINIX_PROCESS_REQUEST,			ProcessRequest);
-	plugin.Assign(WINIX_FILE_REMOVED,				RemoveTicket);
-	plugin.Assign(WINIX_NOTIFY_ADD_TEMPLATE,		AddNotifyTemplate);
-	plugin.Assign(WINIX_SESSION_CREATED,			CreateSession);
-	plugin.Assign(WINIX_PLUGIN_SESSION_DATA_REMOVE,	RemoveSession);
-	plugin.Assign(WINIX_END_REQUEST,                EndRequest);
-	plugin.Assign(WINIX_PL_TICKET_LOAD_TICKETS,		ShowTicketsFromDir);
+	info.plugin->Assign(WINIX_PLUGIN_INIT,                	InitTicket);
+	info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS,	AddEzcFunctions);
+	info.plugin->Assign(WINIX_CREATE_FUNCTIONS,				AddFunctions);
+	info.plugin->Assign(WINIX_SELECT_DEFAULT_FUNCTION,		SelectDefaultFunction);
+	info.plugin->Assign(WINIX_ADD_MOUNTS,					AddMounts);
+	info.plugin->Assign(WINIX_FSTAB_CHANGED,				FstabChanged);
+	info.plugin->Assign(WINIX_PROCESS_REQUEST,				ProcessRequest);
+	info.plugin->Assign(WINIX_FILE_REMOVED,					RemoveTicket);
+	info.plugin->Assign(WINIX_NOTIFY_ADD_TEMPLATE,			AddNotifyTemplate);
+	info.plugin->Assign(WINIX_SESSION_CREATED,				CreateSession);
+	info.plugin->Assign(WINIX_PLUGIN_SESSION_DATA_REMOVE,	RemoveSession);
+	info.plugin->Assign(WINIX_END_REQUEST,                	EndRequest);
+	info.plugin->Assign(WINIX_PL_TICKET_LOAD_TICKETS,		ShowTicketsFromDir);
 
 
 	tdb.SetConn(info.db->GetConn());
 	tdb.LogQueries(info.config->log_db_query);
 
+	info.set_dependency_for(ticket_info);
 	ticket_info.SetDb(info.db);
 	ticket_info.SetTDb(&tdb);
 	ticket_info.SetConfig(info.config);
diff --git a/winixd/plugins/ticket/showtickets.cpp b/winixd/plugins/ticket/showtickets.cpp
index c99241a..fa3a0c4 100644
--- a/winixd/plugins/ticket/showtickets.cpp
+++ b/winixd/plugins/ticket/showtickets.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
 #include "showtickets.h"
 #include "pluginmsg.h"
 #include "plugins/thread/pluginmsg.h"
-#include "core/plugin.h"
+
 
 namespace Winix
 {
@@ -134,7 +134,7 @@ void ShowTickets::CreatePointers()
 
 void ShowTickets::SortPointers()
 {
-	PluginRes res = plugin.Call(WINIX_PL_TICKET_SORT_POINTERS, &ticket_info->item_sort_tab);
+	PluginRes res = plugin->Call(WINIX_PL_TICKET_SORT_POINTERS, &ticket_info->item_sort_tab);
 
 	if( res.res_true > 0 )
 		return;
@@ -172,11 +172,11 @@ void ShowTickets::ShowTicketsFromDir(long dir_id)
 	SortPointers();
 	ReadTickets();
 
-	plugin.Call(WINIX_PL_TICKET_TICKETS_LOADED, &ticket_info->ticket_tab, &ticket_info->item_sort_tab);
+	plugin->Call(WINIX_PL_TICKET_TICKETS_LOADED, &ticket_info->ticket_tab, &ticket_info->item_sort_tab);
 
 	// !! IMPROVE ME may a better name instead of WINIX_PL_THREAD_SET_SORTTAB?
-	plugin.Call(WINIX_PL_THREAD_SET_SORTTAB, &ticket_info->item_sort_tab);
-	plugin.Call(WINIX_PL_THREAD_READ_THREADS);
+	plugin->Call(WINIX_PL_THREAD_SET_SORTTAB, &ticket_info->item_sort_tab);
+	plugin->Call(WINIX_PL_THREAD_READ_THREADS);
 }
 
 
diff --git a/winixd/plugins/ticket/templates.cpp b/winixd/plugins/ticket/templates.cpp
index 9d0b1f0..52a6b75 100644
--- a/winixd/plugins/ticket/templates.cpp
+++ b/winixd/plugins/ticket/templates.cpp
@@ -522,7 +522,7 @@ void tickets_tab(Info & i)
 		// may we add en ampty ticket and tickets_value.ticket will be pointing to it?
 
 		// !! IMPROVEME change the  name of the message
-		plugin.Call(WINIX_PL_TICKET_TICKETS_TAB_IS_NEXT, tickets_value.item);
+		plugin->Call(WINIX_PL_TICKET_TICKETS_TAB_IS_NEXT, tickets_value.item);
 
 		if( find_ticket(file_id, ticket_info.ticket_tab, ticket_index) )
 		{
@@ -534,7 +534,7 @@ void tickets_tab(Info & i)
 			log << log1 << "Ticket: I cannot find a ticket for file_id: " << file_id << logend;
 		}
 
-		plugin.Call(WINIX_PL_THREAD_SET_SORTTAB_INDEX, item_sort_index);
+		plugin->Call(WINIX_PL_THREAD_SET_SORTTAB_INDEX, item_sort_index);
 	}
 }
 
diff --git a/winixd/plugins/ticket/ticketinfo.cpp b/winixd/plugins/ticket/ticketinfo.cpp
index 8fc23a0..e15f435 100644
--- a/winixd/plugins/ticket/ticketinfo.cpp
+++ b/winixd/plugins/ticket/ticketinfo.cpp
@@ -38,7 +38,6 @@
 #include "core/error.h"
 #include "core/log.h"
 #include "core/misc.h"
-#include "core/plugin.h"
 #include "pluginmsg.h"
 #include "sessiondata.h"
 #include "convert/text.h"
@@ -626,7 +625,7 @@ void TicketInfo::CopyTicketSpace(PT::Space & ticket_space, Item & item)
 
 void TicketInfo::MakeRedirectIfPossible(const Item & item)
 {
-	PluginRes res = plugin.Call(WINIX_PL_TICKET_CAN_MAKE_REDIRECT);
+	PluginRes res = plugin->Call(WINIX_PL_TICKET_CAN_MAKE_REDIRECT);
 
 	if( res.res_false > 0 )
 	{
diff --git a/winixd/plugins/ticket/ticketinfo.h b/winixd/plugins/ticket/ticketinfo.h
index 4077330..76564b7 100644
--- a/winixd/plugins/ticket/ticketinfo.h
+++ b/winixd/plugins/ticket/ticketinfo.h
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,8 @@
 #include "db/db.h"
 #include "tdb.h"
 #include "space/spaceparser.h"
+#include "core/winixmodel.h"
+
 
 namespace Winix
 {
@@ -65,7 +67,7 @@ struct TicketConfWrap
 };
 
 
-class TicketInfo
+class TicketInfo : public WinixModel
 {
 public:
 
diff --git a/winixd/templates/Makefile.dep b/winixd/templates/Makefile.dep
index 8bca610..65d119f 100644
--- a/winixd/templates/Makefile.dep
+++ b/winixd/templates/Makefile.dep
@@ -17,17 +17,21 @@ adduser.o: ../../../pikotools/convert/inttostr.h
 adduser.o: ../../../pikotools/convert/strtoint.h
 adduser.o: ../../../pikotools/convert/text.h
 adduser.o: ../../../pikotools/membuffer/membuffer.h
-adduser.o: ../../../pikotools/textstream/types.h htmltextstream.h
-adduser.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-adduser.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-adduser.o: changepatterns.h ../../../winix/winixd/core/config.h
-adduser.o: ../../../winix/winixd/core/htmlfilter.h
+adduser.o: ../../../pikotools/textstream/types.h
+adduser.o: ../../../winix/winixd/core/winixbase.h
+adduser.o: ../../../winix/winixd/core/config.h
 adduser.o: ../../../winix/winixd/core/log.h
 adduser.o: ../../../winix/winixd/core/textstream.h
 adduser.o: ../../../winix/winixd/core/logmanipulators.h
 adduser.o: ../../../winix/winixd/core/filelog.h
 adduser.o: ../../../winix/winixd/core/synchro.h
-adduser.o: ../../../winix/winixd/core/cur.h
+adduser.o: ../../../winix/winixd/core/log.h
+adduser.o: ../../../winix/winixd/core/filelog.h
+adduser.o: ../../../winix/winixd/core/lock.h
+adduser.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+adduser.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+adduser.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+adduser.o: changepatterns.h ../../../winix/winixd/core/cur.h
 adduser.o: ../../../winix/winixd/core/request.h
 adduser.o: ../../../winix/winixd/core/requesttypes.h
 adduser.o: ../../../winix/winixd/core/error.h
@@ -39,17 +43,12 @@ adduser.o: ../../../winix/winixd/core/user.h
 adduser.o: ../../../winix/winixd/core/plugindata.h
 adduser.o: ../../../winix/winixd/core/rebus.h
 adduser.o: ../../../winix/winixd/core/winixbase.h
-adduser.o: ../../../winix/winixd/core/log.h
-adduser.o: ../../../winix/winixd/core/filelog.h
-adduser.o: ../../../winix/winixd/core/lock.h
-adduser.o: ../../../winix/winixd/core/synchro.h
 adduser.o: ../../../winix/winixd/core/ipban.h
 adduser.o: ../../../winix/winixd/core/mount.h
 adduser.o: ../../../winix/winixd/core/system.h
 adduser.o: ../../../winix/winixd/core/job.h
 adduser.o: ../../../winix/winixd/core/basethread.h
 adduser.o: ../../../winix/winixd/core/winixmodel.h
-adduser.o: ../../../winix/winixd/core/winixbase.h
 adduser.o: ../../../winix/winixd/core/plugin.h
 adduser.o: ../../../winix/winixd/core/pluginmsg.h
 adduser.o: ../../../winix/winixd/core/dirs.h
@@ -95,6 +94,9 @@ adduser.o: ../../../winix/winixd/core/system.h
 adduser.o: ../../../winix/winixd/core/sessionidmanager.h
 adduser.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 adduser.o: ../../../winix/winixd/core/htmlfilter.h
+adduser.o: ../../../winix/winixd/core/winixrequest.h
+adduser.o: ../../../winix/winixd/core/winixsystem.h
+adduser.o: ../../../winix/winixd/core/slog.h
 adduser.o: ../../../winix/winixd/core/request.h
 antispam.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 antispam.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
@@ -113,17 +115,21 @@ antispam.o: ../../../pikotools/convert/inttostr.h
 antispam.o: ../../../pikotools/convert/strtoint.h
 antispam.o: ../../../pikotools/convert/text.h
 antispam.o: ../../../pikotools/membuffer/membuffer.h
-antispam.o: ../../../pikotools/textstream/types.h htmltextstream.h
-antispam.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-antispam.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-antispam.o: changepatterns.h ../../../winix/winixd/core/config.h
-antispam.o: ../../../winix/winixd/core/htmlfilter.h
+antispam.o: ../../../pikotools/textstream/types.h
+antispam.o: ../../../winix/winixd/core/winixbase.h
+antispam.o: ../../../winix/winixd/core/config.h
 antispam.o: ../../../winix/winixd/core/log.h
 antispam.o: ../../../winix/winixd/core/textstream.h
 antispam.o: ../../../winix/winixd/core/logmanipulators.h
 antispam.o: ../../../winix/winixd/core/filelog.h
 antispam.o: ../../../winix/winixd/core/synchro.h
-antispam.o: ../../../winix/winixd/core/cur.h
+antispam.o: ../../../winix/winixd/core/log.h
+antispam.o: ../../../winix/winixd/core/filelog.h
+antispam.o: ../../../winix/winixd/core/lock.h
+antispam.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+antispam.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+antispam.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+antispam.o: changepatterns.h ../../../winix/winixd/core/cur.h
 antispam.o: ../../../winix/winixd/core/request.h
 antispam.o: ../../../winix/winixd/core/requesttypes.h
 antispam.o: ../../../winix/winixd/core/error.h
@@ -135,17 +141,12 @@ antispam.o: ../../../winix/winixd/core/user.h
 antispam.o: ../../../winix/winixd/core/plugindata.h
 antispam.o: ../../../winix/winixd/core/rebus.h
 antispam.o: ../../../winix/winixd/core/winixbase.h
-antispam.o: ../../../winix/winixd/core/log.h
-antispam.o: ../../../winix/winixd/core/filelog.h
-antispam.o: ../../../winix/winixd/core/lock.h
-antispam.o: ../../../winix/winixd/core/synchro.h
 antispam.o: ../../../winix/winixd/core/ipban.h
 antispam.o: ../../../winix/winixd/core/mount.h
 antispam.o: ../../../winix/winixd/core/system.h
 antispam.o: ../../../winix/winixd/core/job.h
 antispam.o: ../../../winix/winixd/core/basethread.h
 antispam.o: ../../../winix/winixd/core/winixmodel.h
-antispam.o: ../../../winix/winixd/core/winixbase.h
 antispam.o: ../../../winix/winixd/core/plugin.h
 antispam.o: ../../../winix/winixd/core/pluginmsg.h
 antispam.o: ../../../winix/winixd/core/dirs.h
@@ -191,6 +192,9 @@ antispam.o: ../../../winix/winixd/core/system.h
 antispam.o: ../../../winix/winixd/core/sessionidmanager.h
 antispam.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 antispam.o: ../../../winix/winixd/core/htmlfilter.h
+antispam.o: ../../../winix/winixd/core/winixrequest.h
+antispam.o: ../../../winix/winixd/core/winixsystem.h
+antispam.o: ../../../winix/winixd/core/slog.h
 antispam.o: ../../../winix/winixd/core/request.h
 antispam.o: ../../../winix/winixd/core/misc.h
 antispam.o: ../../../winix/winixd/core/winix_const.h
@@ -212,11 +216,21 @@ changepatterns.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
 changepatterns.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
 changepatterns.o: ../../../ezc/src/outstreams.h
 changepatterns.o: ../../../ezc/src/expressionparser.h
-changepatterns.o: ../../../ezc/src/patternparser.h htmltextstream.h
+changepatterns.o: ../../../ezc/src/patternparser.h
+changepatterns.o: ../../../winix/winixd/core/winixbase.h
+changepatterns.o: ../../../winix/winixd/core/config.h
+changepatterns.o: ../../../winix/winixd/core/log.h
+changepatterns.o: ../../../winix/winixd/core/textstream.h
+changepatterns.o: ../../../winix/winixd/core/logmanipulators.h
+changepatterns.o: ../../../winix/winixd/core/filelog.h
+changepatterns.o: ../../../winix/winixd/core/synchro.h
+changepatterns.o: ../../../winix/winixd/core/log.h
+changepatterns.o: ../../../winix/winixd/core/filelog.h
+changepatterns.o: ../../../winix/winixd/core/lock.h
+changepatterns.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
 changepatterns.o: ../../../winix/winixd/core/textstream.h
 changepatterns.o: ../../../pikotools/membuffer/membuffer.h
 changepatterns.o: ../../../pikotools/textstream/types.h
-changepatterns.o: ../../../winix/winixd/core/log.h
 config.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 config.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 config.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -234,17 +248,21 @@ config.o: ../../../pikotools/convert/inttostr.h
 config.o: ../../../pikotools/convert/strtoint.h
 config.o: ../../../pikotools/convert/text.h
 config.o: ../../../pikotools/membuffer/membuffer.h
-config.o: ../../../pikotools/textstream/types.h htmltextstream.h
-config.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-config.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-config.o: changepatterns.h ../../../winix/winixd/core/config.h
-config.o: ../../../winix/winixd/core/htmlfilter.h
+config.o: ../../../pikotools/textstream/types.h
+config.o: ../../../winix/winixd/core/winixbase.h
+config.o: ../../../winix/winixd/core/config.h
 config.o: ../../../winix/winixd/core/log.h
 config.o: ../../../winix/winixd/core/textstream.h
 config.o: ../../../winix/winixd/core/logmanipulators.h
 config.o: ../../../winix/winixd/core/filelog.h
 config.o: ../../../winix/winixd/core/synchro.h
-config.o: ../../../winix/winixd/core/cur.h
+config.o: ../../../winix/winixd/core/log.h
+config.o: ../../../winix/winixd/core/filelog.h
+config.o: ../../../winix/winixd/core/lock.h
+config.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+config.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+config.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+config.o: changepatterns.h ../../../winix/winixd/core/cur.h
 config.o: ../../../winix/winixd/core/request.h
 config.o: ../../../winix/winixd/core/requesttypes.h
 config.o: ../../../winix/winixd/core/error.h
@@ -256,17 +274,12 @@ config.o: ../../../winix/winixd/core/user.h
 config.o: ../../../winix/winixd/core/plugindata.h
 config.o: ../../../winix/winixd/core/rebus.h
 config.o: ../../../winix/winixd/core/winixbase.h
-config.o: ../../../winix/winixd/core/log.h
-config.o: ../../../winix/winixd/core/filelog.h
-config.o: ../../../winix/winixd/core/lock.h
-config.o: ../../../winix/winixd/core/synchro.h
 config.o: ../../../winix/winixd/core/ipban.h
 config.o: ../../../winix/winixd/core/mount.h
 config.o: ../../../winix/winixd/core/system.h
 config.o: ../../../winix/winixd/core/job.h
 config.o: ../../../winix/winixd/core/basethread.h
 config.o: ../../../winix/winixd/core/winixmodel.h
-config.o: ../../../winix/winixd/core/winixbase.h
 config.o: ../../../winix/winixd/core/plugin.h
 config.o: ../../../winix/winixd/core/pluginmsg.h
 config.o: ../../../winix/winixd/core/dirs.h
@@ -311,6 +324,9 @@ config.o: ../../../winix/winixd/core/system.h
 config.o: ../../../winix/winixd/core/sessionidmanager.h
 config.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 config.o: ../../../winix/winixd/core/htmlfilter.h
+config.o: ../../../winix/winixd/core/winixrequest.h
+config.o: ../../../winix/winixd/core/winixsystem.h
+config.o: ../../../winix/winixd/core/slog.h
 currentdate.o: templates.h ../../../ezc/src/ezc.h
 currentdate.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
 currentdate.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
@@ -330,17 +346,21 @@ currentdate.o: ../../../pikotools/convert/inttostr.h
 currentdate.o: ../../../pikotools/convert/strtoint.h
 currentdate.o: ../../../pikotools/convert/text.h
 currentdate.o: ../../../pikotools/membuffer/membuffer.h
-currentdate.o: ../../../pikotools/textstream/types.h htmltextstream.h
-currentdate.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-currentdate.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-currentdate.o: changepatterns.h ../../../winix/winixd/core/config.h
-currentdate.o: ../../../winix/winixd/core/htmlfilter.h
+currentdate.o: ../../../pikotools/textstream/types.h
+currentdate.o: ../../../winix/winixd/core/winixbase.h
+currentdate.o: ../../../winix/winixd/core/config.h
 currentdate.o: ../../../winix/winixd/core/log.h
 currentdate.o: ../../../winix/winixd/core/textstream.h
 currentdate.o: ../../../winix/winixd/core/logmanipulators.h
 currentdate.o: ../../../winix/winixd/core/filelog.h
 currentdate.o: ../../../winix/winixd/core/synchro.h
-currentdate.o: ../../../winix/winixd/core/cur.h
+currentdate.o: ../../../winix/winixd/core/log.h
+currentdate.o: ../../../winix/winixd/core/filelog.h
+currentdate.o: ../../../winix/winixd/core/lock.h
+currentdate.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+currentdate.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+currentdate.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+currentdate.o: changepatterns.h ../../../winix/winixd/core/cur.h
 currentdate.o: ../../../winix/winixd/core/request.h
 currentdate.o: ../../../winix/winixd/core/requesttypes.h
 currentdate.o: ../../../winix/winixd/core/error.h
@@ -352,17 +372,12 @@ currentdate.o: ../../../winix/winixd/core/user.h
 currentdate.o: ../../../winix/winixd/core/plugindata.h
 currentdate.o: ../../../winix/winixd/core/rebus.h
 currentdate.o: ../../../winix/winixd/core/winixbase.h
-currentdate.o: ../../../winix/winixd/core/log.h
-currentdate.o: ../../../winix/winixd/core/filelog.h
-currentdate.o: ../../../winix/winixd/core/lock.h
-currentdate.o: ../../../winix/winixd/core/synchro.h
 currentdate.o: ../../../winix/winixd/core/ipban.h
 currentdate.o: ../../../winix/winixd/core/mount.h
 currentdate.o: ../../../winix/winixd/core/system.h
 currentdate.o: ../../../winix/winixd/core/job.h
 currentdate.o: ../../../winix/winixd/core/basethread.h
 currentdate.o: ../../../winix/winixd/core/winixmodel.h
-currentdate.o: ../../../winix/winixd/core/winixbase.h
 currentdate.o: ../../../winix/winixd/core/plugin.h
 currentdate.o: ../../../winix/winixd/core/pluginmsg.h
 currentdate.o: ../../../winix/winixd/core/dirs.h
@@ -409,14 +424,14 @@ currentdate.o: ../../../winix/winixd/core/system.h
 currentdate.o: ../../../winix/winixd/core/sessionidmanager.h
 currentdate.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 currentdate.o: ../../../winix/winixd/core/htmlfilter.h
+currentdate.o: ../../../winix/winixd/core/winixrequest.h
+currentdate.o: ../../../winix/winixd/core/winixsystem.h
+currentdate.o: ../../../winix/winixd/core/slog.h
 currentdate.o: ../../../winix/winixd/core/misc.h
 currentdate.o: ../../../winix/winixd/core/winix_const.h
 currentdate.o: ../../../winix/winixd/functions/functions.h
 currentdate.o: ../../../winix/winixd/functions/functionbase.h
 currentdate.o: ../../../winix/winixd/core/request.h
-currentdate.o: ../../../winix/winixd/core/winixrequest.h
-currentdate.o: ../../../winix/winixd/core/winixsystem.h
-currentdate.o: ../../../winix/winixd/core/slog.h
 currentdate.o: ../../../winix/winixd/functions/functionparser.h
 currentdate.o: ../../../winix/winixd/functions/account.h
 currentdate.o: ../../../winix/winixd/functions/adduser.h
@@ -475,16 +490,18 @@ dir.o: ../../../pikotools/convert/inttostr.h
 dir.o: ../../../pikotools/convert/strtoint.h
 dir.o: ../../../pikotools/convert/text.h
 dir.o: ../../../pikotools/membuffer/membuffer.h
-dir.o: ../../../pikotools/textstream/types.h htmltextstream.h
-dir.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-dir.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-dir.o: changepatterns.h ../../../winix/winixd/core/config.h
-dir.o: ../../../winix/winixd/core/htmlfilter.h
-dir.o: ../../../winix/winixd/core/log.h
+dir.o: ../../../pikotools/textstream/types.h
+dir.o: ../../../winix/winixd/core/winixbase.h
+dir.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 dir.o: ../../../winix/winixd/core/textstream.h
 dir.o: ../../../winix/winixd/core/logmanipulators.h
 dir.o: ../../../winix/winixd/core/filelog.h
-dir.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+dir.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+dir.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
+dir.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+dir.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+dir.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+dir.o: changepatterns.h ../../../winix/winixd/core/cur.h
 dir.o: ../../../winix/winixd/core/request.h
 dir.o: ../../../winix/winixd/core/requesttypes.h
 dir.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h
@@ -494,13 +511,10 @@ dir.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h
 dir.o: ../../../winix/winixd/core/plugindata.h
 dir.o: ../../../winix/winixd/core/rebus.h
 dir.o: ../../../winix/winixd/core/winixbase.h
-dir.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-dir.o: ../../../winix/winixd/core/lock.h ../../../winix/winixd/core/synchro.h
 dir.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 dir.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 dir.o: ../../../winix/winixd/core/basethread.h
 dir.o: ../../../winix/winixd/core/winixmodel.h
-dir.o: ../../../winix/winixd/core/winixbase.h
 dir.o: ../../../winix/winixd/core/plugin.h
 dir.o: ../../../winix/winixd/core/pluginmsg.h
 dir.o: ../../../winix/winixd/core/dirs.h
@@ -543,14 +557,13 @@ dir.o: ../../../winix/winixd/core/system.h
 dir.o: ../../../winix/winixd/core/sessionidmanager.h
 dir.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 dir.o: ../../../winix/winixd/core/htmlfilter.h
-dir.o: ../../../winix/winixd/core/misc.h
+dir.o: ../../../winix/winixd/core/winixrequest.h
+dir.o: ../../../winix/winixd/core/winixsystem.h
+dir.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/misc.h
 dir.o: ../../../winix/winixd/core/winix_const.h
 dir.o: ../../../winix/winixd/functions/functions.h
 dir.o: ../../../winix/winixd/functions/functionbase.h
 dir.o: ../../../winix/winixd/core/request.h
-dir.o: ../../../winix/winixd/core/winixrequest.h
-dir.o: ../../../winix/winixd/core/winixsystem.h
-dir.o: ../../../winix/winixd/core/slog.h
 dir.o: ../../../winix/winixd/functions/functionparser.h
 dir.o: ../../../winix/winixd/functions/account.h
 dir.o: ../../../winix/winixd/functions/adduser.h
@@ -609,16 +622,18 @@ doc.o: ../../../pikotools/convert/inttostr.h
 doc.o: ../../../pikotools/convert/strtoint.h
 doc.o: ../../../pikotools/convert/text.h
 doc.o: ../../../pikotools/membuffer/membuffer.h
-doc.o: ../../../pikotools/textstream/types.h htmltextstream.h
-doc.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-doc.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-doc.o: changepatterns.h ../../../winix/winixd/core/config.h
-doc.o: ../../../winix/winixd/core/htmlfilter.h
-doc.o: ../../../winix/winixd/core/log.h
+doc.o: ../../../pikotools/textstream/types.h
+doc.o: ../../../winix/winixd/core/winixbase.h
+doc.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 doc.o: ../../../winix/winixd/core/textstream.h
 doc.o: ../../../winix/winixd/core/logmanipulators.h
 doc.o: ../../../winix/winixd/core/filelog.h
-doc.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+doc.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+doc.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
+doc.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+doc.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+doc.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+doc.o: changepatterns.h ../../../winix/winixd/core/cur.h
 doc.o: ../../../winix/winixd/core/request.h
 doc.o: ../../../winix/winixd/core/requesttypes.h
 doc.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h
@@ -628,13 +643,10 @@ doc.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h
 doc.o: ../../../winix/winixd/core/plugindata.h
 doc.o: ../../../winix/winixd/core/rebus.h
 doc.o: ../../../winix/winixd/core/winixbase.h
-doc.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-doc.o: ../../../winix/winixd/core/lock.h ../../../winix/winixd/core/synchro.h
 doc.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 doc.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 doc.o: ../../../winix/winixd/core/basethread.h
 doc.o: ../../../winix/winixd/core/winixmodel.h
-doc.o: ../../../winix/winixd/core/winixbase.h
 doc.o: ../../../winix/winixd/core/plugin.h
 doc.o: ../../../winix/winixd/core/pluginmsg.h
 doc.o: ../../../winix/winixd/core/dirs.h
@@ -677,7 +689,10 @@ doc.o: ../../../winix/winixd/core/system.h
 doc.o: ../../../winix/winixd/core/sessionidmanager.h
 doc.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 doc.o: ../../../winix/winixd/core/htmlfilter.h
-doc.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/misc.h
+doc.o: ../../../winix/winixd/core/winixrequest.h
+doc.o: ../../../winix/winixd/core/winixsystem.h
+doc.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h
+doc.o: ../../../winix/winixd/core/misc.h
 doc.o: ../../../winix/winixd/core/winix_const.h
 env.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 env.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
@@ -695,16 +710,18 @@ env.o: ../../../pikotools/convert/inttostr.h
 env.o: ../../../pikotools/convert/strtoint.h
 env.o: ../../../pikotools/convert/text.h
 env.o: ../../../pikotools/membuffer/membuffer.h
-env.o: ../../../pikotools/textstream/types.h htmltextstream.h
-env.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-env.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-env.o: changepatterns.h ../../../winix/winixd/core/config.h
-env.o: ../../../winix/winixd/core/htmlfilter.h
-env.o: ../../../winix/winixd/core/log.h
+env.o: ../../../pikotools/textstream/types.h
+env.o: ../../../winix/winixd/core/winixbase.h
+env.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 env.o: ../../../winix/winixd/core/textstream.h
 env.o: ../../../winix/winixd/core/logmanipulators.h
 env.o: ../../../winix/winixd/core/filelog.h
-env.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+env.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+env.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
+env.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+env.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+env.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+env.o: changepatterns.h ../../../winix/winixd/core/cur.h
 env.o: ../../../winix/winixd/core/request.h
 env.o: ../../../winix/winixd/core/requesttypes.h
 env.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h
@@ -714,13 +731,10 @@ env.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h
 env.o: ../../../winix/winixd/core/plugindata.h
 env.o: ../../../winix/winixd/core/rebus.h
 env.o: ../../../winix/winixd/core/winixbase.h
-env.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-env.o: ../../../winix/winixd/core/lock.h ../../../winix/winixd/core/synchro.h
 env.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 env.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 env.o: ../../../winix/winixd/core/basethread.h
 env.o: ../../../winix/winixd/core/winixmodel.h
-env.o: ../../../winix/winixd/core/winixbase.h
 env.o: ../../../winix/winixd/core/plugin.h
 env.o: ../../../winix/winixd/core/pluginmsg.h
 env.o: ../../../winix/winixd/core/dirs.h
@@ -763,14 +777,13 @@ env.o: ../../../winix/winixd/core/system.h
 env.o: ../../../winix/winixd/core/sessionidmanager.h
 env.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 env.o: ../../../winix/winixd/core/htmlfilter.h
-env.o: ../../../winix/winixd/core/misc.h
+env.o: ../../../winix/winixd/core/winixrequest.h
+env.o: ../../../winix/winixd/core/winixsystem.h
+env.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/misc.h
 env.o: ../../../winix/winixd/core/winix_const.h
 env.o: ../../../winix/winixd/functions/functions.h
 env.o: ../../../winix/winixd/functions/functionbase.h
 env.o: ../../../winix/winixd/core/request.h
-env.o: ../../../winix/winixd/core/winixrequest.h
-env.o: ../../../winix/winixd/core/winixsystem.h
-env.o: ../../../winix/winixd/core/slog.h
 env.o: ../../../winix/winixd/functions/functionparser.h
 env.o: ../../../winix/winixd/functions/account.h
 env.o: ../../../winix/winixd/functions/adduser.h
@@ -830,17 +843,21 @@ filters.o: ../../../pikotools/convert/inttostr.h
 filters.o: ../../../pikotools/convert/strtoint.h
 filters.o: ../../../pikotools/convert/text.h
 filters.o: ../../../pikotools/membuffer/membuffer.h
-filters.o: ../../../pikotools/textstream/types.h htmltextstream.h
-filters.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-filters.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-filters.o: changepatterns.h ../../../winix/winixd/core/config.h
-filters.o: ../../../winix/winixd/core/htmlfilter.h
+filters.o: ../../../pikotools/textstream/types.h
+filters.o: ../../../winix/winixd/core/winixbase.h
+filters.o: ../../../winix/winixd/core/config.h
 filters.o: ../../../winix/winixd/core/log.h
 filters.o: ../../../winix/winixd/core/textstream.h
 filters.o: ../../../winix/winixd/core/logmanipulators.h
 filters.o: ../../../winix/winixd/core/filelog.h
 filters.o: ../../../winix/winixd/core/synchro.h
-filters.o: ../../../winix/winixd/core/cur.h
+filters.o: ../../../winix/winixd/core/log.h
+filters.o: ../../../winix/winixd/core/filelog.h
+filters.o: ../../../winix/winixd/core/lock.h
+filters.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+filters.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+filters.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+filters.o: changepatterns.h ../../../winix/winixd/core/cur.h
 filters.o: ../../../winix/winixd/core/request.h
 filters.o: ../../../winix/winixd/core/requesttypes.h
 filters.o: ../../../winix/winixd/core/error.h
@@ -852,17 +869,12 @@ filters.o: ../../../winix/winixd/core/user.h
 filters.o: ../../../winix/winixd/core/plugindata.h
 filters.o: ../../../winix/winixd/core/rebus.h
 filters.o: ../../../winix/winixd/core/winixbase.h
-filters.o: ../../../winix/winixd/core/log.h
-filters.o: ../../../winix/winixd/core/filelog.h
-filters.o: ../../../winix/winixd/core/lock.h
-filters.o: ../../../winix/winixd/core/synchro.h
 filters.o: ../../../winix/winixd/core/ipban.h
 filters.o: ../../../winix/winixd/core/mount.h
 filters.o: ../../../winix/winixd/core/system.h
 filters.o: ../../../winix/winixd/core/job.h
 filters.o: ../../../winix/winixd/core/basethread.h
 filters.o: ../../../winix/winixd/core/winixmodel.h
-filters.o: ../../../winix/winixd/core/winixbase.h
 filters.o: ../../../winix/winixd/core/plugin.h
 filters.o: ../../../winix/winixd/core/pluginmsg.h
 filters.o: ../../../winix/winixd/core/dirs.h
@@ -908,6 +920,9 @@ filters.o: ../../../winix/winixd/core/system.h
 filters.o: ../../../winix/winixd/core/sessionidmanager.h
 filters.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 filters.o: ../../../winix/winixd/core/htmlfilter.h
+filters.o: ../../../winix/winixd/core/winixrequest.h
+filters.o: ../../../winix/winixd/core/winixsystem.h
+filters.o: ../../../winix/winixd/core/slog.h
 filters.o: ../../../winix/winixd/core/misc.h
 filters.o: ../../../winix/winixd/core/winix_const.h
 generic.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
@@ -927,17 +942,21 @@ generic.o: ../../../pikotools/convert/inttostr.h
 generic.o: ../../../pikotools/convert/strtoint.h
 generic.o: ../../../pikotools/convert/text.h
 generic.o: ../../../pikotools/membuffer/membuffer.h
-generic.o: ../../../pikotools/textstream/types.h htmltextstream.h
-generic.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-generic.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-generic.o: changepatterns.h ../../../winix/winixd/core/config.h
-generic.o: ../../../winix/winixd/core/htmlfilter.h
+generic.o: ../../../pikotools/textstream/types.h
+generic.o: ../../../winix/winixd/core/winixbase.h
+generic.o: ../../../winix/winixd/core/config.h
 generic.o: ../../../winix/winixd/core/log.h
 generic.o: ../../../winix/winixd/core/textstream.h
 generic.o: ../../../winix/winixd/core/logmanipulators.h
 generic.o: ../../../winix/winixd/core/filelog.h
 generic.o: ../../../winix/winixd/core/synchro.h
-generic.o: ../../../winix/winixd/core/cur.h
+generic.o: ../../../winix/winixd/core/log.h
+generic.o: ../../../winix/winixd/core/filelog.h
+generic.o: ../../../winix/winixd/core/lock.h
+generic.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+generic.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+generic.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+generic.o: changepatterns.h ../../../winix/winixd/core/cur.h
 generic.o: ../../../winix/winixd/core/request.h
 generic.o: ../../../winix/winixd/core/requesttypes.h
 generic.o: ../../../winix/winixd/core/error.h
@@ -949,17 +968,12 @@ generic.o: ../../../winix/winixd/core/user.h
 generic.o: ../../../winix/winixd/core/plugindata.h
 generic.o: ../../../winix/winixd/core/rebus.h
 generic.o: ../../../winix/winixd/core/winixbase.h
-generic.o: ../../../winix/winixd/core/log.h
-generic.o: ../../../winix/winixd/core/filelog.h
-generic.o: ../../../winix/winixd/core/lock.h
-generic.o: ../../../winix/winixd/core/synchro.h
 generic.o: ../../../winix/winixd/core/ipban.h
 generic.o: ../../../winix/winixd/core/mount.h
 generic.o: ../../../winix/winixd/core/system.h
 generic.o: ../../../winix/winixd/core/job.h
 generic.o: ../../../winix/winixd/core/basethread.h
 generic.o: ../../../winix/winixd/core/winixmodel.h
-generic.o: ../../../winix/winixd/core/winixbase.h
 generic.o: ../../../winix/winixd/core/plugin.h
 generic.o: ../../../winix/winixd/core/pluginmsg.h
 generic.o: ../../../winix/winixd/core/dirs.h
@@ -1005,31 +1019,13 @@ generic.o: ../../../winix/winixd/core/system.h
 generic.o: ../../../winix/winixd/core/sessionidmanager.h
 generic.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 generic.o: ../../../winix/winixd/core/htmlfilter.h
+generic.o: ../../../winix/winixd/core/winixrequest.h
+generic.o: ../../../winix/winixd/core/winixsystem.h
+generic.o: ../../../winix/winixd/core/slog.h
 generic.o: ../../../winix/winixd/core/request.h
 generic.o: ../../../winix/winixd/core/misc.h
 generic.o: ../../../winix/winixd/core/winix_const.h
 htmltextstream.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
-htmltextstream.o: misc.h localefilter.h locale.h
-htmltextstream.o: ../../../pikotools/space/spaceparser.h
-htmltextstream.o: ../../../pikotools/space/space.h
-htmltextstream.o: ../../../pikotools/textstream/types.h
-htmltextstream.o: ../../../pikotools/textstream/textstream.h
-htmltextstream.o: ../../../pikotools/space/space.h
-htmltextstream.o: ../../../pikotools/date/date.h
-htmltextstream.o: ../../../pikotools/convert/convert.h
-htmltextstream.o: ../../../pikotools/convert/inttostr.h
-htmltextstream.o: ../../../pikotools/convert/strtoint.h
-htmltextstream.o: ../../../pikotools/convert/text.h
-htmltextstream.o: ../../../pikotools/membuffer/membuffer.h
-htmltextstream.o: ../../../pikotools/textstream/types.h
-htmltextstream.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
-htmltextstream.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
-htmltextstream.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
-htmltextstream.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
-htmltextstream.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
-htmltextstream.o: ../../../ezc/src/outstreams.h
-htmltextstream.o: ../../../ezc/src/expressionparser.h
-htmltextstream.o: ../../../ezc/src/patternparser.h
 indexpatterns.o: indexpatterns.h ../../../ezc/src/ezc.h
 indexpatterns.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
 indexpatterns.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
@@ -1048,10 +1044,20 @@ indexpatterns.o: ../../../pikotools/convert/convert.h
 indexpatterns.o: ../../../pikotools/convert/inttostr.h
 indexpatterns.o: ../../../pikotools/convert/strtoint.h
 indexpatterns.o: ../../../pikotools/convert/text.h misc.h localefilter.h
-indexpatterns.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
+indexpatterns.o: ../../../winix/winixd/core/winixbase.h
+indexpatterns.o: ../../../winix/winixd/core/config.h
+indexpatterns.o: ../../../winix/winixd/core/log.h
+indexpatterns.o: ../../../winix/winixd/core/textstream.h
+indexpatterns.o: ../../../winix/winixd/core/logmanipulators.h
+indexpatterns.o: ../../../winix/winixd/core/filelog.h
+indexpatterns.o: ../../../winix/winixd/core/synchro.h
+indexpatterns.o: ../../../winix/winixd/core/log.h
+indexpatterns.o: ../../../winix/winixd/core/filelog.h
+indexpatterns.o: ../../../winix/winixd/core/lock.h
+indexpatterns.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+indexpatterns.o: ../../../winix/winixd/core/textstream.h
 indexpatterns.o: ../../../pikotools/membuffer/membuffer.h
 indexpatterns.o: ../../../pikotools/textstream/types.h
-indexpatterns.o: ../../../winix/winixd/core/log.h
 insert.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 insert.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 insert.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -1069,17 +1075,21 @@ insert.o: ../../../pikotools/convert/inttostr.h
 insert.o: ../../../pikotools/convert/strtoint.h
 insert.o: ../../../pikotools/convert/text.h
 insert.o: ../../../pikotools/membuffer/membuffer.h
-insert.o: ../../../pikotools/textstream/types.h htmltextstream.h
-insert.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-insert.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-insert.o: changepatterns.h ../../../winix/winixd/core/config.h
-insert.o: ../../../winix/winixd/core/htmlfilter.h
+insert.o: ../../../pikotools/textstream/types.h
+insert.o: ../../../winix/winixd/core/winixbase.h
+insert.o: ../../../winix/winixd/core/config.h
 insert.o: ../../../winix/winixd/core/log.h
 insert.o: ../../../winix/winixd/core/textstream.h
 insert.o: ../../../winix/winixd/core/logmanipulators.h
 insert.o: ../../../winix/winixd/core/filelog.h
 insert.o: ../../../winix/winixd/core/synchro.h
-insert.o: ../../../winix/winixd/core/cur.h
+insert.o: ../../../winix/winixd/core/log.h
+insert.o: ../../../winix/winixd/core/filelog.h
+insert.o: ../../../winix/winixd/core/lock.h
+insert.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+insert.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+insert.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+insert.o: changepatterns.h ../../../winix/winixd/core/cur.h
 insert.o: ../../../winix/winixd/core/request.h
 insert.o: ../../../winix/winixd/core/requesttypes.h
 insert.o: ../../../winix/winixd/core/error.h
@@ -1091,17 +1101,12 @@ insert.o: ../../../winix/winixd/core/user.h
 insert.o: ../../../winix/winixd/core/plugindata.h
 insert.o: ../../../winix/winixd/core/rebus.h
 insert.o: ../../../winix/winixd/core/winixbase.h
-insert.o: ../../../winix/winixd/core/log.h
-insert.o: ../../../winix/winixd/core/filelog.h
-insert.o: ../../../winix/winixd/core/lock.h
-insert.o: ../../../winix/winixd/core/synchro.h
 insert.o: ../../../winix/winixd/core/ipban.h
 insert.o: ../../../winix/winixd/core/mount.h
 insert.o: ../../../winix/winixd/core/system.h
 insert.o: ../../../winix/winixd/core/job.h
 insert.o: ../../../winix/winixd/core/basethread.h
 insert.o: ../../../winix/winixd/core/winixmodel.h
-insert.o: ../../../winix/winixd/core/winixbase.h
 insert.o: ../../../winix/winixd/core/plugin.h
 insert.o: ../../../winix/winixd/core/pluginmsg.h
 insert.o: ../../../winix/winixd/core/dirs.h
@@ -1146,6 +1151,9 @@ insert.o: ../../../winix/winixd/core/system.h
 insert.o: ../../../winix/winixd/core/sessionidmanager.h
 insert.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 insert.o: ../../../winix/winixd/core/htmlfilter.h
+insert.o: ../../../winix/winixd/core/winixrequest.h
+insert.o: ../../../winix/winixd/core/winixsystem.h
+insert.o: ../../../winix/winixd/core/slog.h
 insert.o: ../../../winix/winixd/core/request.h
 insert.o: ../../../winix/winixd/core/misc.h
 insert.o: ../../../winix/winixd/core/winix_const.h
@@ -1166,17 +1174,20 @@ ipban.o: ../../../pikotools/convert/inttostr.h
 ipban.o: ../../../pikotools/convert/strtoint.h
 ipban.o: ../../../pikotools/convert/text.h
 ipban.o: ../../../pikotools/membuffer/membuffer.h
-ipban.o: ../../../pikotools/textstream/types.h htmltextstream.h
-ipban.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-ipban.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-ipban.o: changepatterns.h ../../../winix/winixd/core/config.h
-ipban.o: ../../../winix/winixd/core/htmlfilter.h
-ipban.o: ../../../winix/winixd/core/log.h
+ipban.o: ../../../pikotools/textstream/types.h
+ipban.o: ../../../winix/winixd/core/winixbase.h
+ipban.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 ipban.o: ../../../winix/winixd/core/textstream.h
 ipban.o: ../../../winix/winixd/core/logmanipulators.h
 ipban.o: ../../../winix/winixd/core/filelog.h
 ipban.o: ../../../winix/winixd/core/synchro.h
-ipban.o: ../../../winix/winixd/core/cur.h
+ipban.o: ../../../winix/winixd/core/log.h
+ipban.o: ../../../winix/winixd/core/filelog.h
+ipban.o: ../../../winix/winixd/core/lock.h
+ipban.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+ipban.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+ipban.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+ipban.o: changepatterns.h ../../../winix/winixd/core/cur.h
 ipban.o: ../../../winix/winixd/core/request.h
 ipban.o: ../../../winix/winixd/core/requesttypes.h
 ipban.o: ../../../winix/winixd/core/error.h
@@ -1188,16 +1199,11 @@ ipban.o: ../../../winix/winixd/core/user.h
 ipban.o: ../../../winix/winixd/core/plugindata.h
 ipban.o: ../../../winix/winixd/core/rebus.h
 ipban.o: ../../../winix/winixd/core/winixbase.h
-ipban.o: ../../../winix/winixd/core/log.h
-ipban.o: ../../../winix/winixd/core/filelog.h
-ipban.o: ../../../winix/winixd/core/lock.h
-ipban.o: ../../../winix/winixd/core/synchro.h
 ipban.o: ../../../winix/winixd/core/ipban.h
 ipban.o: ../../../winix/winixd/core/mount.h
 ipban.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 ipban.o: ../../../winix/winixd/core/basethread.h
 ipban.o: ../../../winix/winixd/core/winixmodel.h
-ipban.o: ../../../winix/winixd/core/winixbase.h
 ipban.o: ../../../winix/winixd/core/plugin.h
 ipban.o: ../../../winix/winixd/core/pluginmsg.h
 ipban.o: ../../../winix/winixd/core/dirs.h
@@ -1240,14 +1246,14 @@ ipban.o: ../../../winix/winixd/core/system.h
 ipban.o: ../../../winix/winixd/core/sessionidmanager.h
 ipban.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 ipban.o: ../../../winix/winixd/core/htmlfilter.h
+ipban.o: ../../../winix/winixd/core/winixrequest.h
+ipban.o: ../../../winix/winixd/core/winixsystem.h
+ipban.o: ../../../winix/winixd/core/slog.h
 ipban.o: ../../../winix/winixd/core/request.h
 ipban.o: ../../../winix/winixd/core/misc.h
 ipban.o: ../../../winix/winixd/core/winix_const.h
 ipban.o: ../../../winix/winixd/functions/functions.h
 ipban.o: ../../../winix/winixd/functions/functionbase.h
-ipban.o: ../../../winix/winixd/core/winixrequest.h
-ipban.o: ../../../winix/winixd/core/winixsystem.h
-ipban.o: ../../../winix/winixd/core/slog.h
 ipban.o: ../../../winix/winixd/functions/functionparser.h
 ipban.o: ../../../winix/winixd/functions/account.h
 ipban.o: ../../../winix/winixd/functions/adduser.h
@@ -1307,16 +1313,19 @@ item.o: ../../../pikotools/convert/inttostr.h
 item.o: ../../../pikotools/convert/strtoint.h
 item.o: ../../../pikotools/convert/text.h
 item.o: ../../../pikotools/membuffer/membuffer.h
-item.o: ../../../pikotools/textstream/types.h htmltextstream.h
-item.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-item.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-item.o: changepatterns.h ../../../winix/winixd/core/config.h
-item.o: ../../../winix/winixd/core/htmlfilter.h
-item.o: ../../../winix/winixd/core/log.h
+item.o: ../../../pikotools/textstream/types.h
+item.o: ../../../winix/winixd/core/winixbase.h
+item.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 item.o: ../../../winix/winixd/core/textstream.h
 item.o: ../../../winix/winixd/core/logmanipulators.h
 item.o: ../../../winix/winixd/core/filelog.h
-item.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+item.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+item.o: ../../../winix/winixd/core/filelog.h
+item.o: ../../../winix/winixd/core/lock.h
+item.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+item.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+item.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+item.o: changepatterns.h ../../../winix/winixd/core/cur.h
 item.o: ../../../winix/winixd/core/request.h
 item.o: ../../../winix/winixd/core/requesttypes.h
 item.o: ../../../winix/winixd/core/error.h
@@ -1328,14 +1337,10 @@ item.o: ../../../winix/winixd/core/user.h
 item.o: ../../../winix/winixd/core/plugindata.h
 item.o: ../../../winix/winixd/core/rebus.h
 item.o: ../../../winix/winixd/core/winixbase.h
-item.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-item.o: ../../../winix/winixd/core/lock.h
-item.o: ../../../winix/winixd/core/synchro.h
 item.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 item.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 item.o: ../../../winix/winixd/core/basethread.h
 item.o: ../../../winix/winixd/core/winixmodel.h
-item.o: ../../../winix/winixd/core/winixbase.h
 item.o: ../../../winix/winixd/core/plugin.h
 item.o: ../../../winix/winixd/core/pluginmsg.h
 item.o: ../../../winix/winixd/core/dirs.h
@@ -1378,10 +1383,14 @@ item.o: ../../../winix/winixd/core/system.h
 item.o: ../../../winix/winixd/core/sessionidmanager.h
 item.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 item.o: ../../../winix/winixd/core/htmlfilter.h
+item.o: ../../../winix/winixd/core/winixrequest.h
+item.o: ../../../winix/winixd/core/winixsystem.h
+item.o: ../../../winix/winixd/core/slog.h
 item.o: ../../../winix/winixd/core/request.h
 item.o: ../../../winix/winixd/core/misc.h
 item.o: ../../../winix/winixd/core/winix_const.h
-item.o: ../../../winix/winixd/core/bbcodeparser.h miscspace.h
+item.o: ../../../winix/winixd/core/bbcodeparser.h
+item.o: ../../../winix/winixd/core/htmlfilter.h miscspace.h
 last.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 last.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 last.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -1399,16 +1408,19 @@ last.o: ../../../pikotools/convert/inttostr.h
 last.o: ../../../pikotools/convert/strtoint.h
 last.o: ../../../pikotools/convert/text.h
 last.o: ../../../pikotools/membuffer/membuffer.h
-last.o: ../../../pikotools/textstream/types.h htmltextstream.h
-last.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-last.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-last.o: changepatterns.h ../../../winix/winixd/core/config.h
-last.o: ../../../winix/winixd/core/htmlfilter.h
-last.o: ../../../winix/winixd/core/log.h
+last.o: ../../../pikotools/textstream/types.h
+last.o: ../../../winix/winixd/core/winixbase.h
+last.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 last.o: ../../../winix/winixd/core/textstream.h
 last.o: ../../../winix/winixd/core/logmanipulators.h
 last.o: ../../../winix/winixd/core/filelog.h
-last.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+last.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+last.o: ../../../winix/winixd/core/filelog.h
+last.o: ../../../winix/winixd/core/lock.h
+last.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+last.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+last.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+last.o: changepatterns.h ../../../winix/winixd/core/cur.h
 last.o: ../../../winix/winixd/core/request.h
 last.o: ../../../winix/winixd/core/requesttypes.h
 last.o: ../../../winix/winixd/core/error.h
@@ -1420,14 +1432,10 @@ last.o: ../../../winix/winixd/core/user.h
 last.o: ../../../winix/winixd/core/plugindata.h
 last.o: ../../../winix/winixd/core/rebus.h
 last.o: ../../../winix/winixd/core/winixbase.h
-last.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-last.o: ../../../winix/winixd/core/lock.h
-last.o: ../../../winix/winixd/core/synchro.h
 last.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 last.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 last.o: ../../../winix/winixd/core/basethread.h
 last.o: ../../../winix/winixd/core/winixmodel.h
-last.o: ../../../winix/winixd/core/winixbase.h
 last.o: ../../../winix/winixd/core/plugin.h
 last.o: ../../../winix/winixd/core/pluginmsg.h
 last.o: ../../../winix/winixd/core/dirs.h
@@ -1469,7 +1477,10 @@ last.o: ../../../winix/winixd/core/ipbancontainer.h
 last.o: ../../../winix/winixd/core/system.h
 last.o: ../../../winix/winixd/core/sessionidmanager.h
 last.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
-last.o: ../../../winix/winixd/core/htmlfilter.h ../core/lastcontainer.h
+last.o: ../../../winix/winixd/core/htmlfilter.h
+last.o: ../../../winix/winixd/core/winixrequest.h
+last.o: ../../../winix/winixd/core/winixsystem.h
+last.o: ../../../winix/winixd/core/slog.h ../core/lastcontainer.h
 last.o: ../core/request.h ../core/misc.h
 last.o: ../../../winix/winixd/core/winix_const.h
 locale.o: locale.h ../../../pikotools/space/spaceparser.h
@@ -1487,11 +1498,22 @@ locale.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
 locale.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
 locale.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
 locale.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
-locale.o: ../../../ezc/src/patternparser.h htmltextstream.h
+locale.o: ../../../ezc/src/patternparser.h
+locale.o: ../../../winix/winixd/core/winixbase.h
+locale.o: ../../../winix/winixd/core/config.h
+locale.o: ../../../winix/winixd/core/log.h
+locale.o: ../../../winix/winixd/core/textstream.h
+locale.o: ../../../winix/winixd/core/logmanipulators.h
+locale.o: ../../../winix/winixd/core/filelog.h
+locale.o: ../../../winix/winixd/core/synchro.h
+locale.o: ../../../winix/winixd/core/log.h
+locale.o: ../../../winix/winixd/core/filelog.h
+locale.o: ../../../winix/winixd/core/lock.h
+locale.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
 locale.o: ../../../winix/winixd/core/textstream.h
 locale.o: ../../../pikotools/membuffer/membuffer.h
 locale.o: ../../../pikotools/textstream/types.h
-locale.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/misc.h
+locale.o: ../../../winix/winixd/core/misc.h
 locale.o: ../../../winix/winixd/core/requesttypes.h
 locale.o: ../../../winix/winixd/core/winix_const.h
 localefilter.o: localefilter.h locale.h
@@ -1515,7 +1537,19 @@ localefilter.o: ../../../ezc/src/expressionparser.h
 localefilter.o: ../../../ezc/src/patternparser.h htmltextstream.h
 localefilter.o: ../../../winix/winixd/core/textstream.h
 localefilter.o: ../../../pikotools/membuffer/membuffer.h
-localefilter.o: ../../../pikotools/textstream/types.h ../core/misc.h
+localefilter.o: ../../../pikotools/textstream/types.h
+localefilter.o: ../../../winix/winixd/core/winixbase.h
+localefilter.o: ../../../winix/winixd/core/config.h
+localefilter.o: ../../../winix/winixd/core/log.h
+localefilter.o: ../../../winix/winixd/core/textstream.h
+localefilter.o: ../../../winix/winixd/core/logmanipulators.h
+localefilter.o: ../../../winix/winixd/core/filelog.h
+localefilter.o: ../../../winix/winixd/core/synchro.h
+localefilter.o: ../../../winix/winixd/core/log.h
+localefilter.o: ../../../winix/winixd/core/filelog.h
+localefilter.o: ../../../winix/winixd/core/lock.h
+localefilter.o: ../../../winix/winixd/core/synchro.h
+localefilter.o: ../../../winix/winixd/core/misc.h
 localefilter.o: ../../../winix/winixd/core/requesttypes.h
 localefilter.o: ../../../winix/winixd/core/winix_const.h
 login.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
@@ -1535,17 +1569,20 @@ login.o: ../../../pikotools/convert/inttostr.h
 login.o: ../../../pikotools/convert/strtoint.h
 login.o: ../../../pikotools/convert/text.h
 login.o: ../../../pikotools/membuffer/membuffer.h
-login.o: ../../../pikotools/textstream/types.h htmltextstream.h
-login.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-login.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-login.o: changepatterns.h ../../../winix/winixd/core/config.h
-login.o: ../../../winix/winixd/core/htmlfilter.h
-login.o: ../../../winix/winixd/core/log.h
+login.o: ../../../pikotools/textstream/types.h
+login.o: ../../../winix/winixd/core/winixbase.h
+login.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 login.o: ../../../winix/winixd/core/textstream.h
 login.o: ../../../winix/winixd/core/logmanipulators.h
 login.o: ../../../winix/winixd/core/filelog.h
 login.o: ../../../winix/winixd/core/synchro.h
-login.o: ../../../winix/winixd/core/cur.h
+login.o: ../../../winix/winixd/core/log.h
+login.o: ../../../winix/winixd/core/filelog.h
+login.o: ../../../winix/winixd/core/lock.h
+login.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+login.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+login.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+login.o: changepatterns.h ../../../winix/winixd/core/cur.h
 login.o: ../../../winix/winixd/core/request.h
 login.o: ../../../winix/winixd/core/requesttypes.h
 login.o: ../../../winix/winixd/core/error.h
@@ -1557,16 +1594,11 @@ login.o: ../../../winix/winixd/core/user.h
 login.o: ../../../winix/winixd/core/plugindata.h
 login.o: ../../../winix/winixd/core/rebus.h
 login.o: ../../../winix/winixd/core/winixbase.h
-login.o: ../../../winix/winixd/core/log.h
-login.o: ../../../winix/winixd/core/filelog.h
-login.o: ../../../winix/winixd/core/lock.h
-login.o: ../../../winix/winixd/core/synchro.h
 login.o: ../../../winix/winixd/core/ipban.h
 login.o: ../../../winix/winixd/core/mount.h
 login.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 login.o: ../../../winix/winixd/core/basethread.h
 login.o: ../../../winix/winixd/core/winixmodel.h
-login.o: ../../../winix/winixd/core/winixbase.h
 login.o: ../../../winix/winixd/core/plugin.h
 login.o: ../../../winix/winixd/core/pluginmsg.h
 login.o: ../../../winix/winixd/core/dirs.h
@@ -1609,12 +1641,12 @@ login.o: ../../../winix/winixd/core/system.h
 login.o: ../../../winix/winixd/core/sessionidmanager.h
 login.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 login.o: ../../../winix/winixd/core/htmlfilter.h
-login.o: ../../../winix/winixd/functions/functions.h
-login.o: ../../../winix/winixd/functions/functionbase.h
-login.o: ../../../winix/winixd/core/request.h
 login.o: ../../../winix/winixd/core/winixrequest.h
 login.o: ../../../winix/winixd/core/winixsystem.h
 login.o: ../../../winix/winixd/core/slog.h
+login.o: ../../../winix/winixd/functions/functions.h
+login.o: ../../../winix/winixd/functions/functionbase.h
+login.o: ../../../winix/winixd/core/request.h
 login.o: ../../../winix/winixd/functions/functionparser.h
 login.o: ../../../winix/winixd/functions/account.h
 login.o: ../../../winix/winixd/functions/adduser.h
@@ -1672,16 +1704,18 @@ ls.o: ../../../pikotools/convert/convert.h
 ls.o: ../../../pikotools/convert/inttostr.h
 ls.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
 ls.o: ../../../pikotools/membuffer/membuffer.h
-ls.o: ../../../pikotools/textstream/types.h htmltextstream.h
-ls.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-ls.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-ls.o: changepatterns.h ../../../winix/winixd/core/config.h
-ls.o: ../../../winix/winixd/core/htmlfilter.h
-ls.o: ../../../winix/winixd/core/log.h
+ls.o: ../../../pikotools/textstream/types.h
+ls.o: ../../../winix/winixd/core/winixbase.h
+ls.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 ls.o: ../../../winix/winixd/core/textstream.h
 ls.o: ../../../winix/winixd/core/logmanipulators.h
 ls.o: ../../../winix/winixd/core/filelog.h
-ls.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+ls.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+ls.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
+ls.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+ls.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+ls.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+ls.o: changepatterns.h ../../../winix/winixd/core/cur.h
 ls.o: ../../../winix/winixd/core/request.h
 ls.o: ../../../winix/winixd/core/requesttypes.h
 ls.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h
@@ -1690,14 +1724,11 @@ ls.o: ../../../pikotools/space/spacetojson.h
 ls.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h
 ls.o: ../../../winix/winixd/core/plugindata.h
 ls.o: ../../../winix/winixd/core/rebus.h
-ls.o: ../../../winix/winixd/core/winixbase.h ../../../winix/winixd/core/log.h
-ls.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
-ls.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/ipban.h
-ls.o: ../../../winix/winixd/core/mount.h ../../../winix/winixd/core/system.h
-ls.o: ../../../winix/winixd/core/job.h
+ls.o: ../../../winix/winixd/core/winixbase.h
+ls.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
+ls.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 ls.o: ../../../winix/winixd/core/basethread.h
 ls.o: ../../../winix/winixd/core/winixmodel.h
-ls.o: ../../../winix/winixd/core/winixbase.h
 ls.o: ../../../winix/winixd/core/plugin.h
 ls.o: ../../../winix/winixd/core/pluginmsg.h
 ls.o: ../../../winix/winixd/core/dirs.h
@@ -1738,7 +1769,9 @@ ls.o: ../../../winix/winixd/core/system.h
 ls.o: ../../../winix/winixd/core/sessionidmanager.h
 ls.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 ls.o: ../../../winix/winixd/core/htmlfilter.h
-ls.o: ../../../winix/winixd/core/request.h
+ls.o: ../../../winix/winixd/core/winixrequest.h
+ls.o: ../../../winix/winixd/core/winixsystem.h
+ls.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h
 man.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 man.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 man.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -1755,16 +1788,18 @@ man.o: ../../../pikotools/convert/inttostr.h
 man.o: ../../../pikotools/convert/strtoint.h
 man.o: ../../../pikotools/convert/text.h
 man.o: ../../../pikotools/membuffer/membuffer.h
-man.o: ../../../pikotools/textstream/types.h htmltextstream.h
-man.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-man.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-man.o: changepatterns.h ../../../winix/winixd/core/config.h
-man.o: ../../../winix/winixd/core/htmlfilter.h
-man.o: ../../../winix/winixd/core/log.h
+man.o: ../../../pikotools/textstream/types.h
+man.o: ../../../winix/winixd/core/winixbase.h
+man.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 man.o: ../../../winix/winixd/core/textstream.h
 man.o: ../../../winix/winixd/core/logmanipulators.h
 man.o: ../../../winix/winixd/core/filelog.h
-man.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+man.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+man.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
+man.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+man.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+man.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+man.o: changepatterns.h ../../../winix/winixd/core/cur.h
 man.o: ../../../winix/winixd/core/request.h
 man.o: ../../../winix/winixd/core/requesttypes.h
 man.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h
@@ -1774,13 +1809,10 @@ man.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h
 man.o: ../../../winix/winixd/core/plugindata.h
 man.o: ../../../winix/winixd/core/rebus.h
 man.o: ../../../winix/winixd/core/winixbase.h
-man.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-man.o: ../../../winix/winixd/core/lock.h ../../../winix/winixd/core/synchro.h
 man.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 man.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 man.o: ../../../winix/winixd/core/basethread.h
 man.o: ../../../winix/winixd/core/winixmodel.h
-man.o: ../../../winix/winixd/core/winixbase.h
 man.o: ../../../winix/winixd/core/plugin.h
 man.o: ../../../winix/winixd/core/pluginmsg.h
 man.o: ../../../winix/winixd/core/dirs.h
@@ -1823,13 +1855,13 @@ man.o: ../../../winix/winixd/core/system.h
 man.o: ../../../winix/winixd/core/sessionidmanager.h
 man.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 man.o: ../../../winix/winixd/core/htmlfilter.h
-man.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/misc.h
+man.o: ../../../winix/winixd/core/winixrequest.h
+man.o: ../../../winix/winixd/core/winixsystem.h
+man.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h
+man.o: ../../../winix/winixd/core/misc.h
 man.o: ../../../winix/winixd/core/winix_const.h
 man.o: ../../../winix/winixd/functions/functions.h
 man.o: ../../../winix/winixd/functions/functionbase.h
-man.o: ../../../winix/winixd/core/winixrequest.h
-man.o: ../../../winix/winixd/core/winixsystem.h
-man.o: ../../../winix/winixd/core/slog.h
 man.o: ../../../winix/winixd/functions/functionparser.h
 man.o: ../../../winix/winixd/functions/account.h
 man.o: ../../../winix/winixd/functions/adduser.h
@@ -1889,16 +1921,19 @@ misc.o: ../../../pikotools/convert/inttostr.h
 misc.o: ../../../pikotools/convert/strtoint.h
 misc.o: ../../../pikotools/convert/text.h
 misc.o: ../../../pikotools/membuffer/membuffer.h
-misc.o: ../../../pikotools/textstream/types.h htmltextstream.h
-misc.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-misc.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-misc.o: changepatterns.h ../../../winix/winixd/core/config.h
-misc.o: ../../../winix/winixd/core/htmlfilter.h
-misc.o: ../../../winix/winixd/core/log.h
+misc.o: ../../../pikotools/textstream/types.h
+misc.o: ../../../winix/winixd/core/winixbase.h
+misc.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 misc.o: ../../../winix/winixd/core/textstream.h
 misc.o: ../../../winix/winixd/core/logmanipulators.h
 misc.o: ../../../winix/winixd/core/filelog.h
-misc.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+misc.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+misc.o: ../../../winix/winixd/core/filelog.h
+misc.o: ../../../winix/winixd/core/lock.h
+misc.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+misc.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+misc.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+misc.o: changepatterns.h ../../../winix/winixd/core/cur.h
 misc.o: ../../../winix/winixd/core/request.h
 misc.o: ../../../winix/winixd/core/requesttypes.h
 misc.o: ../../../winix/winixd/core/error.h
@@ -1910,14 +1945,10 @@ misc.o: ../../../winix/winixd/core/user.h
 misc.o: ../../../winix/winixd/core/plugindata.h
 misc.o: ../../../winix/winixd/core/rebus.h
 misc.o: ../../../winix/winixd/core/winixbase.h
-misc.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-misc.o: ../../../winix/winixd/core/lock.h
-misc.o: ../../../winix/winixd/core/synchro.h
 misc.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 misc.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 misc.o: ../../../winix/winixd/core/basethread.h
 misc.o: ../../../winix/winixd/core/winixmodel.h
-misc.o: ../../../winix/winixd/core/winixbase.h
 misc.o: ../../../winix/winixd/core/plugin.h
 misc.o: ../../../winix/winixd/core/pluginmsg.h
 misc.o: ../../../winix/winixd/core/dirs.h
@@ -1960,7 +1991,9 @@ misc.o: ../../../winix/winixd/core/system.h
 misc.o: ../../../winix/winixd/core/sessionidmanager.h
 misc.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 misc.o: ../../../winix/winixd/core/htmlfilter.h
-misc.o: ../../../winix/winixd/core/misc.h
+misc.o: ../../../winix/winixd/core/winixrequest.h
+misc.o: ../../../winix/winixd/core/winixsystem.h
+misc.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/misc.h
 misc.o: ../../../winix/winixd/core/winix_const.h
 misc.o: ../../../winix/winixd/core/request.h
 miscspace.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
@@ -1981,17 +2014,21 @@ miscspace.o: ../../../pikotools/convert/inttostr.h
 miscspace.o: ../../../pikotools/convert/strtoint.h
 miscspace.o: ../../../pikotools/convert/text.h
 miscspace.o: ../../../pikotools/membuffer/membuffer.h
-miscspace.o: ../../../pikotools/textstream/types.h htmltextstream.h
-miscspace.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-miscspace.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-miscspace.o: changepatterns.h ../../../winix/winixd/core/config.h
-miscspace.o: ../../../winix/winixd/core/htmlfilter.h
+miscspace.o: ../../../pikotools/textstream/types.h
+miscspace.o: ../../../winix/winixd/core/winixbase.h
+miscspace.o: ../../../winix/winixd/core/config.h
 miscspace.o: ../../../winix/winixd/core/log.h
 miscspace.o: ../../../winix/winixd/core/textstream.h
 miscspace.o: ../../../winix/winixd/core/logmanipulators.h
 miscspace.o: ../../../winix/winixd/core/filelog.h
 miscspace.o: ../../../winix/winixd/core/synchro.h
-miscspace.o: ../../../winix/winixd/core/cur.h
+miscspace.o: ../../../winix/winixd/core/log.h
+miscspace.o: ../../../winix/winixd/core/filelog.h
+miscspace.o: ../../../winix/winixd/core/lock.h
+miscspace.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+miscspace.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+miscspace.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+miscspace.o: changepatterns.h ../../../winix/winixd/core/cur.h
 miscspace.o: ../../../winix/winixd/core/request.h
 miscspace.o: ../../../winix/winixd/core/requesttypes.h
 miscspace.o: ../../../winix/winixd/core/error.h
@@ -2003,17 +2040,12 @@ miscspace.o: ../../../winix/winixd/core/user.h
 miscspace.o: ../../../winix/winixd/core/plugindata.h
 miscspace.o: ../../../winix/winixd/core/rebus.h
 miscspace.o: ../../../winix/winixd/core/winixbase.h
-miscspace.o: ../../../winix/winixd/core/log.h
-miscspace.o: ../../../winix/winixd/core/filelog.h
-miscspace.o: ../../../winix/winixd/core/lock.h
-miscspace.o: ../../../winix/winixd/core/synchro.h
 miscspace.o: ../../../winix/winixd/core/ipban.h
 miscspace.o: ../../../winix/winixd/core/mount.h
 miscspace.o: ../../../winix/winixd/core/system.h
 miscspace.o: ../../../winix/winixd/core/job.h
 miscspace.o: ../../../winix/winixd/core/basethread.h
 miscspace.o: ../../../winix/winixd/core/winixmodel.h
-miscspace.o: ../../../winix/winixd/core/winixbase.h
 miscspace.o: ../../../winix/winixd/core/plugin.h
 miscspace.o: ../../../winix/winixd/core/pluginmsg.h
 miscspace.o: ../../../winix/winixd/core/dirs.h
@@ -2059,6 +2091,9 @@ miscspace.o: ../../../winix/winixd/core/system.h
 miscspace.o: ../../../winix/winixd/core/sessionidmanager.h
 miscspace.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 miscspace.o: ../../../winix/winixd/core/htmlfilter.h
+miscspace.o: ../../../winix/winixd/core/winixrequest.h
+miscspace.o: ../../../winix/winixd/core/winixsystem.h
+miscspace.o: ../../../winix/winixd/core/slog.h
 mount.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 mount.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 mount.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -2076,17 +2111,20 @@ mount.o: ../../../pikotools/convert/inttostr.h
 mount.o: ../../../pikotools/convert/strtoint.h
 mount.o: ../../../pikotools/convert/text.h
 mount.o: ../../../pikotools/membuffer/membuffer.h
-mount.o: ../../../pikotools/textstream/types.h htmltextstream.h
-mount.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-mount.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-mount.o: changepatterns.h ../../../winix/winixd/core/config.h
-mount.o: ../../../winix/winixd/core/htmlfilter.h
-mount.o: ../../../winix/winixd/core/log.h
+mount.o: ../../../pikotools/textstream/types.h
+mount.o: ../../../winix/winixd/core/winixbase.h
+mount.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 mount.o: ../../../winix/winixd/core/textstream.h
 mount.o: ../../../winix/winixd/core/logmanipulators.h
 mount.o: ../../../winix/winixd/core/filelog.h
 mount.o: ../../../winix/winixd/core/synchro.h
-mount.o: ../../../winix/winixd/core/cur.h
+mount.o: ../../../winix/winixd/core/log.h
+mount.o: ../../../winix/winixd/core/filelog.h
+mount.o: ../../../winix/winixd/core/lock.h
+mount.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+mount.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+mount.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+mount.o: changepatterns.h ../../../winix/winixd/core/cur.h
 mount.o: ../../../winix/winixd/core/request.h
 mount.o: ../../../winix/winixd/core/requesttypes.h
 mount.o: ../../../winix/winixd/core/error.h
@@ -2098,16 +2136,11 @@ mount.o: ../../../winix/winixd/core/user.h
 mount.o: ../../../winix/winixd/core/plugindata.h
 mount.o: ../../../winix/winixd/core/rebus.h
 mount.o: ../../../winix/winixd/core/winixbase.h
-mount.o: ../../../winix/winixd/core/log.h
-mount.o: ../../../winix/winixd/core/filelog.h
-mount.o: ../../../winix/winixd/core/lock.h
-mount.o: ../../../winix/winixd/core/synchro.h
 mount.o: ../../../winix/winixd/core/ipban.h
 mount.o: ../../../winix/winixd/core/mount.h
 mount.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 mount.o: ../../../winix/winixd/core/basethread.h
 mount.o: ../../../winix/winixd/core/winixmodel.h
-mount.o: ../../../winix/winixd/core/winixbase.h
 mount.o: ../../../winix/winixd/core/plugin.h
 mount.o: ../../../winix/winixd/core/pluginmsg.h
 mount.o: ../../../winix/winixd/core/dirs.h
@@ -2150,7 +2183,9 @@ mount.o: ../../../winix/winixd/core/system.h
 mount.o: ../../../winix/winixd/core/sessionidmanager.h
 mount.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 mount.o: ../../../winix/winixd/core/htmlfilter.h
-mount.o: ../../../winix/winixd/core/misc.h
+mount.o: ../../../winix/winixd/core/winixrequest.h
+mount.o: ../../../winix/winixd/core/winixsystem.h
+mount.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/misc.h
 mount.o: ../../../winix/winixd/core/winix_const.h
 mount.o: ../../../winix/winixd/core/mounts.h
 passwd.o: ../../../winix/winixd/core/request.h templates.h
@@ -2171,17 +2206,21 @@ passwd.o: ../../../pikotools/convert/inttostr.h
 passwd.o: ../../../pikotools/convert/strtoint.h
 passwd.o: ../../../pikotools/convert/text.h
 passwd.o: ../../../pikotools/membuffer/membuffer.h
-passwd.o: ../../../pikotools/textstream/types.h htmltextstream.h
-passwd.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-passwd.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-passwd.o: changepatterns.h ../../../winix/winixd/core/config.h
-passwd.o: ../../../winix/winixd/core/htmlfilter.h
+passwd.o: ../../../pikotools/textstream/types.h
+passwd.o: ../../../winix/winixd/core/winixbase.h
+passwd.o: ../../../winix/winixd/core/config.h
 passwd.o: ../../../winix/winixd/core/log.h
 passwd.o: ../../../winix/winixd/core/textstream.h
 passwd.o: ../../../winix/winixd/core/logmanipulators.h
 passwd.o: ../../../winix/winixd/core/filelog.h
 passwd.o: ../../../winix/winixd/core/synchro.h
-passwd.o: ../../../winix/winixd/core/cur.h
+passwd.o: ../../../winix/winixd/core/log.h
+passwd.o: ../../../winix/winixd/core/filelog.h
+passwd.o: ../../../winix/winixd/core/lock.h
+passwd.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+passwd.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+passwd.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+passwd.o: changepatterns.h ../../../winix/winixd/core/cur.h
 passwd.o: ../../../winix/winixd/core/request.h
 passwd.o: ../../../winix/winixd/core/requesttypes.h
 passwd.o: ../../../winix/winixd/core/error.h
@@ -2193,17 +2232,12 @@ passwd.o: ../../../winix/winixd/core/user.h
 passwd.o: ../../../winix/winixd/core/plugindata.h
 passwd.o: ../../../winix/winixd/core/rebus.h
 passwd.o: ../../../winix/winixd/core/winixbase.h
-passwd.o: ../../../winix/winixd/core/log.h
-passwd.o: ../../../winix/winixd/core/filelog.h
-passwd.o: ../../../winix/winixd/core/lock.h
-passwd.o: ../../../winix/winixd/core/synchro.h
 passwd.o: ../../../winix/winixd/core/ipban.h
 passwd.o: ../../../winix/winixd/core/mount.h
 passwd.o: ../../../winix/winixd/core/system.h
 passwd.o: ../../../winix/winixd/core/job.h
 passwd.o: ../../../winix/winixd/core/basethread.h
 passwd.o: ../../../winix/winixd/core/winixmodel.h
-passwd.o: ../../../winix/winixd/core/winixbase.h
 passwd.o: ../../../winix/winixd/core/plugin.h
 passwd.o: ../../../winix/winixd/core/pluginmsg.h
 passwd.o: ../../../winix/winixd/core/dirs.h
@@ -2248,6 +2282,9 @@ passwd.o: ../../../winix/winixd/core/system.h
 passwd.o: ../../../winix/winixd/core/sessionidmanager.h
 passwd.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 passwd.o: ../../../winix/winixd/core/htmlfilter.h
+passwd.o: ../../../winix/winixd/core/winixrequest.h
+passwd.o: ../../../winix/winixd/core/winixsystem.h
+passwd.o: ../../../winix/winixd/core/slog.h
 patterncacher.o: patterncacher.h ../../../winix/winixd/core/item.h
 patterncacher.o: ../../../pikotools/space/space.h
 patterncacher.o: ../../../pikotools/date/date.h
@@ -2260,16 +2297,27 @@ patterncacher.o: ../../../pikotools/space/space.h
 patterncacher.o: ../../../pikotools/textstream/types.h
 patterncacher.o: ../../../pikotools/textstream/textstream.h
 patterncacher.o: ../../../pikotools/membuffer/membuffer.h
-patterncacher.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
+patterncacher.o: ../../../pikotools/textstream/types.h
+patterncacher.o: ../../../winix/winixd/core/winixbase.h
+patterncacher.o: ../../../winix/winixd/core/config.h
+patterncacher.o: ../../../winix/winixd/core/log.h
+patterncacher.o: ../../../winix/winixd/core/textstream.h
+patterncacher.o: ../../../pikotools/utf8/utf8.h
+patterncacher.o: ../../../winix/winixd/core/logmanipulators.h
+patterncacher.o: ../../../winix/winixd/core/filelog.h
+patterncacher.o: ../../../winix/winixd/core/synchro.h
+patterncacher.o: ../../../winix/winixd/core/log.h
+patterncacher.o: ../../../winix/winixd/core/filelog.h
+patterncacher.o: ../../../winix/winixd/core/lock.h
+patterncacher.o: ../../../winix/winixd/core/synchro.h ../../../ezc/src/ezc.h
 patterncacher.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
 patterncacher.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
-patterncacher.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h
-patterncacher.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
-patterncacher.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
+patterncacher.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+patterncacher.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
+patterncacher.o: ../../../ezc/src/outstreams.h
 patterncacher.o: ../../../ezc/src/expressionparser.h
 patterncacher.o: ../../../ezc/src/patternparser.h htmltextstream.h
 patterncacher.o: ../../../winix/winixd/core/textstream.h
-patterncacher.o: ../../../winix/winixd/core/log.h
 patterns.o: patterns.h locale.h ../../../pikotools/space/spaceparser.h
 patterns.o: ../../../pikotools/space/space.h
 patterns.o: ../../../pikotools/textstream/types.h
@@ -2285,11 +2333,21 @@ patterns.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
 patterns.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
 patterns.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
 patterns.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
-patterns.o: ../../../ezc/src/patternparser.h htmltextstream.h
+patterns.o: ../../../ezc/src/patternparser.h
+patterns.o: ../../../winix/winixd/core/winixbase.h
+patterns.o: ../../../winix/winixd/core/config.h
+patterns.o: ../../../winix/winixd/core/log.h
+patterns.o: ../../../winix/winixd/core/textstream.h
+patterns.o: ../../../winix/winixd/core/logmanipulators.h
+patterns.o: ../../../winix/winixd/core/filelog.h
+patterns.o: ../../../winix/winixd/core/synchro.h
+patterns.o: ../../../winix/winixd/core/log.h
+patterns.o: ../../../winix/winixd/core/filelog.h
+patterns.o: ../../../winix/winixd/core/lock.h
+patterns.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
 patterns.o: ../../../winix/winixd/core/textstream.h
 patterns.o: ../../../pikotools/membuffer/membuffer.h
 patterns.o: ../../../pikotools/textstream/types.h
-patterns.o: ../../../winix/winixd/core/log.h
 priv.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 priv.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 priv.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -2307,16 +2365,19 @@ priv.o: ../../../pikotools/convert/inttostr.h
 priv.o: ../../../pikotools/convert/strtoint.h
 priv.o: ../../../pikotools/convert/text.h
 priv.o: ../../../pikotools/membuffer/membuffer.h
-priv.o: ../../../pikotools/textstream/types.h htmltextstream.h
-priv.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-priv.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-priv.o: changepatterns.h ../../../winix/winixd/core/config.h
-priv.o: ../../../winix/winixd/core/htmlfilter.h
-priv.o: ../../../winix/winixd/core/log.h
+priv.o: ../../../pikotools/textstream/types.h
+priv.o: ../../../winix/winixd/core/winixbase.h
+priv.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 priv.o: ../../../winix/winixd/core/textstream.h
 priv.o: ../../../winix/winixd/core/logmanipulators.h
 priv.o: ../../../winix/winixd/core/filelog.h
-priv.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+priv.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+priv.o: ../../../winix/winixd/core/filelog.h
+priv.o: ../../../winix/winixd/core/lock.h
+priv.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+priv.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+priv.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+priv.o: changepatterns.h ../../../winix/winixd/core/cur.h
 priv.o: ../../../winix/winixd/core/request.h
 priv.o: ../../../winix/winixd/core/requesttypes.h
 priv.o: ../../../winix/winixd/core/error.h
@@ -2328,14 +2389,10 @@ priv.o: ../../../winix/winixd/core/user.h
 priv.o: ../../../winix/winixd/core/plugindata.h
 priv.o: ../../../winix/winixd/core/rebus.h
 priv.o: ../../../winix/winixd/core/winixbase.h
-priv.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-priv.o: ../../../winix/winixd/core/lock.h
-priv.o: ../../../winix/winixd/core/synchro.h
 priv.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 priv.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 priv.o: ../../../winix/winixd/core/basethread.h
 priv.o: ../../../winix/winixd/core/winixmodel.h
-priv.o: ../../../winix/winixd/core/winixbase.h
 priv.o: ../../../winix/winixd/core/plugin.h
 priv.o: ../../../winix/winixd/core/pluginmsg.h
 priv.o: ../../../winix/winixd/core/dirs.h
@@ -2378,14 +2435,14 @@ priv.o: ../../../winix/winixd/core/system.h
 priv.o: ../../../winix/winixd/core/sessionidmanager.h
 priv.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 priv.o: ../../../winix/winixd/core/htmlfilter.h
+priv.o: ../../../winix/winixd/core/winixrequest.h
+priv.o: ../../../winix/winixd/core/winixsystem.h
+priv.o: ../../../winix/winixd/core/slog.h
 priv.o: ../../../winix/winixd/core/request.h
 priv.o: ../../../winix/winixd/core/misc.h
 priv.o: ../../../winix/winixd/core/winix_const.h
 priv.o: ../../../winix/winixd/functions/functions.h
 priv.o: ../../../winix/winixd/functions/functionbase.h
-priv.o: ../../../winix/winixd/core/winixrequest.h
-priv.o: ../../../winix/winixd/core/winixsystem.h
-priv.o: ../../../winix/winixd/core/slog.h
 priv.o: ../../../winix/winixd/functions/functionparser.h
 priv.o: ../../../winix/winixd/functions/account.h
 priv.o: ../../../winix/winixd/functions/adduser.h
@@ -2446,17 +2503,20 @@ rebus.o: ../../../pikotools/convert/inttostr.h
 rebus.o: ../../../pikotools/convert/strtoint.h
 rebus.o: ../../../pikotools/convert/text.h
 rebus.o: ../../../pikotools/membuffer/membuffer.h
-rebus.o: ../../../pikotools/textstream/types.h htmltextstream.h
-rebus.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-rebus.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-rebus.o: changepatterns.h ../../../winix/winixd/core/config.h
-rebus.o: ../../../winix/winixd/core/htmlfilter.h
-rebus.o: ../../../winix/winixd/core/log.h
+rebus.o: ../../../pikotools/textstream/types.h
+rebus.o: ../../../winix/winixd/core/winixbase.h
+rebus.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 rebus.o: ../../../winix/winixd/core/textstream.h
 rebus.o: ../../../winix/winixd/core/logmanipulators.h
 rebus.o: ../../../winix/winixd/core/filelog.h
 rebus.o: ../../../winix/winixd/core/synchro.h
-rebus.o: ../../../winix/winixd/core/cur.h
+rebus.o: ../../../winix/winixd/core/log.h
+rebus.o: ../../../winix/winixd/core/filelog.h
+rebus.o: ../../../winix/winixd/core/lock.h
+rebus.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+rebus.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+rebus.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+rebus.o: changepatterns.h ../../../winix/winixd/core/cur.h
 rebus.o: ../../../winix/winixd/core/request.h
 rebus.o: ../../../winix/winixd/core/requesttypes.h
 rebus.o: ../../../winix/winixd/core/error.h
@@ -2468,16 +2528,11 @@ rebus.o: ../../../winix/winixd/core/user.h
 rebus.o: ../../../winix/winixd/core/plugindata.h
 rebus.o: ../../../winix/winixd/core/rebus.h
 rebus.o: ../../../winix/winixd/core/winixbase.h
-rebus.o: ../../../winix/winixd/core/log.h
-rebus.o: ../../../winix/winixd/core/filelog.h
-rebus.o: ../../../winix/winixd/core/lock.h
-rebus.o: ../../../winix/winixd/core/synchro.h
 rebus.o: ../../../winix/winixd/core/ipban.h
 rebus.o: ../../../winix/winixd/core/mount.h
 rebus.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 rebus.o: ../../../winix/winixd/core/basethread.h
 rebus.o: ../../../winix/winixd/core/winixmodel.h
-rebus.o: ../../../winix/winixd/core/winixbase.h
 rebus.o: ../../../winix/winixd/core/plugin.h
 rebus.o: ../../../winix/winixd/core/pluginmsg.h
 rebus.o: ../../../winix/winixd/core/dirs.h
@@ -2520,6 +2575,9 @@ rebus.o: ../../../winix/winixd/core/system.h
 rebus.o: ../../../winix/winixd/core/sessionidmanager.h
 rebus.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 rebus.o: ../../../winix/winixd/core/htmlfilter.h
+rebus.o: ../../../winix/winixd/core/winixrequest.h
+rebus.o: ../../../winix/winixd/core/winixsystem.h
+rebus.o: ../../../winix/winixd/core/slog.h
 server.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 server.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 server.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -2537,17 +2595,21 @@ server.o: ../../../pikotools/convert/inttostr.h
 server.o: ../../../pikotools/convert/strtoint.h
 server.o: ../../../pikotools/convert/text.h
 server.o: ../../../pikotools/membuffer/membuffer.h
-server.o: ../../../pikotools/textstream/types.h htmltextstream.h
-server.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-server.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-server.o: changepatterns.h ../../../winix/winixd/core/config.h
-server.o: ../../../winix/winixd/core/htmlfilter.h
+server.o: ../../../pikotools/textstream/types.h
+server.o: ../../../winix/winixd/core/winixbase.h
+server.o: ../../../winix/winixd/core/config.h
 server.o: ../../../winix/winixd/core/log.h
 server.o: ../../../winix/winixd/core/textstream.h
 server.o: ../../../winix/winixd/core/logmanipulators.h
 server.o: ../../../winix/winixd/core/filelog.h
 server.o: ../../../winix/winixd/core/synchro.h
-server.o: ../../../winix/winixd/core/cur.h
+server.o: ../../../winix/winixd/core/log.h
+server.o: ../../../winix/winixd/core/filelog.h
+server.o: ../../../winix/winixd/core/lock.h
+server.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+server.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+server.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+server.o: changepatterns.h ../../../winix/winixd/core/cur.h
 server.o: ../../../winix/winixd/core/request.h
 server.o: ../../../winix/winixd/core/requesttypes.h
 server.o: ../../../winix/winixd/core/error.h
@@ -2559,17 +2621,12 @@ server.o: ../../../winix/winixd/core/user.h
 server.o: ../../../winix/winixd/core/plugindata.h
 server.o: ../../../winix/winixd/core/rebus.h
 server.o: ../../../winix/winixd/core/winixbase.h
-server.o: ../../../winix/winixd/core/log.h
-server.o: ../../../winix/winixd/core/filelog.h
-server.o: ../../../winix/winixd/core/lock.h
-server.o: ../../../winix/winixd/core/synchro.h
 server.o: ../../../winix/winixd/core/ipban.h
 server.o: ../../../winix/winixd/core/mount.h
 server.o: ../../../winix/winixd/core/system.h
 server.o: ../../../winix/winixd/core/job.h
 server.o: ../../../winix/winixd/core/basethread.h
 server.o: ../../../winix/winixd/core/winixmodel.h
-server.o: ../../../winix/winixd/core/winixbase.h
 server.o: ../../../winix/winixd/core/plugin.h
 server.o: ../../../winix/winixd/core/pluginmsg.h
 server.o: ../../../winix/winixd/core/dirs.h
@@ -2614,12 +2671,12 @@ server.o: ../../../winix/winixd/core/system.h
 server.o: ../../../winix/winixd/core/sessionidmanager.h
 server.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 server.o: ../../../winix/winixd/core/htmlfilter.h
-server.o: ../../../winix/winixd/functions/functions.h
-server.o: ../../../winix/winixd/functions/functionbase.h
-server.o: ../../../winix/winixd/core/request.h
 server.o: ../../../winix/winixd/core/winixrequest.h
 server.o: ../../../winix/winixd/core/winixsystem.h
 server.o: ../../../winix/winixd/core/slog.h
+server.o: ../../../winix/winixd/functions/functions.h
+server.o: ../../../winix/winixd/functions/functionbase.h
+server.o: ../../../winix/winixd/core/request.h
 server.o: ../../../winix/winixd/functions/functionparser.h
 server.o: ../../../winix/winixd/functions/account.h
 server.o: ../../../winix/winixd/functions/adduser.h
@@ -2673,23 +2730,26 @@ slog.o: ../../../pikotools/convert/strtoint.h
 slog.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h
 slog.o: ../../../pikotools/space/spaceparser.h
 slog.o: ../../../pikotools/space/space.h
-slog.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
+slog.o: ../../../pikotools/textstream/types.h
+slog.o: ../../../winix/winixd/core/winixbase.h
+slog.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
+slog.o: ../../../winix/winixd/core/textstream.h
+slog.o: ../../../pikotools/utf8/utf8.h ../../../winix/winixd/core/filelog.h
+slog.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+slog.o: ../../../winix/winixd/core/filelog.h
+slog.o: ../../../winix/winixd/core/lock.h
+slog.o: ../../../winix/winixd/core/synchro.h ../../../ezc/src/ezc.h
 slog.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
 slog.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
-slog.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h
-slog.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
-slog.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
-slog.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
-slog.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
+slog.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+slog.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
+slog.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
+slog.o: ../../../ezc/src/patternparser.h htmltextstream.h
+slog.o: ../../../winix/winixd/core/textstream.h
 slog.o: ../../../pikotools/membuffer/membuffer.h
 slog.o: ../../../pikotools/textstream/types.h templates.h patterncacher.h
 slog.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-slog.o: changepatterns.h ../../../winix/winixd/core/config.h
-slog.o: ../../../winix/winixd/core/htmlfilter.h
-slog.o: ../../../winix/winixd/core/log.h
-slog.o: ../../../winix/winixd/core/textstream.h
-slog.o: ../../../winix/winixd/core/filelog.h
-slog.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+slog.o: changepatterns.h ../../../winix/winixd/core/cur.h
 slog.o: ../../../winix/winixd/core/request.h
 slog.o: ../../../winix/winixd/core/requesttypes.h
 slog.o: ../../../winix/winixd/core/error.h
@@ -2701,14 +2761,10 @@ slog.o: ../../../winix/winixd/core/user.h
 slog.o: ../../../winix/winixd/core/plugindata.h
 slog.o: ../../../winix/winixd/core/rebus.h
 slog.o: ../../../winix/winixd/core/winixbase.h
-slog.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-slog.o: ../../../winix/winixd/core/lock.h
-slog.o: ../../../winix/winixd/core/synchro.h
 slog.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 slog.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 slog.o: ../../../winix/winixd/core/basethread.h
 slog.o: ../../../winix/winixd/core/winixmodel.h
-slog.o: ../../../winix/winixd/core/winixbase.h
 slog.o: ../../../winix/winixd/core/plugin.h
 slog.o: ../../../winix/winixd/core/pluginmsg.h
 slog.o: ../../../winix/winixd/core/dirs.h
@@ -2750,6 +2806,8 @@ slog.o: ../../../winix/winixd/core/system.h
 slog.o: ../../../winix/winixd/core/sessionidmanager.h
 slog.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 slog.o: ../../../winix/winixd/core/htmlfilter.h
+slog.o: ../../../winix/winixd/core/winixrequest.h
+slog.o: ../../../winix/winixd/core/winixsystem.h
 stat.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 stat.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 stat.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -2767,16 +2825,19 @@ stat.o: ../../../pikotools/convert/inttostr.h
 stat.o: ../../../pikotools/convert/strtoint.h
 stat.o: ../../../pikotools/convert/text.h
 stat.o: ../../../pikotools/membuffer/membuffer.h
-stat.o: ../../../pikotools/textstream/types.h htmltextstream.h
-stat.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-stat.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-stat.o: changepatterns.h ../../../winix/winixd/core/config.h
-stat.o: ../../../winix/winixd/core/htmlfilter.h
-stat.o: ../../../winix/winixd/core/log.h
+stat.o: ../../../pikotools/textstream/types.h
+stat.o: ../../../winix/winixd/core/winixbase.h
+stat.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 stat.o: ../../../winix/winixd/core/textstream.h
 stat.o: ../../../winix/winixd/core/logmanipulators.h
 stat.o: ../../../winix/winixd/core/filelog.h
-stat.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+stat.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+stat.o: ../../../winix/winixd/core/filelog.h
+stat.o: ../../../winix/winixd/core/lock.h
+stat.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+stat.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+stat.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+stat.o: changepatterns.h ../../../winix/winixd/core/cur.h
 stat.o: ../../../winix/winixd/core/request.h
 stat.o: ../../../winix/winixd/core/requesttypes.h
 stat.o: ../../../winix/winixd/core/error.h
@@ -2788,14 +2849,10 @@ stat.o: ../../../winix/winixd/core/user.h
 stat.o: ../../../winix/winixd/core/plugindata.h
 stat.o: ../../../winix/winixd/core/rebus.h
 stat.o: ../../../winix/winixd/core/winixbase.h
-stat.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-stat.o: ../../../winix/winixd/core/lock.h
-stat.o: ../../../winix/winixd/core/synchro.h
 stat.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 stat.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 stat.o: ../../../winix/winixd/core/basethread.h
 stat.o: ../../../winix/winixd/core/winixmodel.h
-stat.o: ../../../winix/winixd/core/winixbase.h
 stat.o: ../../../winix/winixd/core/plugin.h
 stat.o: ../../../winix/winixd/core/pluginmsg.h
 stat.o: ../../../winix/winixd/core/dirs.h
@@ -2838,6 +2895,9 @@ stat.o: ../../../winix/winixd/core/system.h
 stat.o: ../../../winix/winixd/core/sessionidmanager.h
 stat.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 stat.o: ../../../winix/winixd/core/htmlfilter.h
+stat.o: ../../../winix/winixd/core/winixrequest.h
+stat.o: ../../../winix/winixd/core/winixsystem.h
+stat.o: ../../../winix/winixd/core/slog.h
 stat.o: ../../../winix/winixd/core/request.h
 stat.o: ../../../winix/winixd/core/misc.h
 stat.o: ../../../winix/winixd/core/winix_const.h
@@ -2857,16 +2917,18 @@ sys.o: ../../../pikotools/convert/inttostr.h
 sys.o: ../../../pikotools/convert/strtoint.h
 sys.o: ../../../pikotools/convert/text.h
 sys.o: ../../../pikotools/membuffer/membuffer.h
-sys.o: ../../../pikotools/textstream/types.h htmltextstream.h
-sys.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-sys.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-sys.o: changepatterns.h ../../../winix/winixd/core/config.h
-sys.o: ../../../winix/winixd/core/htmlfilter.h
-sys.o: ../../../winix/winixd/core/log.h
+sys.o: ../../../pikotools/textstream/types.h
+sys.o: ../../../winix/winixd/core/winixbase.h
+sys.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 sys.o: ../../../winix/winixd/core/textstream.h
 sys.o: ../../../winix/winixd/core/logmanipulators.h
 sys.o: ../../../winix/winixd/core/filelog.h
-sys.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+sys.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+sys.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
+sys.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+sys.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+sys.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+sys.o: changepatterns.h ../../../winix/winixd/core/cur.h
 sys.o: ../../../winix/winixd/core/request.h
 sys.o: ../../../winix/winixd/core/requesttypes.h
 sys.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h
@@ -2876,13 +2938,10 @@ sys.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h
 sys.o: ../../../winix/winixd/core/plugindata.h
 sys.o: ../../../winix/winixd/core/rebus.h
 sys.o: ../../../winix/winixd/core/winixbase.h
-sys.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-sys.o: ../../../winix/winixd/core/lock.h ../../../winix/winixd/core/synchro.h
 sys.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 sys.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 sys.o: ../../../winix/winixd/core/basethread.h
 sys.o: ../../../winix/winixd/core/winixmodel.h
-sys.o: ../../../winix/winixd/core/winixbase.h
 sys.o: ../../../winix/winixd/core/plugin.h
 sys.o: ../../../winix/winixd/core/pluginmsg.h
 sys.o: ../../../winix/winixd/core/dirs.h
@@ -2925,9 +2984,10 @@ sys.o: ../../../winix/winixd/core/system.h
 sys.o: ../../../winix/winixd/core/sessionidmanager.h
 sys.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 sys.o: ../../../winix/winixd/core/htmlfilter.h
-sys.o: ../../../winix/winixd/core/request.h
+sys.o: ../../../winix/winixd/core/winixrequest.h
+sys.o: ../../../winix/winixd/core/winixsystem.h
+sys.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h
 sys.o: ../../../winix/winixd/core/version.h
-sys.o: ../../../winix/winixd/core/plugin.h
 template.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 template.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 template.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -2945,17 +3005,21 @@ template.o: ../../../pikotools/convert/inttostr.h
 template.o: ../../../pikotools/convert/strtoint.h
 template.o: ../../../pikotools/convert/text.h
 template.o: ../../../pikotools/membuffer/membuffer.h
-template.o: ../../../pikotools/textstream/types.h htmltextstream.h
-template.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-template.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-template.o: changepatterns.h ../../../winix/winixd/core/config.h
-template.o: ../../../winix/winixd/core/htmlfilter.h
+template.o: ../../../pikotools/textstream/types.h
+template.o: ../../../winix/winixd/core/winixbase.h
+template.o: ../../../winix/winixd/core/config.h
 template.o: ../../../winix/winixd/core/log.h
 template.o: ../../../winix/winixd/core/textstream.h
 template.o: ../../../winix/winixd/core/logmanipulators.h
 template.o: ../../../winix/winixd/core/filelog.h
 template.o: ../../../winix/winixd/core/synchro.h
-template.o: ../../../winix/winixd/core/cur.h
+template.o: ../../../winix/winixd/core/log.h
+template.o: ../../../winix/winixd/core/filelog.h
+template.o: ../../../winix/winixd/core/lock.h
+template.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+template.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+template.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+template.o: changepatterns.h ../../../winix/winixd/core/cur.h
 template.o: ../../../winix/winixd/core/request.h
 template.o: ../../../winix/winixd/core/requesttypes.h
 template.o: ../../../winix/winixd/core/error.h
@@ -2967,17 +3031,12 @@ template.o: ../../../winix/winixd/core/user.h
 template.o: ../../../winix/winixd/core/plugindata.h
 template.o: ../../../winix/winixd/core/rebus.h
 template.o: ../../../winix/winixd/core/winixbase.h
-template.o: ../../../winix/winixd/core/log.h
-template.o: ../../../winix/winixd/core/filelog.h
-template.o: ../../../winix/winixd/core/lock.h
-template.o: ../../../winix/winixd/core/synchro.h
 template.o: ../../../winix/winixd/core/ipban.h
 template.o: ../../../winix/winixd/core/mount.h
 template.o: ../../../winix/winixd/core/system.h
 template.o: ../../../winix/winixd/core/job.h
 template.o: ../../../winix/winixd/core/basethread.h
 template.o: ../../../winix/winixd/core/winixmodel.h
-template.o: ../../../winix/winixd/core/winixbase.h
 template.o: ../../../winix/winixd/core/plugin.h
 template.o: ../../../winix/winixd/core/pluginmsg.h
 template.o: ../../../winix/winixd/core/dirs.h
@@ -3023,6 +3082,9 @@ template.o: ../../../winix/winixd/core/system.h
 template.o: ../../../winix/winixd/core/sessionidmanager.h
 template.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 template.o: ../../../winix/winixd/core/htmlfilter.h
+template.o: ../../../winix/winixd/core/winixrequest.h
+template.o: ../../../winix/winixd/core/winixsystem.h
+template.o: ../../../winix/winixd/core/slog.h
 template.o: ../../../winix/winixd/core/misc.h
 template.o: ../../../winix/winixd/core/winix_const.h
 templates.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
@@ -3043,17 +3105,21 @@ templates.o: ../../../pikotools/convert/inttostr.h
 templates.o: ../../../pikotools/convert/strtoint.h
 templates.o: ../../../pikotools/convert/text.h
 templates.o: ../../../pikotools/membuffer/membuffer.h
-templates.o: ../../../pikotools/textstream/types.h htmltextstream.h
-templates.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-templates.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-templates.o: changepatterns.h ../../../winix/winixd/core/config.h
-templates.o: ../../../winix/winixd/core/htmlfilter.h
+templates.o: ../../../pikotools/textstream/types.h
+templates.o: ../../../winix/winixd/core/winixbase.h
+templates.o: ../../../winix/winixd/core/config.h
 templates.o: ../../../winix/winixd/core/log.h
 templates.o: ../../../winix/winixd/core/textstream.h
 templates.o: ../../../winix/winixd/core/logmanipulators.h
 templates.o: ../../../winix/winixd/core/filelog.h
 templates.o: ../../../winix/winixd/core/synchro.h
-templates.o: ../../../winix/winixd/core/cur.h
+templates.o: ../../../winix/winixd/core/log.h
+templates.o: ../../../winix/winixd/core/filelog.h
+templates.o: ../../../winix/winixd/core/lock.h
+templates.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+templates.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+templates.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+templates.o: changepatterns.h ../../../winix/winixd/core/cur.h
 templates.o: ../../../winix/winixd/core/request.h
 templates.o: ../../../winix/winixd/core/requesttypes.h
 templates.o: ../../../winix/winixd/core/error.h
@@ -3065,17 +3131,12 @@ templates.o: ../../../winix/winixd/core/user.h
 templates.o: ../../../winix/winixd/core/plugindata.h
 templates.o: ../../../winix/winixd/core/rebus.h
 templates.o: ../../../winix/winixd/core/winixbase.h
-templates.o: ../../../winix/winixd/core/log.h
-templates.o: ../../../winix/winixd/core/filelog.h
-templates.o: ../../../winix/winixd/core/lock.h
-templates.o: ../../../winix/winixd/core/synchro.h
 templates.o: ../../../winix/winixd/core/ipban.h
 templates.o: ../../../winix/winixd/core/mount.h
 templates.o: ../../../winix/winixd/core/system.h
 templates.o: ../../../winix/winixd/core/job.h
 templates.o: ../../../winix/winixd/core/basethread.h
 templates.o: ../../../winix/winixd/core/winixmodel.h
-templates.o: ../../../winix/winixd/core/winixbase.h
 templates.o: ../../../winix/winixd/core/plugin.h
 templates.o: ../../../winix/winixd/core/pluginmsg.h
 templates.o: ../../../winix/winixd/core/dirs.h
@@ -3121,15 +3182,15 @@ templates.o: ../../../winix/winixd/core/system.h
 templates.o: ../../../winix/winixd/core/sessionidmanager.h
 templates.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 templates.o: ../../../winix/winixd/core/htmlfilter.h
+templates.o: ../../../winix/winixd/core/winixrequest.h
+templates.o: ../../../winix/winixd/core/winixsystem.h
+templates.o: ../../../winix/winixd/core/slog.h
 templates.o: ../../../winix/winixd/core/misc.h
 templates.o: ../../../winix/winixd/core/winix_const.h
 templates.o: ../../../winix/winixd/core/plugin.h
 templates.o: ../../../winix/winixd/functions/functions.h
 templates.o: ../../../winix/winixd/functions/functionbase.h
 templates.o: ../../../winix/winixd/core/request.h
-templates.o: ../../../winix/winixd/core/winixrequest.h
-templates.o: ../../../winix/winixd/core/winixsystem.h
-templates.o: ../../../winix/winixd/core/slog.h
 templates.o: ../../../winix/winixd/functions/functionparser.h
 templates.o: ../../../winix/winixd/functions/account.h
 templates.o: ../../../winix/winixd/functions/adduser.h
@@ -3173,26 +3234,37 @@ templates.o: ../../../winix/winixd/functions/uptime.h
 templates.o: ../../../winix/winixd/functions/who.h
 templates.o: ../../../winix/winixd/functions/vim.h
 textextstream.o: textextstream.h ../../../winix/winixd/core/textstream.h
-textextstream.o: misc.h localefilter.h locale.h
-textextstream.o: ../../../pikotools/space/spaceparser.h
-textextstream.o: ../../../pikotools/space/space.h
-textextstream.o: ../../../pikotools/textstream/types.h
 textextstream.o: ../../../pikotools/textstream/textstream.h
 textextstream.o: ../../../pikotools/space/space.h
 textextstream.o: ../../../pikotools/date/date.h
 textextstream.o: ../../../pikotools/convert/convert.h
 textextstream.o: ../../../pikotools/convert/inttostr.h
 textextstream.o: ../../../pikotools/convert/strtoint.h
-textextstream.o: ../../../pikotools/convert/text.h
-textextstream.o: ../../../pikotools/membuffer/membuffer.h
-textextstream.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
+textextstream.o: ../../../pikotools/convert/text.h misc.h localefilter.h
+textextstream.o: locale.h ../../../pikotools/space/spaceparser.h
+textextstream.o: ../../../pikotools/space/space.h
+textextstream.o: ../../../pikotools/textstream/types.h
+textextstream.o: ../../../winix/winixd/core/winixbase.h
+textextstream.o: ../../../winix/winixd/core/config.h
+textextstream.o: ../../../winix/winixd/core/log.h
+textextstream.o: ../../../winix/winixd/core/textstream.h
+textextstream.o: ../../../pikotools/utf8/utf8.h
+textextstream.o: ../../../winix/winixd/core/logmanipulators.h
+textextstream.o: ../../../winix/winixd/core/filelog.h
+textextstream.o: ../../../winix/winixd/core/synchro.h
+textextstream.o: ../../../winix/winixd/core/log.h
+textextstream.o: ../../../winix/winixd/core/filelog.h
+textextstream.o: ../../../winix/winixd/core/lock.h
+textextstream.o: ../../../winix/winixd/core/synchro.h ../../../ezc/src/ezc.h
 textextstream.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
 textextstream.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
-textextstream.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h
-textextstream.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
-textextstream.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
+textextstream.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+textextstream.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
+textextstream.o: ../../../ezc/src/outstreams.h
 textextstream.o: ../../../ezc/src/expressionparser.h
 textextstream.o: ../../../ezc/src/patternparser.h htmltextstream.h
+textextstream.o: ../../../pikotools/membuffer/membuffer.h
+textextstream.o: ../../../pikotools/textstream/types.h
 upload.o: ../../../winix/winixd/core/request.h templates.h
 upload.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 upload.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
@@ -3211,17 +3283,21 @@ upload.o: ../../../pikotools/convert/inttostr.h
 upload.o: ../../../pikotools/convert/strtoint.h
 upload.o: ../../../pikotools/convert/text.h
 upload.o: ../../../pikotools/membuffer/membuffer.h
-upload.o: ../../../pikotools/textstream/types.h htmltextstream.h
-upload.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-upload.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-upload.o: changepatterns.h ../../../winix/winixd/core/config.h
-upload.o: ../../../winix/winixd/core/htmlfilter.h
+upload.o: ../../../pikotools/textstream/types.h
+upload.o: ../../../winix/winixd/core/winixbase.h
+upload.o: ../../../winix/winixd/core/config.h
 upload.o: ../../../winix/winixd/core/log.h
 upload.o: ../../../winix/winixd/core/textstream.h
 upload.o: ../../../winix/winixd/core/logmanipulators.h
 upload.o: ../../../winix/winixd/core/filelog.h
 upload.o: ../../../winix/winixd/core/synchro.h
-upload.o: ../../../winix/winixd/core/cur.h
+upload.o: ../../../winix/winixd/core/log.h
+upload.o: ../../../winix/winixd/core/filelog.h
+upload.o: ../../../winix/winixd/core/lock.h
+upload.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+upload.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+upload.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+upload.o: changepatterns.h ../../../winix/winixd/core/cur.h
 upload.o: ../../../winix/winixd/core/request.h
 upload.o: ../../../winix/winixd/core/requesttypes.h
 upload.o: ../../../winix/winixd/core/error.h
@@ -3233,17 +3309,12 @@ upload.o: ../../../winix/winixd/core/user.h
 upload.o: ../../../winix/winixd/core/plugindata.h
 upload.o: ../../../winix/winixd/core/rebus.h
 upload.o: ../../../winix/winixd/core/winixbase.h
-upload.o: ../../../winix/winixd/core/log.h
-upload.o: ../../../winix/winixd/core/filelog.h
-upload.o: ../../../winix/winixd/core/lock.h
-upload.o: ../../../winix/winixd/core/synchro.h
 upload.o: ../../../winix/winixd/core/ipban.h
 upload.o: ../../../winix/winixd/core/mount.h
 upload.o: ../../../winix/winixd/core/system.h
 upload.o: ../../../winix/winixd/core/job.h
 upload.o: ../../../winix/winixd/core/basethread.h
 upload.o: ../../../winix/winixd/core/winixmodel.h
-upload.o: ../../../winix/winixd/core/winixbase.h
 upload.o: ../../../winix/winixd/core/plugin.h
 upload.o: ../../../winix/winixd/core/pluginmsg.h
 upload.o: ../../../winix/winixd/core/dirs.h
@@ -3288,6 +3359,9 @@ upload.o: ../../../winix/winixd/core/system.h
 upload.o: ../../../winix/winixd/core/sessionidmanager.h
 upload.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 upload.o: ../../../winix/winixd/core/htmlfilter.h
+upload.o: ../../../winix/winixd/core/winixrequest.h
+upload.o: ../../../winix/winixd/core/winixsystem.h
+upload.o: ../../../winix/winixd/core/slog.h
 uptime.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 uptime.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 uptime.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -3305,17 +3379,21 @@ uptime.o: ../../../pikotools/convert/inttostr.h
 uptime.o: ../../../pikotools/convert/strtoint.h
 uptime.o: ../../../pikotools/convert/text.h
 uptime.o: ../../../pikotools/membuffer/membuffer.h
-uptime.o: ../../../pikotools/textstream/types.h htmltextstream.h
-uptime.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-uptime.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-uptime.o: changepatterns.h ../../../winix/winixd/core/config.h
-uptime.o: ../../../winix/winixd/core/htmlfilter.h
+uptime.o: ../../../pikotools/textstream/types.h
+uptime.o: ../../../winix/winixd/core/winixbase.h
+uptime.o: ../../../winix/winixd/core/config.h
 uptime.o: ../../../winix/winixd/core/log.h
 uptime.o: ../../../winix/winixd/core/textstream.h
 uptime.o: ../../../winix/winixd/core/logmanipulators.h
 uptime.o: ../../../winix/winixd/core/filelog.h
 uptime.o: ../../../winix/winixd/core/synchro.h
-uptime.o: ../../../winix/winixd/core/cur.h
+uptime.o: ../../../winix/winixd/core/log.h
+uptime.o: ../../../winix/winixd/core/filelog.h
+uptime.o: ../../../winix/winixd/core/lock.h
+uptime.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+uptime.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+uptime.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+uptime.o: changepatterns.h ../../../winix/winixd/core/cur.h
 uptime.o: ../../../winix/winixd/core/request.h
 uptime.o: ../../../winix/winixd/core/requesttypes.h
 uptime.o: ../../../winix/winixd/core/error.h
@@ -3327,17 +3405,12 @@ uptime.o: ../../../winix/winixd/core/user.h
 uptime.o: ../../../winix/winixd/core/plugindata.h
 uptime.o: ../../../winix/winixd/core/rebus.h
 uptime.o: ../../../winix/winixd/core/winixbase.h
-uptime.o: ../../../winix/winixd/core/log.h
-uptime.o: ../../../winix/winixd/core/filelog.h
-uptime.o: ../../../winix/winixd/core/lock.h
-uptime.o: ../../../winix/winixd/core/synchro.h
 uptime.o: ../../../winix/winixd/core/ipban.h
 uptime.o: ../../../winix/winixd/core/mount.h
 uptime.o: ../../../winix/winixd/core/system.h
 uptime.o: ../../../winix/winixd/core/job.h
 uptime.o: ../../../winix/winixd/core/basethread.h
 uptime.o: ../../../winix/winixd/core/winixmodel.h
-uptime.o: ../../../winix/winixd/core/winixbase.h
 uptime.o: ../../../winix/winixd/core/plugin.h
 uptime.o: ../../../winix/winixd/core/pluginmsg.h
 uptime.o: ../../../winix/winixd/core/dirs.h
@@ -3382,6 +3455,9 @@ uptime.o: ../../../winix/winixd/core/system.h
 uptime.o: ../../../winix/winixd/core/sessionidmanager.h
 uptime.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 uptime.o: ../../../winix/winixd/core/htmlfilter.h
+uptime.o: ../../../winix/winixd/core/winixrequest.h
+uptime.o: ../../../winix/winixd/core/winixsystem.h
+uptime.o: ../../../winix/winixd/core/slog.h
 user.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 user.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 user.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
@@ -3399,16 +3475,19 @@ user.o: ../../../pikotools/convert/inttostr.h
 user.o: ../../../pikotools/convert/strtoint.h
 user.o: ../../../pikotools/convert/text.h
 user.o: ../../../pikotools/membuffer/membuffer.h
-user.o: ../../../pikotools/textstream/types.h htmltextstream.h
-user.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-user.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-user.o: changepatterns.h ../../../winix/winixd/core/config.h
-user.o: ../../../winix/winixd/core/htmlfilter.h
-user.o: ../../../winix/winixd/core/log.h
+user.o: ../../../pikotools/textstream/types.h
+user.o: ../../../winix/winixd/core/winixbase.h
+user.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 user.o: ../../../winix/winixd/core/textstream.h
 user.o: ../../../winix/winixd/core/logmanipulators.h
 user.o: ../../../winix/winixd/core/filelog.h
-user.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+user.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+user.o: ../../../winix/winixd/core/filelog.h
+user.o: ../../../winix/winixd/core/lock.h
+user.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+user.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+user.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+user.o: changepatterns.h ../../../winix/winixd/core/cur.h
 user.o: ../../../winix/winixd/core/request.h
 user.o: ../../../winix/winixd/core/requesttypes.h
 user.o: ../../../winix/winixd/core/error.h
@@ -3420,14 +3499,10 @@ user.o: ../../../winix/winixd/core/user.h
 user.o: ../../../winix/winixd/core/plugindata.h
 user.o: ../../../winix/winixd/core/rebus.h
 user.o: ../../../winix/winixd/core/winixbase.h
-user.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-user.o: ../../../winix/winixd/core/lock.h
-user.o: ../../../winix/winixd/core/synchro.h
 user.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 user.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 user.o: ../../../winix/winixd/core/basethread.h
 user.o: ../../../winix/winixd/core/winixmodel.h
-user.o: ../../../winix/winixd/core/winixbase.h
 user.o: ../../../winix/winixd/core/plugin.h
 user.o: ../../../winix/winixd/core/pluginmsg.h
 user.o: ../../../winix/winixd/core/dirs.h
@@ -3470,6 +3545,9 @@ user.o: ../../../winix/winixd/core/system.h
 user.o: ../../../winix/winixd/core/sessionidmanager.h
 user.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 user.o: ../../../winix/winixd/core/htmlfilter.h
+user.o: ../../../winix/winixd/core/winixrequest.h
+user.o: ../../../winix/winixd/core/winixsystem.h
+user.o: ../../../winix/winixd/core/slog.h
 user.o: ../../../winix/winixd/core/request.h
 user.o: ../../../winix/winixd/core/misc.h
 user.o: ../../../winix/winixd/core/winix_const.h
@@ -3489,16 +3567,18 @@ who.o: ../../../pikotools/convert/inttostr.h
 who.o: ../../../pikotools/convert/strtoint.h
 who.o: ../../../pikotools/convert/text.h
 who.o: ../../../pikotools/membuffer/membuffer.h
-who.o: ../../../pikotools/textstream/types.h htmltextstream.h
-who.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-who.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-who.o: changepatterns.h ../../../winix/winixd/core/config.h
-who.o: ../../../winix/winixd/core/htmlfilter.h
-who.o: ../../../winix/winixd/core/log.h
+who.o: ../../../pikotools/textstream/types.h
+who.o: ../../../winix/winixd/core/winixbase.h
+who.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 who.o: ../../../winix/winixd/core/textstream.h
 who.o: ../../../winix/winixd/core/logmanipulators.h
 who.o: ../../../winix/winixd/core/filelog.h
-who.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/cur.h
+who.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
+who.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
+who.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+who.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+who.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+who.o: changepatterns.h ../../../winix/winixd/core/cur.h
 who.o: ../../../winix/winixd/core/request.h
 who.o: ../../../winix/winixd/core/requesttypes.h
 who.o: ../../../winix/winixd/core/error.h ../../../winix/winixd/core/config.h
@@ -3508,13 +3588,10 @@ who.o: ../../../winix/winixd/core/session.h ../../../winix/winixd/core/user.h
 who.o: ../../../winix/winixd/core/plugindata.h
 who.o: ../../../winix/winixd/core/rebus.h
 who.o: ../../../winix/winixd/core/winixbase.h
-who.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-who.o: ../../../winix/winixd/core/lock.h ../../../winix/winixd/core/synchro.h
 who.o: ../../../winix/winixd/core/ipban.h ../../../winix/winixd/core/mount.h
 who.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 who.o: ../../../winix/winixd/core/basethread.h
 who.o: ../../../winix/winixd/core/winixmodel.h
-who.o: ../../../winix/winixd/core/winixbase.h
 who.o: ../../../winix/winixd/core/plugin.h
 who.o: ../../../winix/winixd/core/pluginmsg.h
 who.o: ../../../winix/winixd/core/dirs.h
@@ -3557,7 +3634,10 @@ who.o: ../../../winix/winixd/core/system.h
 who.o: ../../../winix/winixd/core/sessionidmanager.h
 who.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 who.o: ../../../winix/winixd/core/htmlfilter.h
-who.o: ../../../winix/winixd/core/request.h ../../../winix/winixd/core/misc.h
+who.o: ../../../winix/winixd/core/winixrequest.h
+who.o: ../../../winix/winixd/core/winixsystem.h
+who.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h
+who.o: ../../../winix/winixd/core/misc.h
 who.o: ../../../winix/winixd/core/winix_const.h
 winix.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 winix.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
@@ -3576,17 +3656,20 @@ winix.o: ../../../pikotools/convert/inttostr.h
 winix.o: ../../../pikotools/convert/strtoint.h
 winix.o: ../../../pikotools/convert/text.h
 winix.o: ../../../pikotools/membuffer/membuffer.h
-winix.o: ../../../pikotools/textstream/types.h htmltextstream.h
-winix.o: ../../../winix/winixd/core/textstream.h patterncacher.h
-winix.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
-winix.o: changepatterns.h ../../../winix/winixd/core/config.h
-winix.o: ../../../winix/winixd/core/htmlfilter.h
-winix.o: ../../../winix/winixd/core/log.h
+winix.o: ../../../pikotools/textstream/types.h
+winix.o: ../../../winix/winixd/core/winixbase.h
+winix.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h
 winix.o: ../../../winix/winixd/core/textstream.h
 winix.o: ../../../winix/winixd/core/logmanipulators.h
 winix.o: ../../../winix/winixd/core/filelog.h
 winix.o: ../../../winix/winixd/core/synchro.h
-winix.o: ../../../winix/winixd/core/cur.h
+winix.o: ../../../winix/winixd/core/log.h
+winix.o: ../../../winix/winixd/core/filelog.h
+winix.o: ../../../winix/winixd/core/lock.h
+winix.o: ../../../winix/winixd/core/synchro.h htmltextstream.h
+winix.o: ../../../winix/winixd/core/textstream.h patterncacher.h
+winix.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
+winix.o: changepatterns.h ../../../winix/winixd/core/cur.h
 winix.o: ../../../winix/winixd/core/request.h
 winix.o: ../../../winix/winixd/core/requesttypes.h
 winix.o: ../../../winix/winixd/core/error.h
@@ -3598,16 +3681,11 @@ winix.o: ../../../winix/winixd/core/user.h
 winix.o: ../../../winix/winixd/core/plugindata.h
 winix.o: ../../../winix/winixd/core/rebus.h
 winix.o: ../../../winix/winixd/core/winixbase.h
-winix.o: ../../../winix/winixd/core/log.h
-winix.o: ../../../winix/winixd/core/filelog.h
-winix.o: ../../../winix/winixd/core/lock.h
-winix.o: ../../../winix/winixd/core/synchro.h
 winix.o: ../../../winix/winixd/core/ipban.h
 winix.o: ../../../winix/winixd/core/mount.h
 winix.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h
 winix.o: ../../../winix/winixd/core/basethread.h
 winix.o: ../../../winix/winixd/core/winixmodel.h
-winix.o: ../../../winix/winixd/core/winixbase.h
 winix.o: ../../../winix/winixd/core/plugin.h
 winix.o: ../../../winix/winixd/core/pluginmsg.h
 winix.o: ../../../winix/winixd/core/dirs.h
@@ -3650,15 +3728,14 @@ winix.o: ../../../winix/winixd/core/system.h
 winix.o: ../../../winix/winixd/core/sessionidmanager.h
 winix.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
 winix.o: ../../../winix/winixd/core/htmlfilter.h
+winix.o: ../../../winix/winixd/core/winixrequest.h
+winix.o: ../../../winix/winixd/core/winixsystem.h
+winix.o: ../../../winix/winixd/core/slog.h
 winix.o: ../../../winix/winixd/core/request.h
-winix.o: ../../../winix/winixd/core/plugin.h
 winix.o: ../../../winix/winixd/core/misc.h
 winix.o: ../../../winix/winixd/core/winix_const.h
 winix.o: ../../../winix/winixd/functions/functions.h
 winix.o: ../../../winix/winixd/functions/functionbase.h
-winix.o: ../../../winix/winixd/core/winixrequest.h
-winix.o: ../../../winix/winixd/core/winixsystem.h
-winix.o: ../../../winix/winixd/core/slog.h
 winix.o: ../../../winix/winixd/functions/functionparser.h
 winix.o: ../../../winix/winixd/functions/account.h
 winix.o: ../../../winix/winixd/functions/adduser.h
diff --git a/winixd/templates/changepatterns.h b/winixd/templates/changepatterns.h
index 258f703..0e6898b 100644
--- a/winixd/templates/changepatterns.h
+++ b/winixd/templates/changepatterns.h
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2014, Tomasz Sowa
+ * Copyright (c) 2011-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -37,12 +37,14 @@
 
 #include <map>
 #include "patterns.h"
+#include "core/winixbase.h"
+
 
 namespace Winix
 {
 
 
-class ChangePatterns
+class ChangePatterns : public WinixBase
 {
 public:
 
diff --git a/winixd/templates/indexpatterns.h b/winixd/templates/indexpatterns.h
index bf7432b..0123a4b 100644
--- a/winixd/templates/indexpatterns.h
+++ b/winixd/templates/indexpatterns.h
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -40,12 +40,15 @@
 #include <map>
 #include "ezc.h"
 #include "patterns.h"
+#include "core/winixbase.h"
+
+
 
 namespace Winix
 {
 
 
-class IndexPatterns
+class IndexPatterns : public WinixBase
 {
 public:
 
diff --git a/winixd/templates/locale.h b/winixd/templates/locale.h
index c733b36..572cc8d 100644
--- a/winixd/templates/locale.h
+++ b/winixd/templates/locale.h
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -39,12 +39,14 @@
 #include <string>
 #include "space/spaceparser.h"
 #include "textstream/textstream.h"
+#include "core/winixbase.h"
+
 
 namespace Winix
 {
 
 
-class Locale
+class Locale : public WinixBase
 {
 public:
 
diff --git a/winixd/templates/localefilter.cpp b/winixd/templates/localefilter.cpp
index 102a3c4..b95bb62 100644
--- a/winixd/templates/localefilter.cpp
+++ b/winixd/templates/localefilter.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
  */
  
 #include "localefilter.h"
-#include "../core/misc.h"
+#include "core/misc.h"
 
 namespace Winix
 {
diff --git a/winixd/templates/localefilter.h b/winixd/templates/localefilter.h
index 7ca8714..1a9324a 100644
--- a/winixd/templates/localefilter.h
+++ b/winixd/templates/localefilter.h
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -37,12 +37,14 @@
 
 #include "locale.h"
 #include "ezc.h"
+#include "core/winixbase.h"
+
 
 namespace Winix
 {
 
 
-class LocaleFilter
+class LocaleFilter : public WinixBase
 {
 public:
 	
diff --git a/winixd/templates/patterncacher.cpp b/winixd/templates/patterncacher.cpp
index 38eaabb..be8684d 100644
--- a/winixd/templates/patterncacher.cpp
+++ b/winixd/templates/patterncacher.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2015, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,7 @@
  * 
  */
  
+#include <algorithm>
 #include "patterncacher.h"
 #include "core/log.h"
 
diff --git a/winixd/templates/patterncacher.h b/winixd/templates/patterncacher.h
index db94f62..364d642 100644
--- a/winixd/templates/patterncacher.h
+++ b/winixd/templates/patterncacher.h
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2015, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,9 @@
 #include "core/item.h"
 #include "misc.h"
 #include "ezc.h"
+#include "core/winixbase.h"
+
+
 
 namespace Winix
 {
@@ -48,7 +51,7 @@ namespace Winix
 
 
 
-class PatternCacher
+class PatternCacher : public WinixBase
 {
 public:
 
diff --git a/winixd/templates/patterns.h b/winixd/templates/patterns.h
index 0045ab3..3b1067e 100644
--- a/winixd/templates/patterns.h
+++ b/winixd/templates/patterns.h
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2016, Tomasz Sowa
+ * Copyright (c) 2011-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -39,12 +39,14 @@
 #include "locale.h"
 #include "localefilter.h"
 #include "misc.h"
+#include "core/winixbase.h"
+
 
 namespace Winix
 {
 
 
-class Patterns
+class Patterns : public WinixBase
 {
 public:
 
diff --git a/winixd/templates/sys.cpp b/winixd/templates/sys.cpp
index 9695ebc..0aee317 100644
--- a/winixd/templates/sys.cpp
+++ b/winixd/templates/sys.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2014, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 #include "templates.h"
 #include "core/request.h"
 #include "core/version.h"
-#include "core/plugin.h"
+
 
 namespace Winix
 {
@@ -72,20 +72,20 @@ static size_t sys_plugin_index = 0;
 void sys_plugin_tab(Info & i)
 {
 	sys_plugin_index = i.iter;
-	i.res = sys_plugin_index < plugin.GetPlugins()->size();
+	i.res = sys_plugin_index < plugin->GetPlugins()->size();
 }
 
 void sys_plugin_tab_has_name(Info & i)
 {
-	if( sys_plugin_index < plugin.GetPlugins()->size() )
-		i.res = (*plugin.GetPlugins())[sys_plugin_index].plugin_name != 0;
+	if( sys_plugin_index < plugin->GetPlugins()->size() )
+		i.res = (*plugin->GetPlugins())[sys_plugin_index].plugin_name != 0;
 }
 
 void sys_plugin_tab_name(Info & i)
 {
-	if( sys_plugin_index < plugin.GetPlugins()->size() )
+	if( sys_plugin_index < plugin->GetPlugins()->size() )
 	{
-		const wchar_t * name = (*plugin.GetPlugins())[sys_plugin_index].plugin_name;
+		const wchar_t * name = (*plugin->GetPlugins())[sys_plugin_index].plugin_name;
 
 		if( name )
 			i.out << name;
diff --git a/winixd/templates/templates.cpp b/winixd/templates/templates.cpp
index 9c43196..53f7c2c 100644
--- a/winixd/templates/templates.cpp
+++ b/winixd/templates/templates.cpp
@@ -56,7 +56,8 @@ IndexPatterns     index_patterns;	// patterns for main index templates (those fr
 ChangePatterns    change_patterns;	// patterns for change_template mount option (storage is in 'patterns' too)
 PatternCacher     pattern_cacher;	// patterns for user items (files with an executable bit set)
 
-Locale            locale;
+Locale            locale;			// IMPROVE ME will be moved to a better place
+
 EzcFun            ezc_functions;
 Ezc::Blocks       ezc_blocks;
 Ezc::Objects<HtmlTextStream> ezc_objects;
@@ -73,12 +74,16 @@ const HtmlTextStream      empty_stream;
 // en empty stack item for templates functions
 Ezc::Stack empty_stack;
 
-Db      * db;
-Cur     * cur;
-Config  * config;
-System  * system;
-Functions * functions;
-SessionManager * session_manager;
+Db      * db = nullptr;
+Cur     * cur = nullptr;
+Config  * config = nullptr;
+System  * system = nullptr;
+Functions * functions = nullptr;
+SessionManager * session_manager = nullptr;
+
+
+Log log; // temporarily for ezc functions
+Plugin * plugin = nullptr; // temporarily for ezc functions
 
 
 // generator used by content() function
@@ -778,7 +783,7 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("content", content);
 
 
-	plugin.Call((Session*)0, WINIX_TEMPLATES_CREATEFUNCTIONS, &ezc_functions, &ezc_objects);
+	plugin->Call((Session*)0, WINIX_TEMPLATES_CREATEFUNCTIONS, &ezc_functions, &ezc_objects);
 
 
 	Ezc::Objects<HtmlTextStream>::Iterator i = ezc_objects.Begin();
@@ -806,14 +811,12 @@ void Templates::CreateFunctions()
 
 void Templates::ReadLocale()
 {
-using namespace TemplatesFunctions;
+	TemplatesFunctions::locale.SetLocaleFiles(config->locale_files);
+	TemplatesFunctions::locale.SetLocaleMaxId(config->locale_max_id);
+	TemplatesFunctions::locale.SetDefLang(config->locale_default_id);
+	TemplatesFunctions::locale.Read(config->locale_dir, config->locale_dir_default);
 
-	locale.SetLocaleFiles(config->locale_files);
-	locale.SetLocaleMaxId(config->locale_max_id);
-	locale.SetDefLang(config->locale_default_id);
-	locale.Read(config->locale_dir, config->locale_dir_default);
-
-	log << log3 << "Templates: there are " << locale.Size() << " locales" << logend;
+	log << log3 << "Templates: there are " << TemplatesFunctions::locale.Size() << " locales" << logend;
 }
 
 
@@ -891,15 +894,15 @@ using namespace TemplatesFunctions;
 
 	if( config->html_filter_orphans )
 	{
-		html_filter.OrphansMode(config->html_filter_orphans_mode);
+		html_filter.OrphansMode(config->html_filter_orphans_mode_str);
 
-		for(size_t i=0 ; i<locale.Size() ; ++i)
+		for(size_t i=0 ; i<TemplatesFunctions::locale.Size() ; ++i)
 		{
-			if( locale.IsKeyByIndex(L"html_lang_attr_value", i, false) &&
-				locale.IsListByIndex(L"language_orphans", i, false) )
+			if( TemplatesFunctions::locale.IsKeyByIndex(L"html_lang_attr_value", i, false) &&
+				TemplatesFunctions::locale.IsListByIndex(L"language_orphans", i, false) )
 			{
-				html_filter.AssignOrphans(locale.GetByIndex(L"html_lang_attr_value", i, false),
-										  locale.GetListByIndex(L"language_orphans", i, false));
+				html_filter.AssignOrphans(TemplatesFunctions::locale.GetByIndex(L"html_lang_attr_value", i, false),
+										  TemplatesFunctions::locale.GetListByIndex(L"language_orphans", i, false));
 			}
 		}
 	}
@@ -969,7 +972,7 @@ using namespace TemplatesFunctions;
 	ReadIndexTemplates();
 	ReadChangeTemplates();
 
-	plugin.Call((Session*)0, WINIX_ADD_TEMPLATE);
+	plugin->Call((Session*)0, WINIX_ADD_TEMPLATE);
 
 	patterns.RebuildCache();
 	ezc_blocks.CacheObjects(ezc_objects);
@@ -980,7 +983,7 @@ using namespace TemplatesFunctions;
 	SetHtmlFilter();
 
 	log << log3 << "Templates: there are " << patterns.Size() << " patterns"
-		<< " (" << (locale.Size() * patterns.Size()) << " for all locales)" << logend;
+		<< " (" << (TemplatesFunctions::locale.Size() * patterns.Size()) << " for all locales)" << logend;
 }
 
 
@@ -1025,16 +1028,16 @@ using namespace TemplatesFunctions;
 
 	if( template_name == config->templates_index )
 	{
-		index = patterns.Get(pat_index, locale.GetCurLang());
+		index = patterns.Get(pat_index, TemplatesFunctions::locale.GetCurLang());
 	}
 	else
 	if( template_name == config->templates_index_raw )
 	{
-		index = patterns.Get(pat_index_raw, locale.GetCurLang());
+		index = patterns.Get(pat_index_raw, TemplatesFunctions::locale.GetCurLang());
 	}
 	else
 	{
-		index = index_patterns.Get(template_name, locale.GetCurLang());
+		index = index_patterns.Get(template_name, TemplatesFunctions::locale.GetCurLang());
 	}
 
 	if( index )
@@ -1070,7 +1073,7 @@ using namespace TemplatesFunctions;
 
 	if( !index )
 	{
-		index = change_patterns.Get(cur->mount->dir_id, config->templates_index, locale.GetCurLang());
+		index = change_patterns.Get(cur->mount->dir_id, config->templates_index, TemplatesFunctions::locale.GetCurLang());
 
 		if( index )
 			log << log3 << "Templates: index template taken from change_patterns" << logend;
@@ -1078,7 +1081,7 @@ using namespace TemplatesFunctions;
 
 	if( !index )
 	{
-		index = patterns.Get(pat_index, locale.GetCurLang());
+		index = patterns.Get(pat_index, TemplatesFunctions::locale.GetCurLang());
 
 		if( index )
 			log << log3 << "Templates: index template taken from: " << config->templates_index << logend;
@@ -1170,6 +1173,24 @@ void Templates::SetSessionManager(SessionManager * psession_manager)
 }
 
 
+void Templates::set_dependency(WinixRequest * winix_request)
+{
+	WinixRequest::set_dependency(winix_request);
+	TemplatesFunctions::locale.set_dependency(winix_request);
+	TemplatesFunctions::change_patterns.set_dependency(winix_request);
+	TemplatesFunctions::patterns.set_dependency(winix_request);
+	TemplatesFunctions::index_patterns.set_dependency(winix_request);
+	TemplatesFunctions::pattern_cacher.set_dependency(winix_request);
+	TemplatesFunctions::locale_filter.set_dependency(winix_request);
+	TemplatesFunctions::html_filter.set_dependency(winix_request);
+
+	log.SetDependency(&this->log);
+	log.Init(config->log_level, config->log_save_each_line, config->log_request);
+
+	plugin = winix_request->get_plugin();
+}
+
+
 Templates::Templates()
 {
 	using namespace TemplatesFunctions;
@@ -1178,7 +1199,7 @@ Templates::Templates()
 	patterns.SetEzcFunctions(&ezc_functions);
 	patterns.SetEzcBlocks(&ezc_blocks);
 
-	patterns.SetLocale(&locale);
+	patterns.SetLocale(&TemplatesFunctions::locale);
 	patterns.SetLocaleFilter(&locale_filter);
 
 	index_patterns.SetPatterns(&patterns);
diff --git a/winixd/templates/templates.h b/winixd/templates/templates.h
index d820cb9..41b037d 100644
--- a/winixd/templates/templates.h
+++ b/winixd/templates/templates.h
@@ -52,6 +52,8 @@
 #include "core/sessionmanager.h"
 #include "core/htmlfilter.h"
 #include "db/db.h"
+#include "core/winixrequest.h"
+
 
 namespace Winix
 {
@@ -80,12 +82,15 @@ namespace TemplatesFunctions
 	extern Ezc::Stack        empty_stack;
 
 	extern Db      * db;
-	extern Cur     * cur;
-	extern Config  * config;
-	extern System  * system;
+	extern Cur     * cur; // will be removed when TemplateBase class will be implemented
+	extern Config  * config; // will be removed when TemplateBase class will be implemented
+	extern System  * system; // will be removed when TemplateBase class will be implemented
 	extern Functions * functions;
 	extern SessionManager * session_manager;
 
+	extern Log log; // will be removed when TemplateBase class will be implemented
+	extern Plugin * plugin; // will be removed when TemplateBase class will be implemented
+
 	extern bool gen_trim_white;
 	extern bool gen_skip_new_line;
 	extern bool gen_use_special_chars;
@@ -676,8 +681,9 @@ namespace TemplatesFunctions
 
 
 
-
-class Templates
+// will be similar like Functions
+// concrete templates classes (based on TemplateBase) will be registered here
+class Templates : public WinixRequest
 {
 public:
 
@@ -690,6 +696,8 @@ public:
 	void SetFunctions(Functions * pfunctions);
 	void SetSessionManager(SessionManager * psession_manager);
 
+	void set_dependency(WinixRequest * winix_request);
+
 	void Init();
 	void ClearAfterRequest();
 	void ReadTemplates();
diff --git a/winixd/templates/winix.cpp b/winixd/templates/winix.cpp
index 01d1e1d..09b0deb 100644
--- a/winixd/templates/winix.cpp
+++ b/winixd/templates/winix.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2014, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,6 @@
 #include <ctime>
 #include "templates.h"
 #include "core/request.h"
-#include "core/plugin.h"
 #include "core/misc.h"
 #include "functions/functions.h"
 
@@ -134,7 +133,7 @@ size_t exist = 0;
 
 	for(size_t a=0 ; a<i.params.size() ; ++a)
 	{
-		if( plugin.HasPlugin(i.params[a].str) )
+		if( plugin->HasPlugin(i.params[a].str) )
 			++exist;
 	}