diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 799475b50352..11b33bd1a196 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.43 1997/09/21 04:23:51 dyson Exp $
+ * $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $
  */
 
 /*
@@ -65,8 +65,8 @@
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
-#include <nfs/nfsnode.h>
 #include <nfs/nfs.h>
+#include <nfs/nfsnode.h>
 #include <nfs/xdr_subs.h>
 #include <nfs/nfsm_subs.h>
 #include <nfs/nfsmount.h>
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 97d58eeda858..a91346556c1e 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.20 1997/10/11 18:31:34 phk Exp $
+ * $Id: nfs_node.c,v 1.21 1997/10/12 20:25:40 phk Exp $
  */
 
 
@@ -48,6 +48,7 @@
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
+#include <nfs/nfs.h>
 #include <nfs/nfsnode.h>
 #include <nfs/nfsmount.h>
 
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 799475b50352..11b33bd1a196 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.43 1997/09/21 04:23:51 dyson Exp $
+ * $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $
  */
 
 /*
@@ -65,8 +65,8 @@
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
-#include <nfs/nfsnode.h>
 #include <nfs/nfs.h>
+#include <nfs/nfsnode.h>
 #include <nfs/xdr_subs.h>
 #include <nfs/nfsm_subs.h>
 #include <nfs/nfsmount.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 011b4ab2b211..ca4490516405 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.48 1997/09/10 19:52:26 phk Exp $
+ * $Id: nfs_vfsops.c,v 1.49 1997/10/12 20:25:49 phk Exp $
  */
 
 #include <sys/param.h>
@@ -64,8 +64,8 @@
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
-#include <nfs/nfsnode.h>
 #include <nfs/nfs.h>
+#include <nfs/nfsnode.h>
 #include <nfs/nfsmount.h>
 #include <nfs/xdr_subs.h>
 #include <nfs/nfsm_subs.h>
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 880b35629b4e..6e04ed71b817 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,14 +34,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $Id: nfsnode.h,v 1.22 1997/10/15 07:42:34 phk Exp $
+ * $Id: nfsnode.h,v 1.23 1997/10/16 10:49:05 phk Exp $
  */
 
 
 #ifndef _NFS_NFSNODE_H_
 #define _NFS_NFSNODE_H_
 
-#ifndef _NFS_NFS_H_
+#if !defined(_NFS_NFS_H_) && !defined(KERNEL)
 #include <nfs/nfs.h>
 #endif
 
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 97d58eeda858..a91346556c1e 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.20 1997/10/11 18:31:34 phk Exp $
+ * $Id: nfs_node.c,v 1.21 1997/10/12 20:25:40 phk Exp $
  */
 
 
@@ -48,6 +48,7 @@
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
+#include <nfs/nfs.h>
 #include <nfs/nfsnode.h>
 #include <nfs/nfsmount.h>
 
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 799475b50352..11b33bd1a196 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.43 1997/09/21 04:23:51 dyson Exp $
+ * $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $
  */
 
 /*
@@ -65,8 +65,8 @@
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
-#include <nfs/nfsnode.h>
 #include <nfs/nfs.h>
+#include <nfs/nfsnode.h>
 #include <nfs/xdr_subs.h>
 #include <nfs/nfsm_subs.h>
 #include <nfs/nfsmount.h>
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 011b4ab2b211..ca4490516405 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.48 1997/09/10 19:52:26 phk Exp $
+ * $Id: nfs_vfsops.c,v 1.49 1997/10/12 20:25:49 phk Exp $
  */
 
 #include <sys/param.h>
@@ -64,8 +64,8 @@
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
-#include <nfs/nfsnode.h>
 #include <nfs/nfs.h>
+#include <nfs/nfsnode.h>
 #include <nfs/nfsmount.h>
 #include <nfs/xdr_subs.h>
 #include <nfs/nfsm_subs.h>
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 880b35629b4e..6e04ed71b817 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,14 +34,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $Id: nfsnode.h,v 1.22 1997/10/15 07:42:34 phk Exp $
+ * $Id: nfsnode.h,v 1.23 1997/10/16 10:49:05 phk Exp $
  */
 
 
 #ifndef _NFS_NFSNODE_H_
 #define _NFS_NFSNODE_H_
 
-#ifndef _NFS_NFS_H_
+#if !defined(_NFS_NFS_H_) && !defined(KERNEL)
 #include <nfs/nfs.h>
 #endif
 
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 799475b50352..11b33bd1a196 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.43 1997/09/21 04:23:51 dyson Exp $
+ * $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $
  */
 
 /*
@@ -65,8 +65,8 @@
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
-#include <nfs/nfsnode.h>
 #include <nfs/nfs.h>
+#include <nfs/nfsnode.h>
 #include <nfs/xdr_subs.h>
 #include <nfs/nfsm_subs.h>
 #include <nfs/nfsmount.h>