diff --git a/dos/bccdos.mak b/dos/bccdos.mak
index b3ae7bab..09318d8e 100644
--- a/dos/bccdos.mak
+++ b/dos/bccdos.mak
@@ -24,16 +24,7 @@ O = obj
 !include $(PDCURSES_HOME)\version
 !include $(PDCURSES_HOME)\libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)\curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)\curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)\panel.h
-TERM_HEADER		= $(PDCURSES_HOME)\term.h
-
-srcdir		= $(PDCURSES_HOME)\pdcurses
 osdir		= $(PDCURSES_HOME)\dos
-pandir		= $(PDCURSES_HOME)\panel
-demodir		= $(PDCURSES_HOME)\demos
 
 PDCURSES_DOS_H	= $(osdir)\pdcdos.h
 
diff --git a/dos/gccdos.mak b/dos/gccdos.mak
index 00e255ed..de4938cf 100644
--- a/dos/gccdos.mak
+++ b/dos/gccdos.mak
@@ -23,16 +23,7 @@ O = o
 include $(PDCURSES_HOME)/version
 include $(PDCURSES_HOME)/libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)/curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)/curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)/panel.h
-TERM_HEADER		= $(PDCURSES_HOME)/term.h
-
-srcdir		= $(PDCURSES_HOME)/pdcurses
 osdir		= $(PDCURSES_HOME)/dos
-pandir		= $(PDCURSES_HOME)/panel
-demodir		= $(PDCURSES_HOME)/demos
 
 PDCURSES_DOS_H	= $(osdir)/pdcdos.h
 
diff --git a/dos/mscdos.mak b/dos/mscdos.mak
index 7034fae6..e56e5410 100644
--- a/dos/mscdos.mak
+++ b/dos/mscdos.mak
@@ -25,16 +25,7 @@ O = obj
 !include $(PDCURSES_HOME)\version
 !include $(PDCURSES_HOME)\libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)\curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)\curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)\panel.h
-TERM_HEADER		= $(PDCURSES_HOME)\term.h
-
-srcdir		= $(PDCURSES_HOME)\pdcurses
 osdir		= $(PDCURSES_HOME)\dos
-pandir		= $(PDCURSES_HOME)\panel
-demodir		= $(PDCURSES_HOME)\demos
 
 PDCURSES_DOS_H	= $(osdir)\pdcdos.h
 
diff --git a/dos/msvcdos.mak b/dos/msvcdos.mak
index a13c81a4..e28d0ae2 100644
--- a/dos/msvcdos.mak
+++ b/dos/msvcdos.mak
@@ -25,16 +25,7 @@ O = objs
 !include $(PDCURSES_HOME)\version
 !include $(PDCURSES_HOME)\libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)\curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)\curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)\panel.h
-TERM_HEADER		= $(PDCURSES_HOME)\term.h
-
-srcdir		= $(PDCURSES_HOME)\pdcurses
 osdir		= $(PDCURSES_HOME)\dos
-pandir		= $(PDCURSES_HOME)\panel
-demodir		= $(PDCURSES_HOME)\demos
 
 PDCURSES_DOS_H	= $(osdir)\pdcdos.h
 
diff --git a/libobjs b/libobjs
index 6c010a3b..81d7db13 100644
--- a/libobjs
+++ b/libobjs
@@ -1,5 +1,15 @@
 # Common elements for most of the makefiles (not Watcom or LCC)
 
+PDCURSES_CURSES_H	= $(PDCURSES_HOME)/curses.h
+PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)/curspriv.h
+PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
+PANEL_HEADER		= $(PDCURSES_HOME)/panel.h
+TERM_HEADER		= $(PDCURSES_HOME)/term.h
+
+srcdir	= $(PDCURSES_HOME)/pdcurses
+pandir	= $(PDCURSES_HOME)/panel
+demodir	= $(PDCURSES_HOME)/demos
+
 LIBOBJS = addch.$(O) addchstr.$(O) addstr.$(O) attr.$(O) beep.$(O) \
 bkgd.$(O) border.$(O) clear.$(O) color.$(O) delch.$(O) deleteln.$(O) \
 getch.$(O) getstr.$(O) getyx.$(O) inch.$(O) inchstr.$(O) initscr.$(O) \
diff --git a/os2/bccos2.mak b/os2/bccos2.mak
index e41c5d78..d4460841 100644
--- a/os2/bccos2.mak
+++ b/os2/bccos2.mak
@@ -23,16 +23,7 @@ O = obj
 !include $(PDCURSES_HOME)\version
 !include $(PDCURSES_HOME)\libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)\curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)\curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)\panel.h
-TERM_HEADER		= $(PDCURSES_HOME)\term.h
-
-srcdir		= $(PDCURSES_HOME)\pdcurses
 osdir		= $(PDCURSES_HOME)\os2
