diff --git a/LOG b/LOG
index 51a95a0e07..7511c95ce7 100644
--- a/LOG
+++ b/LOG
@@ -200,3 +200,10 @@
     release_notes.stex
 - fixed spelling of non-existent
     s/syntax.ss
+- now forcing zlib configuration before compiling files that depend on
+  the zlib header files, since zlib's configure script can modify the
+  header files.  removed ZlibInclude variable, which no longer serves
+  a purpose.
+    c/Mf-*, c/Makefile.*nt
+- removed unnecessary datestamp.c target
+    c/Mf.*nt
diff --git a/c/Makefile.a6nt b/c/Makefile.a6nt
index e1dd90782c..6399a4007d 100644
--- a/c/Makefile.a6nt
+++ b/c/Makefile.a6nt
@@ -17,7 +17,6 @@ m = a6nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-ZlibInclude = ..\zlib
 KernelDll = ..\bin\$m\csv941.dll
 KernelLib = ..\bin\$m\csv941.lib
 MTKernelLib = ..\boot\$m\csv941mt.lib
@@ -29,7 +28,7 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res
 
 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
 DLLLDFLAGS=/machine:X64 /release /nologo
@@ -38,7 +37,7 @@ DLLLDFLAGS=/machine:X64 /release /nologo
 EXELDFLAGS=/machine:X64 /incremental:no /release /nologo /STACK:0x1000000
 
 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 # MDCFLAGS=$(CFLAGS) /Zi /MDd
 # MTCFLAGS=$(CFLAGS) /Zi /MTd
 # DLLLDFLAGS=/machine:X64 /debug /nologo /nodefaultlib:msvcrt
@@ -68,7 +67,7 @@ all: $(Exec) $(MTKernelLib) $(MDKernelLib) $(MTMain)
 
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(hsrc)
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(SchemeInclude)/equates.h $(SchemeInclude)/scheme.h
-$(KernelLib) $(MTKernelLib) $(MDKernelLib): $(ZlibInclude)/zconf.h $(ZlibInclude)/zlib.h
+$(KernelLib) $(MTKernelLib) $(MDKernelLib): ..\zlib/zconf.h ..\zlib/zlib.h
 
 $(MTKernelLib): $(csrc) $(MTZlibLib)
 	-del /f $(MTKernelLib)
@@ -125,7 +124,7 @@ mdscheme.exe: $(ResFile) $(MDMain) $(MDKernelLib)
 	-del /f mdscheme.exe
 	link /out:mdscheme.exe $(EXELDFLAGS) $(ResFile) $(MDMain) $(MDKernelLib) $(SystemLib)
 
-$(ZlibInclude)\zlib.h $(ZlibInclude)\zconf.h $(MDZlibLib) $(MTZlibLib):
+..\zlib\zlib.h ..\zlib\zconf.h $(MDZlibLib) $(MTZlibLib):
 	cd ../zlib
 	nmake /nologo -f win32/Makefile.msc AR="link /lib" CFLAGS="-nologo -MT -O2 $(LOC)"
 	ren zlib.lib zlibmt.lib
diff --git a/c/Makefile.i3nt b/c/Makefile.i3nt
index c7d4f8adde..c3079c09b7 100644
--- a/c/Makefile.i3nt
+++ b/c/Makefile.i3nt
@@ -17,7 +17,6 @@ m = i3nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-ZlibInclude = ..\zlib
 KernelDll = ..\bin\$m\csv941.dll
 KernelLib = ..\bin\$m\csv941.lib
 MTKernelLib = ..\boot\$m\csv941mt.lib
@@ -29,7 +28,7 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res
 
 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
 DLLLDFLAGS=/machine:ix86 /release /nologo
@@ -37,7 +36,7 @@ DLLLDFLAGS=/machine:ix86 /release /nologo
 EXELDFLAGS=/machine:ix86 /incremental:no /release /nologo /STACK:0x800000
 
 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
+# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
 # LDFLAGS=/machine:ix86 /incremental:no /release /nologo /debug
 
 SystemLib=rpcrt4.lib ole32.lib advapi32.lib User32.lib
@@ -64,7 +63,7 @@ all: $(Exec) $(MTKernelLib) $(MDKernelLib) $(MTMain)
 
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(hsrc)
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(SchemeInclude)/equates.h $(SchemeInclude)/scheme.h
-$(KernelLib) $(MTKernelLib) $(MDKernelLib): $(ZlibInclude)/zconf.h $(ZlibInclude)/zlib.h
+$(KernelLib) $(MTKernelLib) $(MDKernelLib): ..\zlib/zconf.h ..\zlib/zlib.h
 
 $(MTKernelLib): $(csrc) $(MTZlibLib)
 	-del /f $(MTKernelLib)
