diff --git a/src/Makefile b/src/Makefile
index 683b0d1..d7421b1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,7 +38,7 @@ clean:
 
 
 depend:
-	makedepend -Y. -f- $(sourcefiles) > Makefile.dep
+	makedepend -w 10 -Y. -f- $(sourcefiles) | sort -u > Makefile.dep
 
 
 -include Makefile.dep
diff --git a/src/Makefile.dep b/src/Makefile.dep
index 89500a4..81d553f 100644
--- a/src/Makefile.dep
+++ b/src/Makefile.dep
@@ -1,71 +1,152 @@
-# DO NOT DELETE
 
-./convert/inttostr.o: ./convert/inttostr.h
-./convert/misc.o: ./convert/misc.h textstream/stream.h ./convert/inttostr.h
-./convert/text.o: ./convert/text.h ./convert/text_private.h
-./convert/double.o: ./convert/double.h textstream/textstream.h
-./convert/double.o: textstream/stream.h space/space.h convert/inttostr.h
-./convert/double.o: convert/misc.h textstream/stream.h utf8/utf8.h
-./convert/double.o: date/date.h membuffer/membuffer.h textstream/types.h
-./convert/double.o: textstream/stream_private.h
-./convert/baseparser.o: ./convert/baseparser.h textstream/textstream.h
-./convert/baseparser.o: textstream/stream.h space/space.h convert/inttostr.h
-./convert/baseparser.o: convert/misc.h textstream/stream.h utf8/utf8.h
-./convert/baseparser.o: date/date.h membuffer/membuffer.h textstream/types.h
+./convert/baseparser.o: ./convert/baseparser.h
+./convert/baseparser.o: convert/inttostr.h
+./convert/baseparser.o: convert/misc.h
+./convert/baseparser.o: date/date.h
+./convert/baseparser.o: membuffer/membuffer.h
+./convert/baseparser.o: space/space.h
 ./convert/baseparser.o: textstream/stream_private.h
