diff --git a/lib/geom/cache/Makefile b/lib/geom/cache/Makefile
--- a/lib/geom/cache/Makefile
+++ b/lib/geom/cache/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	cache
 
diff --git a/lib/geom/concat/Makefile b/lib/geom/concat/Makefile
--- a/lib/geom/concat/Makefile
+++ b/lib/geom/concat/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	concat
 
diff --git a/lib/geom/eli/Makefile b/lib/geom/eli/Makefile
--- a/lib/geom/eli/Makefile
+++ b/lib/geom/eli/Makefile
@@ -1,13 +1,11 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2
+.PATH: ${SRCTOP}/sys/geom/eli
 
 GEOM_CLASS=	eli
 SRCS=	g_eli_crypto.c
 SRCS+=	g_eli_hmac.c
 SRCS+=	g_eli_key.c
 SRCS+=	pkcs5v2.c
-SRCS+=	sha256c.c
-SRCS+=	sha512c.c
 
 LIBADD=	md crypto
 
diff --git a/lib/geom/journal/Makefile b/lib/geom/journal/Makefile
--- a/lib/geom/journal/Makefile
+++ b/lib/geom/journal/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	journal
 SRCS+=	geom_journal_ufs.c
diff --git a/lib/geom/label/Makefile b/lib/geom/label/Makefile
--- a/lib/geom/label/Makefile
+++ b/lib/geom/label/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	label
 
diff --git a/lib/geom/mirror/Makefile b/lib/geom/mirror/Makefile
--- a/lib/geom/mirror/Makefile
+++ b/lib/geom/mirror/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	mirror
 
diff --git a/lib/geom/mountver/Makefile b/lib/geom/mountver/Makefile
--- a/lib/geom/mountver/Makefile
+++ b/lib/geom/mountver/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	mountver
 
diff --git a/lib/geom/multipath/Makefile b/lib/geom/multipath/Makefile
--- a/lib/geom/multipath/Makefile
+++ b/lib/geom/multipath/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	multipath
 
diff --git a/lib/geom/nop/Makefile b/lib/geom/nop/Makefile
--- a/lib/geom/nop/Makefile
+++ b/lib/geom/nop/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	nop
 
diff --git a/lib/geom/part/Makefile b/lib/geom/part/Makefile
--- a/lib/geom/part/Makefile
+++ b/lib/geom/part/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	part
 
diff --git a/lib/geom/raid/Makefile b/lib/geom/raid/Makefile
--- a/lib/geom/raid/Makefile
+++ b/lib/geom/raid/Makefile
@@ -1,8 +1,5 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	raid
 
-LIBADD=	md
-
 .include <bsd.lib.mk>
diff --git a/lib/geom/raid3/Makefile b/lib/geom/raid3/Makefile
--- a/lib/geom/raid3/Makefile
+++ b/lib/geom/raid3/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	raid3
 
diff --git a/lib/geom/shsec/Makefile b/lib/geom/shsec/Makefile
--- a/lib/geom/shsec/Makefile
+++ b/lib/geom/shsec/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	shsec
 
diff --git a/lib/geom/stripe/Makefile b/lib/geom/stripe/Makefile
--- a/lib/geom/stripe/Makefile
+++ b/lib/geom/stripe/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	stripe
 
diff --git a/lib/geom/union/Makefile b/lib/geom/union/Makefile
--- a/lib/geom/union/Makefile
+++ b/lib/geom/union/Makefile
@@ -1,5 +1,4 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	union
 
diff --git a/lib/geom/virstor/Makefile b/lib/geom/virstor/Makefile
--- a/lib/geom/virstor/Makefile
+++ b/lib/geom/virstor/Makefile
@@ -1,5 +1,5 @@
 PACKAGE=geom
-.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor
+.PATH: ${SRCTOP}/sys/geom/virstor
 
 GEOM_CLASS=	virstor