16 files changed, 16 insertions, 16 deletions
diff --git a/sbin/mount_null/Makefile b/sbin/mount_null/Makefile
index 68b488d..3c50252 100644
--- a/sbin/mount_null/Makefile
+++ b/sbin/mount_null/Makefile
@@ -6,7 +6,7 @@ SRCS=	mount_null.c getmntopts.c
 MAN=	mount_null.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index d38e7e3..8e6b8f0 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -50,7 +50,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/mount.h>
-#include <miscfs/nullfs/null.h>
+#include <fs/nullfs/null.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 68b488d..3c50252 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -6,7 +6,7 @@ SRCS=	mount_null.c getmntopts.c
 MAN=	mount_null.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index d38e7e3..8e6b8f0 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -50,7 +50,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/mount.h>
-#include <miscfs/nullfs/null.h>
+#include <fs/nullfs/null.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 00b96dc..fc332ee 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -7,7 +7,7 @@ SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 MAN=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index 4131834..5837bd7 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-#include <miscfs/portal/portal.h>
+#include <fs/portalfs/portal.h>
 
 /*
  * Meta-chars in an RE.  Paths in the config file containing
diff --git a/sbin/mount_portalfs/Makefile b/sbin/mount_portalfs/Makefile
index 00b96dc..fc332ee 100644
--- a/sbin/mount_portalfs/Makefile
+++ b/sbin/mount_portalfs/Makefile
@@ -7,7 +7,7 @@ SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 MAN=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_portalfs/portald.h b/sbin/mount_portalfs/portald.h
index 4131834..5837bd7 100644
--- a/sbin/mount_portalfs/portald.h
+++ b/sbin/mount_portalfs/portald.h
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-#include <miscfs/portal/portal.h>
+#include <fs/portalfs/portal.h>
 
 /*
  * Meta-chars in an RE.  Paths in the config file containing
diff --git a/sbin/mount_umap/Makefile b/sbin/mount_umap/Makefile
index 9ae6798..7dc1fc6b 100644
--- a/sbin/mount_umap/Makefile
+++ b/sbin/mount_umap/Makefile
@@ -6,7 +6,7 @@ SRCS=	mount_umap.c getmntopts.c
 MAN=	mount_umap.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index 0aa7b8c..14299fd 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -52,7 +52,7 @@ static const char rcsid[] =
 #include <sys/mount.h>
 #include <sys/stat.h>
 
-#include <miscfs/umapfs/umap.h>
+#include <fs/umapfs/umap.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_umapfs/Makefile b/sbin/mount_umapfs/Makefile
index 9ae6798..7dc1fc6b 100644
--- a/sbin/mount_umapfs/Makefile
+++ b/sbin/mount_umapfs/Makefile
@@ -6,7 +6,7 @@ SRCS=	mount_umap.c getmntopts.c
 MAN=	mount_umap.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index 0aa7b8c..14299fd 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -52,7 +52,7 @@ static const char rcsid[] =
 #include <sys/mount.h>
 #include <sys/stat.h>
 
-#include <miscfs/umapfs/umap.h>
+#include <fs/umapfs/umap.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_union/Makefile b/sbin/mount_union/Makefile
index 6b58c2d..7e0df33 100644
--- a/sbin/mount_union/Makefile
+++ b/sbin/mount_union/Makefile
@@ -6,7 +6,7 @@ SRCS=	mount_union.c getmntopts.c
 MAN=	mount_union.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index 1d5d3eb..d07f427 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -52,7 +52,7 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/mount.h>
 
-#include <miscfs/union/union.h>
+#include <fs/unionfs/union.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 6b58c2d..7e0df33 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -6,7 +6,7 @@ SRCS=	mount_union.c getmntopts.c
 MAN=	mount_union.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 1d5d3eb..d07f427 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -52,7 +52,7 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/mount.h>
 
-#include <miscfs/union/union.h>
+#include <fs/unionfs/union.h>
 
 #include <err.h>
 #include <stdio.h>