-./date/date.o: ./date/date.h convert/inttostr.h
-./log/filelog.o: ./log/filelog.h textstream/textstream.h textstream/stream.h
-./log/filelog.o: space/space.h convert/inttostr.h convert/misc.h
-./log/filelog.o: textstream/stream.h utf8/utf8.h date/date.h
-./log/filelog.o: membuffer/membuffer.h textstream/types.h
-./log/filelog.o: textstream/stream_private.h
-./log/log.o: ./log/log.h textstream/textstream.h textstream/stream.h
-./log/log.o: space/space.h convert/inttostr.h convert/misc.h
-./log/log.o: textstream/stream.h utf8/utf8.h date/date.h
-./log/log.o: membuffer/membuffer.h textstream/types.h
-./log/log.o: textstream/stream_private.h ./log/filelog.h
-./space/space.o: ./space/space.h convert/inttostr.h convert/misc.h
-./space/space.o: textstream/stream.h utf8/utf8.h convert/convert.h
-./space/space.o: ./convert/inttostr.h convert/patternreplacer.h
-./space/space.o: textstream/textstream.h textstream/stream.h space/space.h
-./space/space.o: date/date.h membuffer/membuffer.h textstream/types.h
-./space/space.o: textstream/stream_private.h convert/strtoint.h
-./space/space.o: ./convert/text.h ./convert/misc.h ./convert/double.h
-./space/spaceparser.o: ./space/spaceparser.h ./space/space.h
-./space/spaceparser.o: convert/inttostr.h convert/misc.h textstream/stream.h
-./space/spaceparser.o: utf8/utf8.h convert/baseparser.h
-./space/spaceparser.o: textstream/textstream.h textstream/stream.h
-./space/spaceparser.o: space/space.h date/date.h membuffer/membuffer.h
-./space/spaceparser.o: textstream/types.h textstream/stream_private.h
-./space/spaceparser.o: convert/strtoint.h ./convert/text.h ./convert/misc.h
-./space/keyvalueparser.o: ./space/keyvalueparser.h ./space/space.h
-./space/keyvalueparser.o: convert/inttostr.h convert/misc.h
-./space/keyvalueparser.o: textstream/stream.h utf8/utf8.h
-./space/keyvalueparser.o: convert/baseparser.h textstream/textstream.h
-./space/keyvalueparser.o: textstream/stream.h space/space.h date/date.h
-./space/keyvalueparser.o: membuffer/membuffer.h textstream/types.h
-./space/keyvalueparser.o: textstream/stream_private.h convert/strtoint.h
-./space/keyvalueparser.o: ./convert/text.h ./convert/misc.h
-./textstream/stream_private.o: textstream/stream_private.h
-./utf8/utf8.o: ./utf8/utf8.h textstream/stream.h
-./csv/csvparser.o: ./csv/csvparser.h space/space.h convert/inttostr.h
-./csv/csvparser.o: convert/misc.h textstream/stream.h utf8/utf8.h
-./csv/csvparser.o: convert/baseparser.h textstream/textstream.h
-./csv/csvparser.o: textstream/stream.h date/date.h membuffer/membuffer.h
-./csv/csvparser.o: textstream/types.h textstream/stream_private.h
-./mainoptions/mainoptionsparser.o: ./mainoptions/mainoptionsparser.h
-./mainoptions/mainoptionsparser.o: space/space.h convert/inttostr.h
-./mainoptions/mainoptionsparser.o: convert/misc.h textstream/stream.h
-./mainoptions/mainoptionsparser.o: utf8/utf8.h
-./html/bbcodeparser.o: ./html/bbcodeparser.h ./html/htmlparser.h
-./html/bbcodeparser.o: convert/baseparser.h textstream/textstream.h
-./html/bbcodeparser.o: textstream/stream.h space/space.h convert/inttostr.h
-./html/bbcodeparser.o: convert/misc.h textstream/stream.h utf8/utf8.h
-./html/bbcodeparser.o: date/date.h membuffer/membuffer.h textstream/types.h
+./convert/baseparser.o: textstream/stream.h
+./convert/baseparser.o: textstream/textstream.h
+./convert/baseparser.o: textstream/types.h
+./convert/baseparser.o: utf8/utf8.h
+./convert/double.o: ./convert/double.h
+./convert/double.o: convert/inttostr.h
+./convert/double.o: convert/misc.h
+./convert/double.o: date/date.h
+./convert/double.o: membuffer/membuffer.h
+./convert/double.o: space/space.h
+./convert/double.o: textstream/stream_private.h
+./convert/double.o: textstream/stream.h
+./convert/double.o: textstream/textstream.h
+./convert/double.o: textstream/types.h
+./convert/double.o: utf8/utf8.h
+./convert/inttostr.o: ./convert/inttostr.h
+./convert/misc.o: ./convert/inttostr.h
+./convert/misc.o: ./convert/misc.h
+./convert/misc.o: textstream/stream.h
+./convert/text.o: ./convert/text_private.h
+./convert/text.o: ./convert/text.h
+./csv/csvparser.o: ./csv/csvparser.h
+./csv/csvparser.o: convert/baseparser.h
+./csv/csvparser.o: convert/inttostr.h
+./csv/csvparser.o: convert/misc.h
+./csv/csvparser.o: date/date.h
+./csv/csvparser.o: membuffer/membuffer.h
+./csv/csvparser.o: space/space.h
+./csv/csvparser.o: textstream/stream_private.h
+./csv/csvparser.o: textstream/stream.h
+./csv/csvparser.o: textstream/textstream.h
+./csv/csvparser.o: textstream/types.h
+./csv/csvparser.o: utf8/utf8.h
+./date/date.o: ./date/date.h
+./date/date.o: convert/inttostr.h
+./html/bbcodeparser.o: ./html/bbcodeparser.h
+./html/bbcodeparser.o: ./html/htmlparser.h
+./html/bbcodeparser.o: convert/baseparser.h
+./html/bbcodeparser.o: convert/inttostr.h
+./html/bbcodeparser.o: convert/misc.h
+./html/bbcodeparser.o: date/date.h
+./html/bbcodeparser.o: membuffer/membuffer.h
+./html/bbcodeparser.o: space/space.h
 ./html/bbcodeparser.o: textstream/stream_private.h
