diff --git a/lib/libprocstat/cd9660.c b/lib/libprocstat/cd9660.c
--- a/lib/libprocstat/cd9660.c
+++ b/lib/libprocstat/cd9660.c
@@ -52,9 +52,8 @@
 
 #include <err.h>
 
-#define _KERNEL
+#define _WANT_ISO_MNT
 #include <isofs/cd9660/iso.h>
-#undef _KERNEL
 #include <isofs/cd9660/cd9660_node.h>
 
 #include <kvm.h>
diff --git a/lib/libprocstat/msdosfs.c b/lib/libprocstat/msdosfs.c
--- a/lib/libprocstat/msdosfs.c
+++ b/lib/libprocstat/msdosfs.c
@@ -44,17 +44,15 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
+#include <sys/mount.h>
 
 #include <netinet/in.h>
 
-#define	_KERNEL
-#include <sys/mount.h>
+#define _WANT_MSDOSFS_INTERNALS
 #include <fs/msdosfs/bpb.h>
 #include <fs/msdosfs/msdosfsmount.h>
-#undef _KERNEL
-
-#include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/direntry.h>
+#include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
 
 #include <err.h>
@@ -62,13 +60,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-/*
- * XXX -
- * VTODE is defined in denode.h only if _KERNEL is defined, but that leads to
- * header explosion
- */
-#define VTODE(vp) ((struct denode *)getvnodedata(vp))
-
 #include "libprocstat.h"
 #include "common_kvm.h"
 
diff --git a/lib/libprocstat/smbfs.c b/lib/libprocstat/smbfs.c
--- a/lib/libprocstat/smbfs.c
+++ b/lib/libprocstat/smbfs.c
@@ -32,9 +32,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
-#define _KERNEL
+#define _WANT_MOUNT
 #include <sys/mount.h>
-#undef _KERNEL
 
 #include <netinet/in.h>
 
diff --git a/lib/libprocstat/udf.c b/lib/libprocstat/udf.c
--- a/lib/libprocstat/udf.c
+++ b/lib/libprocstat/udf.c
@@ -32,9 +32,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
-#define _KERNEL
 #include <sys/mount.h>
-#undef _KERNEL
 
 #include <netinet/in.h>
 
diff --git a/lib/libprocstat/zfs.c b/lib/libprocstat/zfs.c
--- a/lib/libprocstat/zfs.c
+++ b/lib/libprocstat/zfs.c
@@ -31,9 +31,8 @@
 #include <stdbool.h>
 
 #include <sys/param.h>
-#define _KERNEL
+#define _WANT_MOUNT
 #include <sys/mount.h>
-#undef _KERNEL
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>