diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -62,6 +62,7 @@
 OLD_FILES+=usr/include/dyn.h
 OLD_FILES+=usr/include/dynP.h
 OLD_FILES+=usr/include/gssrpcint.h
+OLD_FILES+=usr/include/import_err.h
 OLD_FILES+=usr/share/man/man5/profile.5.gz
 OLD_FILES+=usr/share/man/man8/kamdin.local.8.gz
 
diff --git a/krb5/usr.sbin/kdb5_util/Makefile b/krb5/usr.sbin/kdb5_util/Makefile
--- a/krb5/usr.sbin/kdb5_util/Makefile
+++ b/krb5/usr.sbin/kdb5_util/Makefile
@@ -27,11 +27,12 @@
 	tdumputil.c \
 	${GEN}
 
-INCS=	${GENI}
+DPSRCS=	${GENI}
 
 MAN=	kdb5_util.8
 
-CFLAGS+=-I${KRB5_DIR}/include \
+CFLAGS+=-I. \
+	-I${KRB5_DIR}/include \
 	-I${KRB5_DIR}/lib \
 	-I${KRB5_SRCTOP}/include