diff --git a/dos/wccdos16.mak b/dos/wccdos16.mak
index bb622b6c..c8122ebf 100644
--- a/dos/wccdos16.mak
+++ b/dos/wccdos16.mak
@@ -42,7 +42,7 @@ LIBEXE		= wlib /q /n /t
 PLATFORM	= 16 bit DOS
 ARCNAME		= pdc$(VER)16w
 
-!include $(PDCURSES_HOME)\wccinc
+!include $(PDCURSES_HOME)\watcom.mif
 
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ @$(osdir)\wccdos.lrf
diff --git a/dos/wccdos4g.mak b/dos/wccdos4g.mak
index 4a92ccc7..fc646027 100644
--- a/dos/wccdos4g.mak
+++ b/dos/wccdos4g.mak
@@ -41,7 +41,7 @@ LIBEXE		= wlib /q /n /t
 PLATFORM	= 32 bit DOS
 ARCNAME		= pdc$(VER)32w
 
-!include $(PDCURSES_HOME)\wccinc
+!include $(PDCURSES_HOME)\watcom.mif
 
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ @$(osdir)\wccdos.lrf
diff --git a/os2/wccos2.mak b/os2/wccos2.mak
index a9c988ee..fe46fc5a 100644
--- a/os2/wccos2.mak
+++ b/os2/wccos2.mak
@@ -41,7 +41,7 @@ LIBEXE		= wlib /q /n /b /c /t
 PLATFORM	= OS/2
 ARCNAME		= pdc$(VER)_wcc_os2
 
-!include $(PDCURSES_HOME)\wccinc
+!include $(PDCURSES_HOME)\watcom.mif
 
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ $(LIBOBJS) $(PDCOBJS)
diff --git a/wccinc b/watcom.mif
similarity index 73%
rename from wccinc
rename to watcom.mif
index 34202613..5f0f6e1e 100644
--- a/wccinc
+++ b/watcom.mif
@@ -27,8 +27,6 @@ PDCLIBS = $(LIBCURSES) $(LIBPANEL)
 
 LINK = wlink
 
-#------------------------------------------------------------------------
-
 all:	$(PDCLIBS) $(DEMOS)
 
 clean
@@ -39,8 +37,6 @@ clean
 
 demos:	$(DEMOS)
 
-#------------------------------------------------------------------------
-
 $(LIBPANEL) : $(PANOBJS)
 	$(LIBEXE) $@ $(PANOBJS)
 
@@ -48,32 +44,15 @@ $(LIBPANEL) : $(PANOBJS)
 .c.obj: .autodepend
 	$(CC) $(CCFLAGS) $<
 
-#------------------------------------------------------------------------
-
-firework.exe:	firework.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) n $@ f firework.obj l $(LIBCURSES)
-
-newdemo.exe:	newdemo.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) n $@ f newdemo.obj l $(LIBCURSES)
+.obj.exe: .autodepend
+	$(LINK) $(LDFLAGS) n $@ f $< l $(LIBCURSES)
 
 ptest.exe:	ptest.obj $(LIBCURSES) $(LIBPANEL)
 	$(LINK) $(LDFLAGS) n $@ f ptest.obj l $(LIBCURSES) l $(LIBPANEL)
 
-rain.exe:	rain.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) n $@ f rain.obj l $(LIBCURSES)
-
-testcurs.exe:	testcurs.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) n $@ f testcurs.obj l $(LIBCURSES)
-
 tuidemo.exe:	tuidemo.obj tui.obj $(LIBCURSES)
 	$(LINK) $(LDFLAGS) n $@ f tuidemo.obj f tui.obj l $(LIBCURSES)
 
-worm.exe:	worm.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) n $@ f worm.obj l $(LIBCURSES)
-
-xmas.exe:	xmas.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) n $@ f xmas.obj l $(LIBCURSES)
-
 dist: .symbolic $(PDCLIBS)
 	%write file_id.diz PDCurses $(VERDOT) for Watcom C++ $(PLATFORM)
 	%append file_id.diz ------------------------------------------
diff --git a/win32/wccwin32.mak b/win32/wccwin32.mak
index b2bac2af..3b6b938f 100644
--- a/win32/wccwin32.mak
+++ b/win32/wccwin32.mak
@@ -41,7 +41,7 @@ LIBEXE		= wlib /q /n /t
 PLATFORM	= Win32
 ARCNAME		= pdc$(VER)_wcc_w32
 
-!include $(PDCURSES_HOME)\wccinc
+!include $(PDCURSES_HOME)\watcom.mif
 
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ $(LIBOBJS) $(PDCOBJS)