diff --git a/src/Makefile.dep b/src/Makefile.dep
index 26b3fcd..e37f93c 100644
--- a/src/Makefile.dep
+++ b/src/Makefile.dep
@@ -12,13 +12,6 @@
 ./log/log.o: textstream/types.h convert/inttostr.h date/date.h
 ./log/log.o: membuffer/membuffer.h textstream/types.h ./log/filelog.h
 ./log/log.o: utf8/utf8.h utf8/utf8_templates.h utf8/utf8_private.h
-./mainspaceparser/mainspaceparser.o: ./mainspaceparser/mainspaceparser.h
-./mainspaceparser/mainspaceparser.o: space/space.h textstream/types.h
-./mainspaceparser/mainspaceparser.o: convert/inttostr.h utf8/utf8.h
-./mainspaceparser/mainspaceparser.o: textstream/textstream.h date/date.h
-./mainspaceparser/mainspaceparser.o: membuffer/membuffer.h textstream/types.h
-./mainspaceparser/mainspaceparser.o: utf8/utf8_templates.h
-./mainspaceparser/mainspaceparser.o: utf8/utf8_private.h
 ./space/space.o: ./space/space.h textstream/types.h convert/inttostr.h
 ./space/space.o: utf8/utf8.h textstream/textstream.h space/space.h
 ./space/space.o: date/date.h membuffer/membuffer.h textstream/types.h
@@ -38,3 +31,9 @@
 ./utf8/utf8_private.o: utf8/utf8_private.h textstream/textstream.h
 ./utf8/utf8_private.o: space/space.h textstream/types.h convert/inttostr.h
 ./utf8/utf8_private.o: date/date.h membuffer/membuffer.h textstream/types.h
+./mainoptions/mainoptionsparser.o: ./mainoptions/mainoptionsparser.h
+./mainoptions/mainoptionsparser.o: space/space.h textstream/types.h
+./mainoptions/mainoptionsparser.o: convert/inttostr.h utf8/utf8.h
+./mainoptions/mainoptionsparser.o: textstream/textstream.h date/date.h
+./mainoptions/mainoptionsparser.o: membuffer/membuffer.h textstream/types.h
+./mainoptions/mainoptionsparser.o: utf8/utf8_templates.h utf8/utf8_private.h
diff --git a/tests/Makefile.dep b/tests/Makefile.dep
index a6f9e9c..827f046 100644
--- a/tests/Makefile.dep
+++ b/tests/Makefile.dep
@@ -1,6 +1,6 @@
 # DO NOT DELETE
 
-./main.o: convert.h mainargsparser.h
+./main.o: convert.h mainoptionsparser.h
 ./convert.o: convert.h test.h ../src/convert/convert.h
 ./convert.o: ../src/convert/inttostr.h ../src/convert/patternreplacer.h
 ./convert.o: ../src/textstream/textstream.h ../src/space/space.h
@@ -9,10 +9,15 @@
 ./convert.o: ../src/textstream/types.h ../src/convert/strtoint.h
 ./convert.o: ../src/convert/text.h ../src/convert/misc.h
 ./test.o: test.h
-./mainargsparser.o: mainargsparser.h test.h
-./mainargsparser.o: ../src/mainspaceparser/mainspaceparser.h
-./mainargsparser.o: ../src/space/space.h ../src/textstream/types.h
-./mainargsparser.o: ../src/convert/inttostr.h ../src/utf8/utf8.h
-./mainargsparser.o: ../src/textstream/textstream.h ../src/date/date.h
-./mainargsparser.o: ../src/membuffer/membuffer.h ../src/textstream/types.h
-./mainargsparser.o: ../src/utf8/utf8_templates.h ../src/utf8/utf8_private.h
+./mainoptionsparser.o: mainoptionsparser.h test.h
+./mainoptionsparser.o: ../src/mainoptions/mainoptionsparser.h
+./mainoptionsparser.o: ../src/space/space.h ../src/textstream/types.h
+./mainoptionsparser.o: ../src/convert/inttostr.h ../src/utf8/utf8.h
+./mainoptionsparser.o: ../src/textstream/textstream.h ../src/date/date.h
+./mainoptionsparser.o: ../src/membuffer/membuffer.h ../src/textstream/types.h
+./mainoptionsparser.o: ../src/utf8/utf8_templates.h
+./mainoptionsparser.o: ../src/utf8/utf8_private.h ../src/convert/convert.h
+./mainoptionsparser.o: ../src/convert/inttostr.h
+./mainoptionsparser.o: ../src/convert/patternreplacer.h
+./mainoptionsparser.o: ../src/convert/strtoint.h ../src/convert/text.h
+./mainoptionsparser.o: ../src/convert/misc.h