@@ -121,7 +120,7 @@ mdscheme.exe: $(ResFile) $(MDMain) $(MDKernelLib)
 	-del /f mdscheme.exe
 	link /out:mdscheme.exe $(EXELDFLAGS) $(ResFile) $(MDMain) $(MDKernelLib) $(SystemLib)
 
-$(ZlibInclude)\zlib.h $(ZlibInclude)\zconf.h $(MDZlibLib) $(MTZlibLib):
+..\zlib\zlib.h ..\zlib\zconf.h $(MDZlibLib) $(MTZlibLib):
 	cd ../zlib
 	nmake /nologo -f win32/Makefile.msc AR="link /lib" CFLAGS="-nologo -MT -O2 $(LOC)"
 	ren zlib.lib zlibmt.lib
diff --git a/c/Makefile.ta6nt b/c/Makefile.ta6nt
index bad20a0175..c8b4cd475e 100644
--- a/c/Makefile.ta6nt
+++ b/c/Makefile.ta6nt
@@ -17,7 +17,6 @@ m = ta6nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-ZlibInclude = ..\zlib
 KernelDll = ..\bin\$m\csv941.dll
 KernelLib = ..\bin\$m\csv941.lib
 MTKernelLib = ..\boot\$m\csv941mt.lib
@@ -29,7 +28,7 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res
 
 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
 DLLLDFLAGS=/machine:X64 /release /nologo
@@ -38,7 +37,7 @@ DLLLDFLAGS=/machine:X64 /release /nologo
 EXELDFLAGS=/machine:X64 /incremental:no /release /nologo /STACK:0x1000000
 
 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 # MDCFLAGS=$(CFLAGS) /Zi /MDd
 # MTCFLAGS=$(CFLAGS) /Zi /MTd
 # DLLLDFLAGS=/machine:X64 /debug /nologo /nodefaultlib:msvcrt
@@ -68,7 +67,7 @@ all: $(Exec) $(MTKernelLib) $(MDKernelLib) $(MTMain)
 
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(hsrc)
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(SchemeInclude)/equates.h $(SchemeInclude)/scheme.h
-$(KernelLib) $(MTKernelLib) $(MDKernelLib): $(ZlibInclude)/zconf.h $(ZlibInclude)/zlib.h
+$(KernelLib) $(MTKernelLib) $(MDKernelLib): ..\zlib/zconf.h ..\zlib/zlib.h
 
 $(MTKernelLib): $(csrc) $(MTZlibLib)
 	-del /f $(MTKernelLib)
@@ -125,7 +124,7 @@ mdscheme.exe: $(ResFile) $(MDMain) $(MDKernelLib)
 	-del /f mdscheme.exe
 	link /out:mdscheme.exe $(EXELDFLAGS) $(ResFile) $(MDMain) $(MDKernelLib) $(SystemLib)
 
-$(ZlibInclude)\zlib.h $(ZlibInclude)\zconf.h $(MDZlibLib) $(MTZlibLib):
+..\zlib\zlib.h ..\zlib\zconf.h $(MDZlibLib) $(MTZlibLib):
 	cd ../zlib
 	nmake /nologo -f win32/Makefile.msc AR="link /lib" CFLAGS="-nologo -MT -O2 $(LOC)"
 	ren zlib.lib zlibmt.lib
diff --git a/c/Makefile.ti3nt b/c/Makefile.ti3nt
index 570c8bce02..d667693fa9 100644
--- a/c/Makefile.ti3nt
+++ b/c/Makefile.ti3nt
@@ -17,7 +17,6 @@ m = ti3nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-ZlibInclude = ..\zlib
 KernelDll = ..\bin\$m\csv941.dll
 KernelLib = ..\bin\$m\csv941.lib
 MTKernelLib = ..\boot\$m\csv941mt.lib
@@ -29,7 +28,7 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res
 
 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
 DLLLDFLAGS=/machine:ix86 /release /nologo
@@ -37,7 +36,7 @@ DLLLDFLAGS=/machine:ix86 /release /nologo
 EXELDFLAGS=/machine:ix86 /incremental:no /release /nologo /STACK:0x800000
 
 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
+# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
 # LDFLAGS=/machine:ix86 /incremental:no /release /nologo /debug
 
 SystemLib=rpcrt4.lib ole32.lib advapi32.lib User32.lib
@@ -64,7 +63,7 @@ all: $(Exec) $(MTKernelLib) $(MDKernelLib) $(MTMain)
 
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(hsrc)
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(SchemeInclude)/equates.h $(SchemeInclude)/scheme.h
-$(KernelLib) $(MTKernelLib) $(MDKernelLib): $(ZlibInclude)/zconf.h $(ZlibInclude)/zlib.h
+$(KernelLib) $(MTKernelLib) $(MDKernelLib): ..\zlib/zconf.h ..\zlib/zlib.h
 
 $(MTKernelLib): $(csrc) $(MTZlibLib)
 	-del /f $(MTKernelLib)