-./html/htmlparser.o: ./html/htmlparser.h convert/baseparser.h
-./html/htmlparser.o: textstream/textstream.h textstream/stream.h
-./html/htmlparser.o: space/space.h convert/inttostr.h convert/misc.h
-./html/htmlparser.o: textstream/stream.h utf8/utf8.h date/date.h
-./html/htmlparser.o: membuffer/membuffer.h textstream/types.h
-./html/htmlparser.o: textstream/stream_private.h convert/text.h
+./html/bbcodeparser.o: textstream/stream.h
+./html/bbcodeparser.o: textstream/textstream.h
+./html/bbcodeparser.o: textstream/types.h
+./html/bbcodeparser.o: utf8/utf8.h
+./html/htmlparser.o: ./html/htmlparser.h
+./html/htmlparser.o: convert/baseparser.h
+./html/htmlparser.o: convert/inttostr.h
+./html/htmlparser.o: convert/misc.h
+./html/htmlparser.o: convert/text.h
+./html/htmlparser.o: date/date.h
+./html/htmlparser.o: membuffer/membuffer.h
+./html/htmlparser.o: space/space.h
+./html/htmlparser.o: textstream/stream_private.h
+./html/htmlparser.o: textstream/stream.h
+./html/htmlparser.o: textstream/textstream.h
+./html/htmlparser.o: textstream/types.h
+./html/htmlparser.o: utf8/utf8.h
+./log/filelog.o: ./log/filelog.h
+./log/filelog.o: convert/inttostr.h
+./log/filelog.o: convert/misc.h
+./log/filelog.o: date/date.h
+./log/filelog.o: membuffer/membuffer.h
+./log/filelog.o: space/space.h
+./log/filelog.o: textstream/stream_private.h
+./log/filelog.o: textstream/stream.h
+./log/filelog.o: textstream/textstream.h
+./log/filelog.o: textstream/types.h
+./log/filelog.o: utf8/utf8.h
+./log/log.o: ./log/filelog.h
+./log/log.o: ./log/log.h
+./log/log.o: convert/inttostr.h
+./log/log.o: convert/misc.h
+./log/log.o: date/date.h
+./log/log.o: membuffer/membuffer.h
+./log/log.o: space/space.h
+./log/log.o: textstream/stream_private.h
+./log/log.o: textstream/stream.h
+./log/log.o: textstream/textstream.h
+./log/log.o: textstream/types.h
+./log/log.o: utf8/utf8.h
+./mainoptions/mainoptionsparser.o: ./mainoptions/mainoptionsparser.h
+./mainoptions/mainoptionsparser.o: convert/inttostr.h
+./mainoptions/mainoptionsparser.o: convert/misc.h
+./mainoptions/mainoptionsparser.o: space/space.h
+./mainoptions/mainoptionsparser.o: textstream/stream.h
+./mainoptions/mainoptionsparser.o: utf8/utf8.h
+./space/keyvalueparser.o: ./convert/misc.h
+./space/keyvalueparser.o: ./convert/text.h
+./space/keyvalueparser.o: ./space/keyvalueparser.h
+./space/keyvalueparser.o: ./space/space.h
+./space/keyvalueparser.o: convert/baseparser.h
+./space/keyvalueparser.o: convert/inttostr.h
+./space/keyvalueparser.o: convert/misc.h
+./space/keyvalueparser.o: convert/strtoint.h
+./space/keyvalueparser.o: date/date.h
+./space/keyvalueparser.o: membuffer/membuffer.h
+./space/keyvalueparser.o: space/space.h
+./space/keyvalueparser.o: textstream/stream_private.h
+./space/keyvalueparser.o: textstream/stream.h
+./space/keyvalueparser.o: textstream/textstream.h
+./space/keyvalueparser.o: textstream/types.h
+./space/keyvalueparser.o: utf8/utf8.h
+./space/space.o: ./convert/double.h
+./space/space.o: ./convert/inttostr.h
+./space/space.o: ./convert/misc.h
+./space/space.o: ./convert/text.h
+./space/space.o: ./space/space.h
+./space/space.o: convert/convert.h
+./space/space.o: convert/inttostr.h
+./space/space.o: convert/misc.h
+./space/space.o: convert/patternreplacer.h
+./space/space.o: convert/strtoint.h
+./space/space.o: date/date.h
+./space/space.o: membuffer/membuffer.h
+./space/space.o: space/space.h
+./space/space.o: textstream/stream_private.h
+./space/space.o: textstream/stream.h
+./space/space.o: textstream/textstream.h
+./space/space.o: textstream/types.h
+./space/space.o: utf8/utf8.h
+./space/spaceparser.o: ./convert/misc.h
+./space/spaceparser.o: ./convert/text.h
+./space/spaceparser.o: ./space/space.h
+./space/spaceparser.o: ./space/spaceparser.h
+./space/spaceparser.o: convert/baseparser.h
+./space/spaceparser.o: convert/inttostr.h
+./space/spaceparser.o: convert/misc.h
+./space/spaceparser.o: convert/strtoint.h
+./space/spaceparser.o: date/date.h
+./space/spaceparser.o: membuffer/membuffer.h
+./space/spaceparser.o: space/space.h
+./space/spaceparser.o: textstream/stream_private.h
+./space/spaceparser.o: textstream/stream.h
+./space/spaceparser.o: textstream/textstream.h
+./space/spaceparser.o: textstream/types.h
+./space/spaceparser.o: utf8/utf8.h
+./textstream/stream_private.o: textstream/stream_private.h
+./utf8/utf8.o: ./utf8/utf8.h
+./utf8/utf8.o: textstream/stream.h
+# DO NOT DELETE
diff --git a/tests/Makefile b/tests/Makefile
index 6d6de49..d611de3 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -35,7 +35,7 @@ clean:
 
 
 depend:
