diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index dc8ebaa906a4..ec238a4accce 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -24,6 +24,7 @@ SRCS=	\
 	get_princs_c.c				\
 	init_c.c				\
 	kadm5_err.c				\
+	kadm5_err.h				\
 	kadm5_locl.h				\
 	marshall.c				\
 	modify_c.c				\
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index f9d01c889d87..8be9b9409e79 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -29,6 +29,7 @@ SRCS=	\
 	get_s.c					\
 	init_s.c				\
 	kadm5_err.c				\
+	kadm5_err.h				\
 	kadm5_locl.h				\
 	keys.c					\
 	log.c					\
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index cd662a49a45c..c818687e1b5b 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -106,7 +106,8 @@ SRCS=	\
 	warn.c \
 	write_message.c \
 	krb5_err.c \
-	heim_err.c
+	heim_err.c \
+	heim_err.h
 
 INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
 	${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h 
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 0e7bebeb0b00..4cb83cbfb962 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -53,7 +53,6 @@ SRCS=		\
 	strnlen.c		\
 	strsep_copy.c		\
 	strupr.c		\
-	print_version.h		\
 	roken.h
 
 NOPIC=		yes
diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile
index 0f108e6fc9bc..22a0c1bbda7e 100644
--- a/kerberos5/lib/libvers/Makefile
+++ b/kerberos5/lib/libvers/Makefile
@@ -8,7 +8,8 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${.OBJDIR}
 
 SRCS=		\
-		print_version.c
+		print_version.c	\
+		print_version.h
 
 install:
 
diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile
index 98577bbd0bd7..eee87f5a9d71 100644
--- a/kerberos5/usr.sbin/k5stash/Makefile
+++ b/kerberos5/usr.sbin/k5stash/Makefile
@@ -16,7 +16,8 @@ CFLAGS+=	-I${KRB5DIR}/include \
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 \
+LDADD=		-L${HDBOBJDIR} -lhdb \
+		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
 		${_krb4libs} \
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index 98577bbd0bd7..eee87f5a9d71 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -16,7 +16,8 @@ CFLAGS+=	-I${KRB5DIR}/include \
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 \
+LDADD=		-L${HDBOBJDIR} -lhdb \
+		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
 		${_krb4libs} \