-pandir		= $(PDCURSES_HOME)\panel
-demodir		= $(PDCURSES_HOME)\demos
 
 CC		= bcc
 
diff --git a/os2/gccos2.mak b/os2/gccos2.mak
index bc063b46..03852636 100644
--- a/os2/gccos2.mak
+++ b/os2/gccos2.mak
@@ -26,16 +26,7 @@ O = o
 include $(PDCURSES_HOME)/version
 include $(PDCURSES_HOME)/libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)/curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)/curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)/panel.h
-TERM_HEADER		= $(PDCURSES_HOME)/term.h
-
-srcdir		= $(PDCURSES_HOME)/pdcurses
 osdir		= $(PDCURSES_HOME)/os2
-pandir		= $(PDCURSES_HOME)/panel
-demodir		= $(PDCURSES_HOME)/demos
 
 CC		= gcc
 
diff --git a/os2/iccos2.mak b/os2/iccos2.mak
index 52edd161..9d0000fd 100644
--- a/os2/iccos2.mak
+++ b/os2/iccos2.mak
@@ -23,16 +23,7 @@ O = obj
 !include $(PDCURSES_HOME)\version
 !include $(PDCURSES_HOME)\libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)\curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)\curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)\panel.h
-TERM_HEADER		= $(PDCURSES_HOME)\term.h
-
-srcdir		= $(PDCURSES_HOME)\pdcurses
 osdir		= $(PDCURSES_HOME)\os2
-pandir		= $(PDCURSES_HOME)\panel
-demodir		= $(PDCURSES_HOME)\demos
 
 CC		= icc
 
diff --git a/win32/bccwin32.mak b/win32/bccwin32.mak
index cdc48ab8..8a2bfe14 100644
--- a/win32/bccwin32.mak
+++ b/win32/bccwin32.mak
@@ -23,16 +23,7 @@ O = obj
 !include $(PDCURSES_HOME)\version
 !include $(PDCURSES_HOME)\libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)\curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)\curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)\panel.h
-TERM_HEADER		= $(PDCURSES_HOME)\term.h
-
-srcdir		= $(PDCURSES_HOME)\pdcurses
-osdir		= $(PDCURSES_HOME)\win32
-pandir		= $(PDCURSES_HOME)\panel
-demodir		= $(PDCURSES_HOME)\demos
+osdir		= $(PDCURSES_HOME)/win32
 
 CC		= bcc32 -q
 
diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak
index ed8a88e3..453efce0 100644
--- a/win32/gccwin32.mak
+++ b/win32/gccwin32.mak
@@ -23,16 +23,7 @@ O = o
 include $(PDCURSES_HOME)/version
 include $(PDCURSES_HOME)/libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)/curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)/curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)/panel.h
-TERM_HEADER		= $(PDCURSES_HOME)/term.h
-
-srcdir		= $(PDCURSES_HOME)/pdcurses
 osdir		= $(PDCURSES_HOME)/win32
-pandir		= $(PDCURSES_HOME)/panel
-demodir		= $(PDCURSES_HOME)/demos
 
 CC		= gcc
 
diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak
index 568496ce..7d52b285 100644
--- a/win32/mingwin32.mak
+++ b/win32/mingwin32.mak
@@ -23,16 +23,7 @@ O = o
 include $(PDCURSES_HOME)/version
 include $(PDCURSES_HOME)/libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)/curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)/curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)/panel.h
-TERM_HEADER		= $(PDCURSES_HOME)/term.h
-
-srcdir		= $(PDCURSES_HOME)/pdcurses
 osdir		= $(PDCURSES_HOME)/win32
-pandir		= $(PDCURSES_HOME)/panel
-demodir		= $(PDCURSES_HOME)/demos
 
 CC		= gcc
 
diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak
index 17b3f0f4..99578877 100644
--- a/win32/vcwin32.mak
+++ b/win32/vcwin32.mak
@@ -23,16 +23,7 @@ O = obj
 !include $(PDCURSES_HOME)\version
 !include $(PDCURSES_HOME)\libobjs
 
-PDCURSES_CURSES_H	= $(PDCURSES_HOME)\curses.h
-PDCURSES_CURSPRIV_H	= $(PDCURSES_HOME)\curspriv.h
-PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
-PANEL_HEADER		= $(PDCURSES_HOME)\panel.h
-TERM_HEADER		= $(PDCURSES_HOME)\term.h
-
-srcdir		= $(PDCURSES_HOME)\pdcurses
-osdir		= $(PDCURSES_HOME)\win32
-pandir		= $(PDCURSES_HOME)\panel
-demodir		= $(PDCURSES_HOME)\demos
+osdir		= $(PDCURSES_HOME)/win32
 
 CC		= cl.exe -nologo