diff --git a/dos/mscdos.mak b/dos/mscdos.mak
index 659a9720..90aadc70 100644
--- a/dos/mscdos.mak
+++ b/dos/mscdos.mak
@@ -66,209 +66,70 @@ demos:	$(DEMOS)
 
 #------------------------------------------------------------------------
 
+DEMOOBJS = $(DEMOS:.exe=.obj) tui.obj
+
+$(LIBOBJS) $(PDCOBJS) $(PANOBJS) : $(PDCURSES_HEADERS)
+$(DEMOOBJS) : $(PDCURSES_CURSES_H)
+$(PANOBJS) : $(PANEL_HEADER)
+terminfo.obj: $(TERM_HEADER)
+$(DEMOS) : $(LIBCURSES)
+
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ @$(osdir)\mscdos.lrf
 
 $(LIBPANEL) : $(PANOBJS)
 	$(LIBEXE) $@ -+$(PANOBJS);
 
-addch.obj: $(srcdir)\addch.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\addch.c
+{$(srcdir)\}.c{}.obj:
+	$(BUILD) $<
 
-addchstr.obj: $(srcdir)\addchstr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\addchstr.c
+{$(osdir)\}.c{}.obj:
+	$(BUILD) $<
 
-addstr.obj: $(srcdir)\addstr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\addstr.c
+{$(pandir)\}.c{}.obj:
+	$(BUILD) $<
 
-attr.obj: $(srcdir)\attr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\attr.c
-
-beep.obj: $(srcdir)\beep.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\beep.c
-
-bkgd.obj: $(srcdir)\bkgd.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\bkgd.c
-
-border.obj: $(srcdir)\border.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\border.c
-
-clear.obj: $(srcdir)\clear.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\clear.c
-
-color.obj: $(srcdir)\color.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\color.c
-
-delch.obj: $(srcdir)\delch.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\delch.c
-
-deleteln.obj: $(srcdir)\deleteln.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\deleteln.c
-
-getch.obj: $(srcdir)\getch.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\getch.c
-
-getstr.obj: $(srcdir)\getstr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\getstr.c
-
-getyx.obj: $(srcdir)\getyx.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\getyx.c
-
-inch.obj: $(srcdir)\inch.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\inch.c
-
-inchstr.obj: $(srcdir)\inchstr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\inchstr.c
-
-initscr.obj: $(srcdir)\initscr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\initscr.c
-
-inopts.obj: $(srcdir)\inopts.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\inopts.c
-
-insch.obj: $(srcdir)\insch.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\insch.c
-
-insstr.obj: $(srcdir)\insstr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\insstr.c
-
-instr.obj: $(srcdir)\instr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\instr.c
-
-kernel.obj: $(srcdir)\kernel.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\kernel.c
-
-mouse.obj: $(srcdir)\mouse.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\mouse.c
-
-move.obj: $(srcdir)\move.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\move.c
-
-outopts.obj: $(srcdir)\outopts.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\outopts.c
-
-overlay.obj: $(srcdir)\overlay.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\overlay.c
-
-pad.obj: $(srcdir)\pad.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\pad.c
-
-printw.obj: $(srcdir)\printw.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\printw.c
-
-refresh.obj: $(srcdir)\refresh.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\refresh.c
-
-scanw.obj: $(srcdir)\scanw.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\scanw.c
-
-scr_dump.obj: $(srcdir)\scr_dump.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\scr_dump.c
-
-scroll.obj: $(srcdir)\scroll.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\scroll.c
-
-slk.obj: $(srcdir)\slk.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\slk.c
-
-termattr.obj: $(srcdir)\termattr.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\termattr.c
-
-terminfo.obj: $(srcdir)\terminfo.c $(PDCURSES_HEADERS) $(TERM_HEADER)
-	$(BUILD) $(srcdir)\terminfo.c
-
-touch.obj: $(srcdir)\touch.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\touch.c
-
-util.obj: $(srcdir)\util.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\util.c
-
-window.obj: $(srcdir)\window.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\window.c
-
-
-pdcclip.obj: $(osdir)\pdcclip.c $(PDCURSES_HEADERS) $(PDCURSES_DOS_H)
-	$(BUILD) $(osdir)\pdcclip.c
-
-pdcdebug.obj: $(srcdir)\pdcdebug.c $(PDCURSES_HEADERS)
-	$(BUILD) $(srcdir)\pdcdebug.c
-
-pdcdisp.obj: $(osdir)\pdcdisp.c $(PDCURSES_HEADERS) $(PDCURSES_DOS_H)
-	$(BUILD) $(osdir)\pdcdisp.c
-
-pdcgetsc.obj: $(osdir)\pdcgetsc.c $(PDCURSES_HEADERS) $(PDCURSES_DOS_H)
-	$(BUILD) $(osdir)\pdcgetsc.c
-
-pdckbd.obj: $(osdir)\pdckbd.c $(PDCURSES_HEADERS) $(PDCURSES_DOS_H)
-	$(BUILD) $(osdir)\pdckbd.c
-
-pdcscrn.obj: $(osdir)\pdcscrn.c $(PDCURSES_HEADERS) $(PDCURSES_DOS_H)
-	$(BUILD) $(osdir)\pdcscrn.c
-
-pdcsetsc.obj: $(osdir)\pdcsetsc.c $(PDCURSES_HEADERS) $(PDCURSES_DOS_H)
-	$(BUILD) $(osdir)\pdcsetsc.c
-
-pdcutil.obj: $(osdir)\pdcutil.c $(PDCURSES_HEADERS) $(PDCURSES_DOS_H)
-	$(BUILD) $(osdir)\pdcutil.c
+{$(demodir)\}.c{}.obj:
+	$(BUILD) $<
 
 #------------------------------------------------------------------------
 
