diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 8f56ef29dad5..f111a2f83064 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -36,6 +36,18 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20210315: Remove kernel-only crypto headers from /usr/include
+OLD_FILES+=usr/include/crypto/_cryptodev.h
+OLD_FILES+=usr/include/crypto/cbc_mac.h
+OLD_FILES+=usr/include/crypto/deflate.h
+OLD_FILES+=usr/include/crypto/gfmult.h
+OLD_FILES+=usr/include/crypto/gmac.h
+OLD_FILES+=usr/include/crypto/rmd160.h
+OLD_FILES+=usr/include/crypto/xform.h
+OLD_FILES+=usr/include/crypto/xform_auth.h
+OLD_FILES+=usr/include/crypto/xform_comp.h
+OLD_FILES+=usr/include/crypto/xform_enc.h
+
 # 20210305: removed Poly1305_* symbols
 OLD_FILES+=usr/include/crypto/xform_poly1305.h
 
diff --git a/include/Makefile b/include/Makefile
index 31e207f6b199..8ddfd7015918 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -84,10 +84,6 @@ FS9660=		cd9660_mount.h \
 		iso_rrip.h
 FS9660DIR=	${INCLUDEDIR}/isofs/cd9660
 
-.PATH: ${SRCTOP}/sys/crypto
-CRYPTO=		rijndael/rijndael.h
-CRYPTODIR=	${INCLUDEDIR}/crypto
-
 .PATH: ${SRCTOP}/sys/dev/evdev
 EVDEV=		input.h \
 		input-event-codes.h \
@@ -105,17 +101,7 @@ HYPERV=		hv_snapshot.h \
 HYPERVDIR=	${INCLUDEDIR}/dev/hyperv
 
 .PATH: ${SRCTOP}/sys/opencrypto
-OPENCRYPTO=	_cryptodev.h \
-		cbc_mac.h \
-		cryptodev.h \
-		deflate.h \
-		gfmult.h \
-		gmac.h \
-		rmd160.h \
-		xform.h \
-		xform_auth.h \
-		xform_comp.h \
-		xform_enc.h
+OPENCRYPTO=	cryptodev.h
 OPENCRYPTODIR=	${INCLUDEDIR}/crypto
 
 .PATH: ${SRCTOP}/sys/dev/pci