diff --git a/Makefile.in b/Makefile.in
index ce8a0ffa..cf460a10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,10 +4,6 @@ SHELL = /bin/sh
 
 @SET_MAKE@
 
-include version
-
-PDC_DIR=PDCurses-$(VERDOT)
-
 srcdir		=@srcdir@
 VPATH		=@srcdir@
 prefix		=@prefix@
@@ -24,6 +20,10 @@ SHLPRE = @SHLPRE@
 SHLPST = @SHLPST@
 SHLFILE = XCurses
 
+include $(srcdir)/version
+
+PDC_DIR=PDCurses-$(VERDOT)
+
 ZIPFILE = pdcurs$(VER).zip
 TARBALL = $(PDC_DIR).tar.gz
 
diff --git a/dos/bccdos.mak b/dos/bccdos.mak
index 5e9d2be2..0aa3d90d 100644
--- a/dos/bccdos.mak
+++ b/dos/bccdos.mak
@@ -13,19 +13,19 @@
 # lines below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
-MODEL		=l
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
+MODEL		= l
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/dos/gccdos.mak b/dos/gccdos.mak
index 57530270..b6f0c9c6 100644
--- a/dos/gccdos.mak
+++ b/dos/gccdos.mak
@@ -18,13 +18,13 @@ PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 # Nothing below here should require changing.
 ################################################################################
 
-include ../version
+include $(PDCURSES_HOME)/version
 
-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
+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
diff --git a/dos/mscdos.mak b/dos/mscdos.mak
index 4562e8a6..5ed7914d 100644
--- a/dos/mscdos.mak
+++ b/dos/mscdos.mak
@@ -13,20 +13,20 @@
 # lines below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
-MODEL		=L       # one of L, S, M, T, H, C
-SIZE		=LARGE    # one of LARGE, SMALL, MEDIUM, TINY, HUGE, COMPACT
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
+MODEL		= L       # one of L, S, M, T, H, C
+SIZE		= LARGE    # one of LARGE, SMALL, MEDIUM, TINY, HUGE, COMPACT
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/dos/msvcdos.mak b/dos/msvcdos.mak
index cfe7af8e..4df0e3eb 100644
--- a/dos/msvcdos.mak
+++ b/dos/msvcdos.mak
@@ -13,20 +13,20 @@
 # lines below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
-MODEL		=L       # one of L, S, M, T, H, C
-SIZE		=LARGE    # one of LARGE, SMALL, MEDIUM, TINY, HUGE, COMPACT
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
+MODEL		= L       # one of L, S, M, T, H, C
+SIZE		= LARGE    # one of LARGE, SMALL, MEDIUM, TINY, HUGE, COMPACT
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/dos/wccdos16.mak b/dos/wccdos16.mak
index dc5d1a24..22320563 100644
--- a/dos/wccdos16.mak
+++ b/dos/wccdos16.mak
@@ -13,19 +13,19 @@
 # lines below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(%PDCURSES_SRCDIR)
-MODEL		=l
+PDCURSES_HOME	= $(%PDCURSES_SRCDIR)
+MODEL		= l
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/dos/wccdos4g.mak b/dos/wccdos4g.mak
index 2573fbfb..2b7dd522 100644
--- a/dos/wccdos4g.mak
+++ b/dos/wccdos4g.mak
@@ -13,18 +13,18 @@
 # below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(%PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(%PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/os2/bccos2.mak b/os2/bccos2.mak
index ac6f052c..749e0cab 100644
--- a/os2/bccos2.mak
+++ b/os2/bccos2.mak
@@ -13,18 +13,18 @@
 # below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/os2/gccos2.mak b/os2/gccos2.mak
index 72e43c7f..70772a78 100644
--- a/os2/gccos2.mak
+++ b/os2/gccos2.mak
@@ -16,18 +16,18 @@
 # below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-include ../version
+include $(PDCURSES_HOME)/version
 
-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
+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
diff --git a/os2/iccos2.mak b/os2/iccos2.mak
index 39020bf4..b37c7a0e 100644
--- a/os2/iccos2.mak
+++ b/os2/iccos2.mak
@@ -13,18 +13,18 @@
 # below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/os2/wccos2.mak b/os2/wccos2.mak
index 9d00a047..2a5b5b19 100644
--- a/os2/wccos2.mak
+++ b/os2/wccos2.mak
@@ -13,19 +13,19 @@
 # lines below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(%PDCURSES_SRCDIR)
-CCINCDIR		=k:\h
+PDCURSES_HOME	= $(%PDCURSES_SRCDIR)
+CCINCDIR	= k:\h
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/win32/bccwin32.mak b/win32/bccwin32.mak
index 89362160..7eb3bbfd 100644
--- a/win32/bccwin32.mak
+++ b/win32/bccwin32.mak
@@ -13,18 +13,18 @@
 # below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak
index 04b25773..799ef76e 100644
--- a/win32/gccwin32.mak
+++ b/win32/gccwin32.mak
@@ -13,18 +13,18 @@
 # below; for example, "export PDCURSES_SRCDIR=c:/pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		= $(PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-include ../version
+include $(PDCURSES_HOME)/version
 
-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
+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
diff --git a/win32/lccwin32.mak b/win32/lccwin32.mak
index 25442459..9213d8e7 100644
--- a/win32/lccwin32.mak
+++ b/win32/lccwin32.mak
@@ -12,49 +12,49 @@
 # Edit the line below for your environment.
 #
 ###############################################################################
-PDCURSES_HOME		=\pdcurses
+PDCURSES_HOME	= \pdcurses
 ###############################################################################
 # Nothing below here should require changing.
 ###############################################################################
-PDCURSES_CURSES_H      =$(PDCURSES_HOME)\curses.h
-PDCURSES_CURSPRIV_H    =$(PDCURSES_HOME)\curspriv.h
-PDCURSES_HEADERS       =$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
+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
+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
+srcdir		= $(PDCURSES_HOME)\pdcurses
+osdir		= $(PDCURSES_HOME)\win32
+pandir		= $(PDCURSES_HOME)\panel
+demodir		= $(PDCURSES_HOME)\demos
 
-CC              = lcc
+CC		= lcc
 
-#CFLAGS  = -c -g3 -A -ansic -D__LCC__
-CFLAGS          = -c -O -A -ansic -D__LCC__
-LDFLAGS         =
+#CFLAGS		= -c -g3 -A -ansic -D__LCC__
+CFLAGS		= -c -O -A -ansic -D__LCC__
+LDFLAGS		=
 
-CPPFLAGS        = -I$(PDCURSES_HOME)
+CPPFLAGS	= -I$(PDCURSES_HOME)
 
-CCFLAGS         = $(CFLAGS) $(CPPFLAGS)
-DLL_CCFLAGS     = $(CFLAGS) $(CPPFLAGS) -DPDC_DLL_BUILD #-DPDC_THREAD_BUILD
+CCFLAGS		= $(CFLAGS) $(CPPFLAGS)
+DLL_CCFLAGS	= $(CFLAGS) $(CPPFLAGS) -DPDC_DLL_BUILD #-DPDC_THREAD_BUILD
 
-LINK            = lcclnk
+LINK		= lcclnk
 
-DEFFILE         = $(osdir)\curses_lcc.def
-SHL_LD          = lcclnk $(LDFLAGS) -DLL $(DEFFILE)
+DEFFILE		= $(osdir)\curses_lcc.def
+SHL_LD		= lcclnk $(LDFLAGS) -DLL $(DEFFILE)
 
-LIBEXE          = lcclib
-LIBFLAGS        =
+LIBEXE		= lcclib
+LIBFLAGS	=
 
-LIBCURSES       = pdcurses.lib
-DLLCURSES       = curses.lib
-CURSESDLL       = curses.dll
-LIBPANEL        = panel.lib
+LIBCURSES	= pdcurses.lib
+DLLCURSES	= curses.lib
+CURSESDLL	= curses.dll
+LIBPANEL	= panel.lib
 
-PDCLIBS         = $(LIBCURSES) $(LIBPANEL) #$(CURSESDLL)
-DEMOS           = testcurs.exe newdemo.exe xmas.exe tuidemo.exe firework.exe ptest.exe
-DLL_DEMOS       = testcurs_dll.exe newdemo_dll.exe xmas_dll.exe tuidemo_dll.exe firework_dll.exe
+PDCLIBS		= $(LIBCURSES) $(LIBPANEL) #$(CURSESDLL)
+DEMOS		= testcurs.exe newdemo.exe xmas.exe tuidemo.exe firework.exe ptest.exe
+DLL_DEMOS	= testcurs_dll.exe newdemo_dll.exe xmas_dll.exe tuidemo_dll.exe firework_dll.exe
 
 ###############################################################################
 
diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak
index d3711433..bfd63cde 100644
--- a/win32/mingwin32.mak
+++ b/win32/mingwin32.mak
@@ -13,18 +13,18 @@
 # below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-include ../version
+include $(PDCURSES_HOME)/version
 
-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
+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
diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak
index 0d2c0130..efb65fd5 100644
--- a/win32/vcwin32.mak
+++ b/win32/vcwin32.mak
@@ -13,18 +13,18 @@
 # below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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
diff --git a/win32/wccwin32.mak b/win32/wccwin32.mak
index c2ddb741..cb439efa 100644
--- a/win32/wccwin32.mak
+++ b/win32/wccwin32.mak
@@ -13,18 +13,18 @@
 # below; for example, "set PDCURSES_SRCDIR=c:\pdcurses".
 #
 ################################################################################
-PDCURSES_HOME		=$(%PDCURSES_SRCDIR)
+PDCURSES_HOME	= $(%PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
 
-!include ..\version
+!include $(PDCURSES_HOME)\version
 
-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
+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