diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile
index afd9f45c8a79..555de72a5c53 100644
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/19 13:35:07 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/29 01:31:27 itojun Exp $
 
 NOLINT=		# defined
 
@@ -62,7 +62,6 @@ CPPFLAGS+= -I.					\
 	 -I${ASN1}				\
 	 -I${KRB5}				\
 	 -I${DIST}/heimdal/lib/krb5		\
-	 -I${DIST}/openssl/crypto		\
 	 -I${DIST}/heimdal/lib/asn1		\
 	 -I${DIST}/heimdal/lib/com_err		\
 	 -I${NETBSDSRCDIR}/include/heimdal	\
diff --git a/lib/libhdb/Makefile b/lib/libhdb/Makefile
index ae4bf71eaf48..0c2989498c7c 100644
--- a/lib/libhdb/Makefile
+++ b/lib/libhdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/08/19 13:35:07 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/29 01:31:28 itojun Exp $
 
 NOLINT=		# defined
 
@@ -59,7 +59,6 @@ CPPFLAGS+= -I.					\
 	 -I${ASN1}				\
 	 -I${KRB5}				\
 	 -I${DIST}/heimdal/lib/krb5		\
-	 -I${DIST}/openssl/crypto		\
 	 -I${DIST}/heimdal/lib/asn1		\
 	 -I${DIST}/heimdal/lib/com_err		\
 	 -I${NETBSDSRCDIR}/include/heimdal	\
diff --git a/lib/libkadm/Makefile b/lib/libkadm/Makefile
index 3cf6ade7eaeb..18b1df036191 100644
--- a/lib/libkadm/Makefile
+++ b/lib/libkadm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/19 13:35:07 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/29 01:31:29 itojun Exp $
 
 NOLINT=		# defined
 
@@ -38,7 +38,6 @@ CPPFLAGS+= -I.					\
 	-I${DIST}/krb4/lib/kadm			\
 	-I${DIST}/krb4/lib/kdb			\
 	-I${DIST}/krb4/lib/krb			\
-	-I${DIST}/openssl/crypto/des		\
 	-I${DIST}/heimdal/lib/com_err		\
 	-I${LIBKRBINC}				\
 	-I${NETBSDSRCDIR}/include/heimdal	\
diff --git a/lib/libkadm5clnt/Makefile b/lib/libkadm5clnt/Makefile
index fff018448f3f..98f8eccf43a6 100644
--- a/lib/libkadm5clnt/Makefile
+++ b/lib/libkadm5clnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/08/19 13:35:07 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/29 01:31:29 itojun Exp $
 
 NOLINT=		# defined
 
@@ -55,7 +55,6 @@ CPPFLAGS+= -I.					\
 	 -I${KRB5}				\
 	 -I${DIST}/heimdal/lib/krb5		\
 	 -I${DIST}/heimdal/lib/asn1		\
-	 -I${DIST}/openssl/crypto		\
 	 -I${HDB}				\
 	 -I${DIST}/heimdal/lib/hdb		\
 	 -I${DIST}/heimdal/lib/asn1		\
diff --git a/lib/libkadm5srv/Makefile b/lib/libkadm5srv/Makefile
index 010b8394ce30..942c57cd4747 100644
--- a/lib/libkadm5srv/Makefile
+++ b/lib/libkadm5srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/08/19 13:35:08 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/29 01:31:30 itojun Exp $
 
 NOLINT=		# defined
 
@@ -74,7 +74,6 @@ CPPFLAGS+= -I.					\
 	 -I${KRB5}				\
 	 -I${DIST}/heimdal/lib/krb5		\
 	 -I${DIST}/heimdal/lib/asn1		\
-	 -I${DIST}/openssl/crypto		\
 	 -I${HDB}				\
 	 -I${DIST}/heimdal/lib/hdb		\
 	 -I${DIST}/heimdal/lib/asn1		\
diff --git a/lib/libkdb/Makefile b/lib/libkdb/Makefile
index f2c42552484a..d55fb0d3390a 100644
--- a/lib/libkdb/Makefile
+++ b/lib/libkdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/08/19 13:35:08 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/29 01:31:31 itojun Exp $
 
 NOLINT=		# defined
 
@@ -23,7 +23,6 @@ CPPFLAGS+= -I.					\
 	-I${DIST}/krb4/lib/kdb			\
 	-I${LIBKRBINC}				\
 	-I${DIST}/krb4/lib/krb			\
-	-I${DIST}/openssl/crypto/des		\
 	-I${NETBSDSRCDIR}/include/heimdal	\
 	-I${NETBSDSRCDIR}/lib/libroken		\
 	-I${DIST}/heimdal/lib/roken		\
diff --git a/lib/libkrb/Makefile b/lib/libkrb/Makefile
index 46f68ebbaf29..3c3c9c0afe6f 100644
--- a/lib/libkrb/Makefile
+++ b/lib/libkrb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/19 13:35:08 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/29 01:31:31 itojun Exp $
 
 NOLINT=		# defined
 
@@ -6,7 +6,7 @@ NOLINT=		# defined
 
 DIST=		${NETBSDSRCDIR}/crypto/dist
 .PATH:		${DIST}/krb4/lib/krb ${DIST}/krb4/doc \
-		${DIST}/openssl/crypto/des ${DIST}/krb4/man
+		${DIST}/krb4/man
 
 MAN=		kerberos.3 krb_realmofhost.3 krb_sendauth.3 krb_set_tkt_string.3 \
 		krb.conf.5 krb.equiv.5 krb.extra.5 krb.realms.5
@@ -122,7 +122,6 @@ INCS=	krb.h					\
 
 CPPFLAGS+= -I.					\
 	-I${DIST}/krb4/lib/krb			\
-	-I${DIST}/openssl/crypto		\
 	-I${DIST}/heimdal/lib/com_err		\
 	-I${NETBSDSRCDIR}/include/heimdal	\
 	-I${NETBSDSRCDIR}/lib/libroken		\
diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile
index 6cd1568c54cb..dc9e9c2ae772 100644
--- a/lib/libkrb5/Makefile
+++ b/lib/libkrb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/08/19 13:35:08 lukem Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/29 01:31:32 itojun Exp $
 
 NOLINT=		# defined
 
@@ -242,7 +242,6 @@ ASN1!=		cd ${NETBSDSRCDIR}/lib/libasn1 && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/krb5		\
-	 -I${DIST}/openssl/crypto		\
 	 -I${ASN1}				\
 	 -I${DIST}/heimdal/lib/asn1		\
 	 -I${DIST}/heimdal/lib/com_err		\