diff --git a/src/Makefile.dep b/src/Makefile.dep
index e346216..4f8545b 100644
--- a/src/Makefile.dep
+++ b/src/Makefile.dep
@@ -2,35 +2,27 @@
 
 ./blocks.o: blocks.h item.h cache.h functions.h
 ./blocks.o: ../../pikotools/src/utf8/utf8.h
-./blocks.o: ../../pikotools/src/textstream/stream.h
-./blocks.o: ../../pikotools/src/utf8/utf8_templates.h
-./blocks.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
+./blocks.o: ../../pikotools/src/textstream/stream.h funinfo.h objects.h
 ./cache.o: cache.h item.h functions.h ../../pikotools/src/utf8/utf8.h
-./cache.o: ../../pikotools/src/textstream/stream.h
-./cache.o: ../../pikotools/src/utf8/utf8_templates.h
-./cache.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
+./cache.o: ../../pikotools/src/textstream/stream.h funinfo.h objects.h
 ./cache.o: blocks.h
 ./item.o: item.h
 ./pattern.o: pattern.h item.h cache.h functions.h
 ./pattern.o: ../../pikotools/src/utf8/utf8.h
-./pattern.o: ../../pikotools/src/textstream/stream.h
-./pattern.o: ../../pikotools/src/utf8/utf8_templates.h
-./pattern.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h objects.h
+./pattern.o: ../../pikotools/src/textstream/stream.h funinfo.h objects.h
 ./pattern.o: blocks.h
 ./patternparser.o: patternparser.h blocks.h item.h cache.h functions.h
 ./patternparser.o: ../../pikotools/src/utf8/utf8.h
-./patternparser.o: ../../pikotools/src/textstream/stream.h
-./patternparser.o: ../../pikotools/src/utf8/utf8_templates.h
-./patternparser.o: ../../pikotools/src/utf8/utf8_private.h funinfo.h
+./patternparser.o: ../../pikotools/src/textstream/stream.h funinfo.h
 ./patternparser.o: objects.h pattern.h ../../pikotools/src/log/log.h
 ./patternparser.o: ../../pikotools/src/textstream/textstream.h
 ./patternparser.o: ../../pikotools/src/textstream/stream.h
 ./patternparser.o: ../../pikotools/src/space/space.h
-./patternparser.o: ../../pikotools/src/textstream/types.h
 ./patternparser.o: ../../pikotools/src/convert/inttostr.h
 ./patternparser.o: ../../pikotools/src/date/date.h
 ./patternparser.o: ../../pikotools/src/membuffer/membuffer.h
 ./patternparser.o: ../../pikotools/src/textstream/types.h
+./patternparser.o: ../../pikotools/src/textstream/stream_private.h
 ./patternparser.o: ../../pikotools/src/log/filelog.h
 ./patternparser.o: ../../pikotools/src/convert/convert.h
 ./patternparser.o: ../../pikotools/src/convert/inttostr.h
@@ -38,5 +30,6 @@
 ./patternparser.o: ../../pikotools/src/convert/strtoint.h
 ./patternparser.o: ../../pikotools/src/convert/text.h
 ./patternparser.o: ../../pikotools/src/convert/misc.h
+./patternparser.o: ../../pikotools/src/textstream/types.h
 ./patternparser.o: ../../pikotools/src/convert/double.h
 ./models.o: models.h