re-merged include file changes which got eaten by crash

sys/netns/sp.h

@@ -33,6 +33,9 @@
  *	@(#)sp.h	7.4 (Berkeley) 6/28/90
  */
 
+#ifndef _NETNS_SP_H_
+#define _NETNS_SP_H_
+
 /*
  * Definitions for Xerox NS style sequenced packet protocol
  */
@@ -50,3 +53,5 @@ struct sphdr {
 	u_short	sp_ack;		/* acknowledge number */
 	u_short	sp_alo;		/* allocation number */
 };
+
+#endif /* !_NETNS_SP_H_ */

sys/nfs/nfsdiskless.h

@@ -36,6 +36,9 @@
  *	@(#)nfsdiskless.h	7.1 (Berkeley) 3/4/91
  */
 
+#ifndef _NFS_NFSDISKLESS_H_
+#define _NFS_NFSDISKLESS_H_
+
 /*
  * Structure that must be initialized for a diskless nfs client.
  * This structure is used by nfs_mountroot() to set up the root and swap
@@ -56,3 +59,5 @@ struct nfs_diskless {
 	struct sockaddr	root_saddr;	/* Address of root server */
 	char		*root_hostnam;	/* Host name for mount pt */
 };
+
+#endif /* !_NFS_NFSDISKLESS_H_ */

sys/nfs/rpcv2.h

@@ -36,6 +36,9 @@
  *	@(#)rpcv2.h	7.4 (Berkeley) 6/28/90
  */
 
+#ifndef _NFS_RPCV2_H_
+#define _NFS_RPCV2_H_
+
 /*
  * Definitions for Sun RPC Version 2, from
  * "RPC: Remote Procedure Call Protocol Specification" RFC1057
@@ -85,3 +88,5 @@
 #define	RPCMNT_NAMELEN	255
 #define	RPCMNT_PATHLEN	1024
 #define	RPCPROG_NFS	100003
+
+#endif /* !_NFS_RPCV2_H_ */