diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index c879a97dbf9..4ffab3191ad 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -61,15 +61,11 @@ static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #undef KERNEL
-#define NFS
 #include <sys/mount.h>
 #include <nfs/nfsproto.h>
 #include <nfs/rpcv2.h>
-#define	KERNEL
 #include <nfs/nfs.h>
-#undef KERNEL
 #include <nfs/nfsnode.h>
-#undef NFS
 
 #include <net/route.h>
 #include <netinet/in.h>
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 31ff096f16d..c98dbd1e736 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -49,9 +49,7 @@ static char sccsid[] = "@(#)pstat.c	8.16 (Berkeley) 5/9/95";
 #include <sys/file.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
-#define NFS
 #include <sys/mount.h>
-#undef NFS
 #include <sys/uio.h>
 #include <sys/namei.h>
 #include <miscfs/union/union.h>
@@ -59,9 +57,7 @@ static char sccsid[] = "@(#)pstat.c	8.16 (Berkeley) 5/9/95";
 #include <sys/stat.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
-#define KERNEL
 #include <nfs/nfs.h>
-#undef KERNEL
 #include <nfs/nfsnode.h>
 #include <sys/ioctl.h>
 #include <sys/ioctl_compat.h>	/* XXX NTTYDISC is too well hidden */