@@ -121,7 +120,7 @@ mdscheme.exe: $(ResFile) $(MDMain) $(MDKernelLib)
 	-del /f mdscheme.exe
 	link /out:mdscheme.exe $(EXELDFLAGS) $(ResFile) $(MDMain) $(MDKernelLib) $(SystemLib)
 
-$(ZlibInclude)\zlib.h $(ZlibInclude)\zconf.h $(MDZlibLib) $(MTZlibLib):
+..\zlib\zlib.h ..\zlib\zconf.h $(MDZlibLib) $(MTZlibLib):
 	cd ../zlib
 	nmake /nologo -f win32/Makefile.msc AR="link /lib" CFLAGS="-nologo -MT -O2 $(LOC)"
 	ren zlib.lib zlibmt.lib
diff --git a/c/Mf-a6fb b/c/Mf-a6fb
index 19536dce30..72256172c1 100644
--- a/c/Mf-a6fb
+++ b/c/Mf-a6fb
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-a6le b/c/Mf-a6le
index 865571f00d..2c891ec84f 100644
--- a/c/Mf-a6le
+++ b/c/Mf-a6le
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-a6nb b/c/Mf-a6nb
index 07834e12ef..f61c2a1506 100644
--- a/c/Mf-a6nb
+++ b/c/Mf-a6nb
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-a6nt b/c/Mf-a6nt
index e308de5021..e4326ae050 100644
--- a/c/Mf-a6nt
+++ b/c/Mf-a6nt
@@ -28,9 +28,6 @@ ${Scheme}: make.bat
 	./make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-# currently creating datestamp at 'make source' time
-datestamp.c:
-
 vs.bat:
 	echo '@echo off' > $@
 	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
diff --git a/c/Mf-a6ob b/c/Mf-a6ob
index e048e86c84..b5dbd406fc 100644
--- a/c/Mf-a6ob
+++ b/c/Mf-a6ob
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-a6osx b/c/Mf-a6osx
index 73c85dced9..56b801d9ff 100644
--- a/c/Mf-a6osx
+++ b/c/Mf-a6osx
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-a6s2 b/c/Mf-a6s2
index 3591b42c13..71c71ddaa6 100644
--- a/c/Mf-a6s2
+++ b/c/Mf-a6s2
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -DSOLARIS -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-arm32le b/c/Mf-arm32le
index c1b52ff6f6..4a2b219e04 100644
--- a/c/Mf-arm32le
+++ b/c/Mf-arm32le
@@ -26,7 +26,7 @@ mdobj = arm32le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-base b/c/Mf-base
index 3245de6af2..2158cc02e9 100644
--- a/c/Mf-base
+++ b/c/Mf-base
@@ -16,7 +16,6 @@
 include Mf-config
 
 Include=../boot/$m
-ZlibInclude=../zlib
 PetiteBoot=../boot/$m/petite.boot
 SchemeBoot=../boot/$m/scheme.boot
 Kernel=../boot/$m/kernel.$o
@@ -55,9 +54,14 @@ scheme.o main.o: config.h
 ${kernelobj}: system.h types.h version.h externs.h globals.h segment.h thread.h sort.h
 ${kernelobj}: ${Include}/equates.h ${Include}/scheme.h
 ${mainobj}: ${Include}/scheme.h
-scheme.o io.o new-io.o: ${ZlibInclude}/zconf.h ${ZlibInclude}/zlib.h
+${kernelobj}: ../zlib/zconf.h ../zlib/zlib.h
 gc-ocd.o gc-oce.o: gc.c
 
+../zlib/zlib.h ../zlib/zconf.h: ../zlib/configure.log
+
+../zlib/libz.a: ../zlib/configure.log
+	(cd ../zlib; ${MAKE})
+
 clean:
 	rm -f *.$o ${mdclean}
 	rm -f Make.out
diff --git a/c/Mf-i3fb b/c/Mf-i3fb
index 48ba32e2ea..a210c49eb7 100644
--- a/c/Mf-i3fb
+++ b/c/Mf-i3fb
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-i3le b/c/Mf-i3le
index 074160bb73..2e31756066 100644
--- a/c/Mf-i3le
+++ b/c/Mf-i3le
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-i3nb b/c/Mf-i3nb
index 29f6359913..1b6baf27f5 100644
--- a/c/Mf-i3nb
+++ b/c/Mf-i3nb
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-i3nt b/c/Mf-i3nt
index 67f57d8204..f605dceb2e 100644
--- a/c/Mf-i3nt
+++ b/c/Mf-i3nt
@@ -28,9 +28,6 @@ ${Scheme}: make.bat
 	./make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-# currently creating datestamp at 'make source' time