-	makedepend -Y. -I../src -f- $(sourcefiles) > Makefile.dep
+	makedepend -w 10 -Y. -I../src -f- $(sourcefiles) | sort -u > Makefile.dep
 
 
 FORCE:
diff --git a/tests/Makefile.dep b/tests/Makefile.dep
index 5ec1105..8e3fa99 100644
--- a/tests/Makefile.dep
+++ b/tests/Makefile.dep
@@ -1,41 +1,71 @@
-# DO NOT DELETE
 
-./convert.o: convert.h ../src/convert/convert.h ../src/convert/inttostr.h
-./convert.o: ../src/convert/patternreplacer.h ../src/textstream/textstream.h
-./convert.o: ../src/textstream/stream.h ../src/space/space.h
-./convert.o: ../src/convert/inttostr.h ../src/convert/misc.h
-./convert.o: ../src/textstream/stream.h ../src/utf8/utf8.h ../src/date/date.h
-./convert.o: ../src/membuffer/membuffer.h ../src/textstream/types.h
-./convert.o: ../src/textstream/stream_private.h ../src/convert/strtoint.h
-./convert.o: ../src/convert/text.h ../src/convert/misc.h
-./convert.o: ../src/convert/double.h test.h
-./csvparser.o: csvparser.h ../src/csv/csvparser.h ../src/space/space.h
-./csvparser.o: ../src/convert/inttostr.h ../src/convert/misc.h
-./csvparser.o: ../src/textstream/stream.h ../src/utf8/utf8.h
-./csvparser.o: ../src/convert/baseparser.h ../src/textstream/textstream.h
-./csvparser.o: ../src/textstream/stream.h ../src/date/date.h
-./csvparser.o: ../src/membuffer/membuffer.h ../src/textstream/types.h
-./csvparser.o: ../src/textstream/stream_private.h test.h
-./main.o: convert.h ../src/convert/convert.h ../src/convert/inttostr.h
-./main.o: ../src/convert/patternreplacer.h ../src/textstream/textstream.h
-./main.o: ../src/textstream/stream.h ../src/space/space.h
-./main.o: ../src/convert/inttostr.h ../src/convert/misc.h
-./main.o: ../src/textstream/stream.h ../src/utf8/utf8.h ../src/date/date.h
-./main.o: ../src/membuffer/membuffer.h ../src/textstream/types.h
-./main.o: ../src/textstream/stream_private.h ../src/convert/strtoint.h
-./main.o: ../src/convert/text.h ../src/convert/misc.h ../src/convert/double.h
-./main.o: test.h mainoptionsparser.h csvparser.h
-./test.o: test.h
-./mainoptionsparser.o: mainoptionsparser.h test.h
-./mainoptionsparser.o: ../src/mainoptions/mainoptionsparser.h
-./mainoptionsparser.o: ../src/space/space.h ../src/convert/inttostr.h
-./mainoptionsparser.o: ../src/convert/misc.h ../src/textstream/stream.h
-./mainoptionsparser.o: ../src/utf8/utf8.h ../src/convert/convert.h
+./convert.o: ../src/convert/convert.h
+./convert.o: ../src/convert/double.h
+./convert.o: ../src/convert/inttostr.h
+./convert.o: ../src/convert/misc.h
+./convert.o: ../src/convert/patternreplacer.h
+./convert.o: ../src/convert/strtoint.h
+./convert.o: ../src/convert/text.h
+./convert.o: ../src/date/date.h
+./convert.o: ../src/membuffer/membuffer.h
+./convert.o: ../src/space/space.h
+./convert.o: ../src/textstream/stream_private.h
+./convert.o: ../src/textstream/stream.h
+./convert.o: ../src/textstream/textstream.h
+./convert.o: ../src/textstream/types.h
+./convert.o: ../src/utf8/utf8.h
+./convert.o: convert.h
+./convert.o: test.h
+./csvparser.o: ../src/convert/baseparser.h
+./csvparser.o: ../src/convert/inttostr.h
+./csvparser.o: ../src/convert/misc.h
+./csvparser.o: ../src/csv/csvparser.h
+./csvparser.o: ../src/date/date.h
+./csvparser.o: ../src/membuffer/membuffer.h
+./csvparser.o: ../src/space/space.h
+./csvparser.o: ../src/textstream/stream_private.h
+./csvparser.o: ../src/textstream/stream.h
+./csvparser.o: ../src/textstream/textstream.h
+./csvparser.o: ../src/textstream/types.h
+./csvparser.o: ../src/utf8/utf8.h
+./csvparser.o: csvparser.h
+./csvparser.o: test.h
+./main.o: ../src/convert/convert.h
+./main.o: ../src/convert/double.h
+./main.o: ../src/convert/inttostr.h
+./main.o: ../src/convert/misc.h
+./main.o: ../src/convert/patternreplacer.h
+./main.o: ../src/convert/strtoint.h
+./main.o: ../src/convert/text.h
+./main.o: ../src/date/date.h
+./main.o: ../src/membuffer/membuffer.h
+./main.o: ../src/space/space.h
+./main.o: ../src/textstream/stream_private.h
+./main.o: ../src/textstream/stream.h
+./main.o: ../src/textstream/textstream.h
+./main.o: ../src/textstream/types.h
+./main.o: ../src/utf8/utf8.h
+./main.o: convert.h
+./main.o: csvparser.h
+./main.o: mainoptionsparser.h
+./main.o: test.h
+./mainoptionsparser.o: ../src/convert/convert.h
+./mainoptionsparser.o: ../src/convert/double.h
 ./mainoptionsparser.o: ../src/convert/inttostr.h
