Index: head/sys/kern/kern_ctf.c
===================================================================
--- head/sys/kern/kern_ctf.c
+++ head/sys/kern/kern_ctf.c
@@ -40,21 +40,7 @@
 #define CTF_HDR_STRLEN_U32	8
 
 #ifdef DDB_CTF
-static void *
-z_alloc(void *nil, u_int items, u_int size)
-{
-	void *ptr;
-
-	ptr = malloc(items * size, M_TEMP, M_NOWAIT);
-	return ptr;
-}
-
-static void
-z_free(void *nil, void *ptr)
-{
-	free(ptr, M_TEMP);
-}
-
+#include <contrib/zlib/zlib.h>
 #endif
 
 static int
@@ -269,8 +255,6 @@
 
 		/* Initialise the zlib structure. */
 		bzero(&zs, sizeof(zs));
-		zs.zalloc = z_alloc;
-		zs.zfree = z_free;
 
 		if (inflateInit(&zs) != Z_OK) {
 			error = EIO;
Index: head/sys/kern/link_elf.c
===================================================================
--- head/sys/kern/link_elf.c
+++ head/sys/kern/link_elf.c
@@ -67,10 +67,6 @@
 
 #include <sys/link_elf.h>
 
-#ifdef DDB_CTF
-#include <sys/zlib.h>
-#endif
-
 #include "linker_if.h"
 
 #define MAXSEGS 4
Index: head/sys/kern/link_elf_obj.c
===================================================================
--- head/sys/kern/link_elf_obj.c
+++ head/sys/kern/link_elf_obj.c
@@ -62,7 +62,7 @@
 #include <sys/link_elf.h>
 
 #ifdef DDB_CTF
-#include <sys/zlib.h>
+#include <contrib/zlib/zlib.h>
 #endif
 
 #include "linker_if.h"