-datestamp.c:
-
 vs.bat:
 	echo '@echo off' > $@
 	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
diff --git a/c/Mf-i3ob b/c/Mf-i3ob
index dd353c3621..0e62c14d30 100644
--- a/c/Mf-i3ob
+++ b/c/Mf-i3ob
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-i3osx b/c/Mf-i3osx
index a911752c2b..6b9bf41ef9 100644
--- a/c/Mf-i3osx
+++ b/c/Mf-i3osx
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-i3qnx b/c/Mf-i3qnx
index 6e371a7b71..39b688ca01 100644
--- a/c/Mf-i3qnx
+++ b/c/Mf-i3qnx
@@ -27,7 +27,7 @@ LocalInclude = /usr/local/include
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} -I${LocalInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib -I${LocalInclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-i3s2 b/c/Mf-i3s2
index 60618ae2d9..cd679c95ec 100644
--- a/c/Mf-i3s2
+++ b/c/Mf-i3s2
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -DSOLARIS -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-ppc32le b/c/Mf-ppc32le
index 445b61846e..5ec52442ad 100644
--- a/c/Mf-ppc32le
+++ b/c/Mf-ppc32le
@@ -26,7 +26,7 @@ mdobj = ppc32.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-ta6fb b/c/Mf-ta6fb
index 2577037f5f..1cda2ffc36 100644
--- a/c/Mf-ta6fb
+++ b/c/Mf-ta6fb
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-ta6le b/c/Mf-ta6le
index 7088e87a22..0885a5f0ab 100644
--- a/c/Mf-ta6le
+++ b/c/Mf-ta6le
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-ta6nb b/c/Mf-ta6nb
index 447b0bf7de..e107db7055 100644
--- a/c/Mf-ta6nb
+++ b/c/Mf-ta6nb
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-ta6nt b/c/Mf-ta6nt
index 794b7d071c..78ab502507 100644
--- a/c/Mf-ta6nt
+++ b/c/Mf-ta6nt
@@ -28,9 +28,6 @@ ${Scheme}: make.bat
 	./make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-# currently creating datestamp at 'make source' time
-datestamp.c:
-
 vs.bat:
 	echo '@echo off' > $@
 	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
diff --git a/c/Mf-ta6ob b/c/Mf-ta6ob
index 85ad62d2d0..a543b20214 100644
--- a/c/Mf-ta6ob
+++ b/c/Mf-ta6ob
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-ta6osx b/c/Mf-ta6osx
index e807275a15..246aceb1a5 100644
--- a/c/Mf-ta6osx
+++ b/c/Mf-ta6osx
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-ta6s2 b/c/Mf-ta6s2
index e03c65e8c5..a290c3e882 100644
--- a/c/Mf-ta6s2
+++ b/c/Mf-ta6s2
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -DSOLARIS -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)
diff --git a/c/Mf-ti3fb b/c/Mf-ti3fb
index a88e3915ed..c96c0c3493 100644
--- a/c/Mf-ti3fb
+++ b/c/Mf-ti3fb
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-ti3le b/c/Mf-ti3le
index 51bb6da607..327cc83eb1 100644
--- a/c/Mf-ti3le
+++ b/c/Mf-ti3le
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-ti3nb b/c/Mf-ti3nb
index 2f44e007e4..62328cfc9f 100644
--- a/c/Mf-ti3nb
+++ b/c/Mf-ti3nb
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-ti3nt b/c/Mf-ti3nt
index f8ef2485f5..71ec5d80ea 100644
--- a/c/Mf-ti3nt
+++ b/c/Mf-ti3nt
@@ -28,9 +28,6 @@ ${Scheme}: make.bat
 	./make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-# currently creating datestamp at 'make source' time
-datestamp.c:
-
 vs.bat:
 	echo '@echo off' > $@
 	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
diff --git a/c/Mf-ti3ob b/c/Mf-ti3ob
index 1370c9f295..c8eaee646d 100644
--- a/c/Mf-ti3ob
+++ b/c/Mf-ti3ob
@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-ti3osx b/c/Mf-ti3osx
index eafe3b395f..8ba5e23668 100644
--- a/c/Mf-ti3osx
+++ b/c/Mf-ti3osx
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-ti3s2 b/c/Mf-ti3s2
index 3dd407c509..19a79eb62d 100644
--- a/c/Mf-ti3s2
+++ b/c/Mf-ti3s2
@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -DSOLARIS -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)
diff --git a/c/Mf-tppc32le b/c/Mf-tppc32le
index a59d50e8e7..4fb66494ea 100644
--- a/c/Mf-tppc32le
+++ b/c/Mf-tppc32le
@@ -26,7 +26,7 @@ mdobj = ppc32le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)