-panel.obj: $(pandir)\panel.c $(PDCURSES_HEADERS) $(PANEL_HEADER)
-	$(BUILD) $(pandir)\panel.c
-
-#------------------------------------------------------------------------
-
-firework.exe: firework.obj $(LIBCURSES)
+firework.exe: firework.obj
 	$(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES);
 
-newdemo.exe: newdemo.obj $(LIBCURSES)
+newdemo.exe: newdemo.obj
 	$(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES);
 
-ptest.exe: ptest.obj $(LIBCURSES) $(LIBPANEL)
+ptest.exe: ptest.obj $(LIBPANEL)
 	$(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBPANEL)+$(LIBCURSES);
 
-rain.exe: rain.obj $(LIBCURSES)
+rain.exe: rain.obj
 	$(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES);
 
-testcurs.exe: testcurs.obj $(LIBCURSES)
+testcurs.exe: testcurs.obj
 	$(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES);
 
-tuidemo.exe: tuidemo.obj tui.obj $(LIBCURSES)
+tuidemo.exe: tuidemo.obj tui.obj
 	$(LINK) $(LDFLAGS) $*.obj+tui.obj,$*,,$(LIBCURSES);
 
-worm.exe: worm.obj $(LIBCURSES)
+worm.exe: worm.obj
 	$(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES);
 
-xmas.exe: xmas.obj $(LIBCURSES)
+xmas.exe: xmas.obj
 	$(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES);
 
+#------------------------------------------------------------------------
 
-firework.obj: $(demodir)\firework.c $(PDCURSES_CURSES_H)
-	$(BUILD) $(demodir)\firework.c
-
-newdemo.obj: $(demodir)\newdemo.c $(PDCURSES_CURSES_H)
-	$(BUILD) $(demodir)\newdemo.c
-
-ptest.obj: $(demodir)\ptest.c $(PANEL_HEADER) $(PDCURSES_CURSES_H)
+ptest.obj: $(demodir)\ptest.c $(PANEL_HEADER)
 	$(BUILD) $(demodir)\ptest.c
 
-rain.obj: $(demodir)\rain.c $(PDCURSES_CURSES_H)
-	$(BUILD) $(demodir)\rain.c
+tui.obj: $(demodir)\tui.c $(demodir)\tui.h
+	$(BUILD) -I$(demodir) $(demodir)\tui.c
 
-testcurs.obj: $(demodir)\testcurs.c $(PDCURSES_CURSES_H)
-	$(BUILD) $(demodir)\testcurs.c
+tuidemo.obj: $(demodir)\tuidemo.c
+	$(BUILD) -I$(demodir) $(demodir)\tuidemo.c
 
-tui.obj: $(demodir)\tui.c $(demodir)\tui.h $(PDCURSES_CURSES_H)
-	$(BUILD) $(demodir)\tui.c
-
-tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
-	$(BUILD) $(demodir)\tuidemo.c
-
-worm.obj: $(demodir)\worm.c $(PDCURSES_CURSES_H)
-	$(BUILD) $(demodir)\worm.c
-
-xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
-	$(BUILD) $(demodir)\xmas.c
+#------------------------------------------------------------------------
 
 PLATFORM1 = Microsoft C
 PLATFORM2 = Microsoft C for DOS