+./mainoptionsparser.o: ../src/convert/misc.h
 ./mainoptionsparser.o: ../src/convert/patternreplacer.h
-./mainoptionsparser.o: ../src/textstream/textstream.h
-./mainoptionsparser.o: ../src/textstream/stream.h ../src/date/date.h
-./mainoptionsparser.o: ../src/membuffer/membuffer.h ../src/textstream/types.h
+./mainoptionsparser.o: ../src/convert/strtoint.h
+./mainoptionsparser.o: ../src/convert/text.h
+./mainoptionsparser.o: ../src/date/date.h
+./mainoptionsparser.o: ../src/mainoptions/mainoptionsparser.h
+./mainoptionsparser.o: ../src/membuffer/membuffer.h
+./mainoptionsparser.o: ../src/space/space.h
 ./mainoptionsparser.o: ../src/textstream/stream_private.h
-./mainoptionsparser.o: ../src/convert/strtoint.h ../src/convert/text.h
-./mainoptionsparser.o: ../src/convert/misc.h ../src/convert/double.h
+./mainoptionsparser.o: ../src/textstream/stream.h
+./mainoptionsparser.o: ../src/textstream/textstream.h
+./mainoptionsparser.o: ../src/textstream/types.h
+./mainoptionsparser.o: ../src/utf8/utf8.h
+./mainoptionsparser.o: mainoptionsparser.h
+./mainoptionsparser.o: test.h
+./test.o: test.h
+# DO NOT DELETE