diff --git a/Makefile b/Makefile
index 1296fe59d..e205120f9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,7 @@ mkfiles:
 
 includes:
 	cd include && $(MAKE) includes
+	cd lib && $(MAKE) includes
 
 libraries:
 	cd lib && sh ack_build.sh obj depend all install
diff --git a/include/Makefile b/include/Makefile
index 5211ebb02..bb869cbd7 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -9,7 +9,7 @@ INCS=	alloca.h ansi.h a.out.h ar.h assert.h configfile.h ctype.h \
 	stdint.h stdio.h stdlib.h string.h strings.h sysexits.h \
 	syslog.h tar.h termcap.h termios.h time.h timers.h tools.h \
 	ttyent.h ucontext.h unistd.h utime.h utmp.h wchar.h wctype.h \
-	hgfs.h tzfile.h util.h zconf.h zlib.h
+	hgfs.h tzfile.h util.h
 INCS+=	arpa/inet.h
 INCS+=	minix/a.out.h minix/bitmap.h minix/callnr.h minix/cdrom.h \
 	minix/com.h minix/config.h minix/const.h minix/cpufeature.h \
diff --git a/lib/Makefile b/lib/Makefile
index f05e9c80b..44129ad70 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,7 @@
 .include <minix.own.mk>
 
 SUBDIR= csu libc libcurses libdriver libnetdriver libend libedit libm libsys \
-	libtimers libutil libbz2 libl libhgfs
+	libtimers libutil libbz2 libl libhgfs libz
 
 .if ${COMPILER_TYPE} == "ack"
 SUBDIR+= ack/libd ack/libe ack/libfp ack/liby
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 5b2dc8039..8deaf327b 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -5,4 +5,7 @@ LIB=		z
 SRCS= adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c \
       gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c
 
+INCSDIR= /usr/include
+INCS=           zconf.h zlib.h
+
 .include <minix.lib.mk>
diff --git a/include/zconf.h b/lib/libz/zconf.h
similarity index 100%
rename from include/zconf.h
rename to lib/libz/zconf.h
diff --git a/include/zlib.h b/lib/libz/zlib.h
similarity index 100%
rename from include/zlib.h
rename to lib/libz/zlib.h