Made them all idempotent.

Reviewed by:
Submitted by:

50 files changed, 293 insertions, 55 deletions

diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index a3af776..73b44bd 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: acct.h,v 1.2 1994/08/02 07:52:38 davidg Exp $
  */
 
+#ifndef _SYS_ACCT_H_
+#define _SYS_ACCT_H_
+
 /*
  * Accounting structures; these use a comp_t type which is a 3 bits base 8
  * exponent, 13 bit fraction ``floating point'' number.  Units are 1/AHZ
@@ -74,3 +77,5 @@ struct acct {
 #ifdef KERNEL
 struct vnode	*acctp;
 #endif
+
+#endif
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index ab91468..81380b3 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $Id: callout.h,v 1.2 1994/08/02 07:52:40 davidg Exp $
+ * $Id: callout.h,v 1.3 1994/08/18 22:35:41 wollman Exp $
  */
 
+#ifndef _SYS_CALLOUT_H_
+#define _SYS_CALLOUT_H_
+
 struct callout {
 	struct	callout *c_next;		/* next callout in queue */
 	void	*c_arg;				/* function argument */
@@ -50,3 +53,5 @@ struct callout {
 extern struct	callout *callfree, *callout, calltodo;
 extern int	ncallout;
 #endif
+
+#endif
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index d5a4616..9595a03 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -34,11 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.7 (Berkeley) 1/21/94
- * $Id: cdefs.h,v 1.3 1994/08/02 07:52:41 davidg Exp $
+ * $Id: cdefs.h,v 1.4 1994/08/13 14:21:58 davidg Exp $
  */
 
-#ifndef	_CDEFS_H_
-#define	_CDEFS_H_
+#ifndef	_SYS_CDEFS_H_
+#define	_SYS_CDEFS_H_
 
 #if defined(__cplusplus)
 #define	__BEGIN_DECLS	extern "C" {
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 857f85d..626be31 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $Id$
+ * $Id: clist.h,v 1.3 1994/08/02 07:52:43 davidg Exp $
  */
 
+#ifndef _SYS_CLIST_H_
+#define _SYS_CLIST_H_
+
 struct cblock {
 	struct cblock *c_next;			/* next cblock in queue */
 	unsigned char c_quote[CBQSIZE];		/* quoted characters */
@@ -44,3 +47,5 @@ struct cblock {
 extern	struct cblock *cfree, *cfreelist;
 extern	int cfreecount, nclist;
 #endif
+
+#endif
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 15f7361..cedd4dc 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: conf.h,v 1.2 1994/08/02 07:52:44 davidg Exp $
  */
 
+#ifndef _SYS_CONF_H_
+#define _SYS_CONF_H_
+
 /*
  * Definitions of device driver entry switches
  */
@@ -122,3 +125,5 @@ struct swdevt {
 #ifdef KERNEL
 extern struct swdevt swdevt[];
 #endif
+
+#endif
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index 4fef841..80c519e 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: dirent.h,v 1.2 1994/08/02 07:52:47 davidg Exp $
  */
 
+#ifndef _SYS_DIRENT_H_
+#define _SYS_DIRENT_H_
+
 /*
  * The dirent structure defines the format of directory entries returned by 
  * the getdirentries(2) system call.
@@ -75,3 +78,5 @@ struct dirent {
  */
 #define	IFTODT(mode)	(((mode) & 0170000) >> 12)
 #define	DTTOIF(dirtype)	((dirtype) << 12)
+
+#endif
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 5a93503..c90eca5 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -41,9 +41,12 @@
  *
  *	@(#)disk.h	8.1 (Berkeley) 6/2/93
  *
- * $Id$
+ * $Id: disk.h,v 1.2 1994/08/02 07:52:48 davidg Exp $
  */
 
+#ifndef _SYS_DISK_H_
+#define _SYS_DISK_H_
+
 /*
  * Disk device structures.
  *
@@ -110,3 +113,5 @@ int	setdisklabel __P((struct dkdevice *, struct disklabel *));
 int	writedisklabel __P((struct dkdevice *, int));
 int	diskerr __P((struct dkdevice *, struct buf *, char *, int, int));
 #endif
+
+#endif
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 30c16c8..b8b3ef7 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: disklabel.h,v 1.3 1994/08/02 07:52:49 davidg Exp $
  */
 
+#ifndef _SYS_DISKLABEL_H_
+#define _SYS_DISKLABEL_H_
+
 /*
  * Disk description table, see disktab(5)
  */
@@ -363,3 +366,5 @@ struct disklabel *getdiskbyname __P((const char *));
 __END_DECLS
 
 #endif
+
+#endif
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 30c16c8..b8b3ef7 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: disklabel.h,v 1.3 1994/08/02 07:52:49 davidg Exp $
  */
 
+#ifndef _SYS_DISKLABEL_H_
+#define _SYS_DISKLABEL_H_
+
 /*
  * Disk description table, see disktab(5)
  */
@@ -363,3 +366,5 @@ struct disklabel *getdiskbyname __P((const char *));
 __END_DECLS
 
 #endif
+
+#endif
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 30c16c8..b8b3ef7 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: disklabel.h,v 1.3 1994/08/02 07:52:49 davidg Exp $
  */
 
+#ifndef _SYS_DISKLABEL_H_
+#define _SYS_DISKLABEL_H_
+
 /*
  * Disk description table, see disktab(5)
  */
@@ -363,3 +366,5 @@ struct disklabel *getdiskbyname __P((const char *));
 __END_DECLS
 
 #endif
+
+#endif
diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index 99af34b..5daecde 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkbad.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: dkbad.h,v 1.2 1994/08/02 07:52:50 davidg Exp $
  */
 
+#ifndef _SYS_DKBAD_H_
+#define _SYS_DKBAD_H_
+
 /*
  * Definitions needed to perform bad sector revectoring ala DEC STD 144.
  *
@@ -67,3 +70,5 @@ struct dkbad {
 #define	SSE	1
 #define	BSE	2
 #define	CONT	3
+
+#endif
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 0d70833..dbafc9d 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: domain.h,v 1.2 1994/08/02 07:52:53 davidg Exp $
  */
 
+#ifndef _SYS_DOMAIN_H_
+#define _SYS_DOMAIN_H_
+
 /*
  * Structure per communications domain.
  */
@@ -63,3 +66,5 @@ struct	domain {
 #ifdef KERNEL
 struct	domain *domains;
 #endif
+
+#endif
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 96d52f3..3bac4ed 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $Id$
+ * $Id: errno.h,v 1.2 1994/08/02 07:52:54 davidg Exp $
  */
 
+#ifndef _SYS_ERRNO_H_
+#define _SYS_ERRNO_H_
+
 #ifndef KERNEL
 extern int errno;			/* global error number */
 #endif
@@ -162,3 +165,5 @@ extern int errno;			/* global error number */
 #define	ERESTART	-1		/* restart syscall */
 #define	EJUSTRETURN	-2		/* don't modify regs, just return */
 #endif
+
+#endif
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index aceb5c0..10bf15f 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id: exec.h,v 1.4 1994/08/19 11:45:28 davidg Exp $
+ * $Id: exec.h,v 1.5 1994/08/19 14:24:16 davidg Exp $
  */
 
+#ifndef _SYS_EXEC_H_
+#define _SYS_EXEC_H_
+
 #include <machine/exec.h>
 
 /*
@@ -83,3 +86,4 @@ extern int exec_extract_strings(/* struct image_params * */);
 extern int exec_new_vmspace(/* struct image_params * */);
 #endif
 
+#endif
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index c1c4385..b38522f 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -36,9 +36,12 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * $Id$
+ * $Id: fbio.h,v 1.2 1994/08/02 07:52:56 davidg Exp $
  */
 
+#ifndef _SYS_FBIO_H_
+#define _SYS_FBIO_H_
+
 /*
  * Frame buffer ioctls (from Sprite, trimmed to essentials for X11).
  */
@@ -184,3 +187,5 @@ struct fbcursor {
 
 /* get maximum cursor size */
 #define	FBIOGCURMAX	_IOR('F', 28, struct fbcurpos)
+
+#endif
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 308485c..f70f47a 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: file.h,v 1.2 1994/08/02 07:52:58 davidg Exp $
  */
 
+#ifndef _SYS_FILE_H_
+#define _SYS_FILE_H_
+
 #include <sys/fcntl.h>
 #include <sys/unistd.h>
 
@@ -75,3 +78,5 @@ extern int maxfiles;		/* kernel limit on number of open files */
 extern int nfiles;		/* actual number of open files */
 
 #endif /* KERNEL */
+
+#endif
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 10ba495..d2e22e8 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: filedesc.h,v 1.2 1994/08/02 07:52:59 davidg Exp $
  */
 
+#ifndef _SYS_FILEDESC_H_
+#define _SYS_FILEDESC_H_
+
 /*
  * This structure is used for the management of descriptors.  It may be
  * shared by multiple processes.
@@ -98,3 +101,5 @@ int	falloc __P((struct proc *p, struct file **resultfp, int *resultfd));
 struct	filedesc *fdcopy __P((struct proc *p));
 void	fdfree __P((struct proc *p));
 #endif
+
+#endif
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index 9e272fa..02bcb7b 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact.h,v 1.5 1994/08/18 22:35:43 wollman Exp $
+ *	$Id: imgact.h,v 1.6 1994/08/19 11:45:29 davidg Exp $
  */
 
-#ifndef __h_imgact
-#define __h_imgact 1
+#ifndef _SYS_IMGACT_H_
+#define _SYS_IMGACT_H_
 
 #include <sys/proc.h>
 #include <sys/namei.h>
@@ -56,4 +56,4 @@ struct image_params {
 	char interpreter_name[64]; /* name of the interpreter */
 };
 
-#endif /* __h_imgact */
+#endif 
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 48cf0d1..1be2e2f 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: kernel.h,v 1.3 1994/08/02 07:53:08 davidg Exp $
  */
 
+#ifndef _SYS_KERNEL_H_
+#define _SYS_KERNEL_H_
+
 /* Global variables for the kernel. */
 
 /* 1.1 */
@@ -82,3 +85,4 @@ struct linker_set {
 	caddr_t ls_items[1];	/* really ls_length of them, trailing NULL */
 };
 
+#endif
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index d7d773a..f0ced8d 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: ktrace.h,v 1.2 1994/08/02 07:53:09 davidg Exp $
  */
 
+#ifndef _SYS_KTRACE_H_
+#define _SYS_KTRACE_H_
+
 /*
  * operations to ktrace system call  (KTROP(op))
  */
@@ -155,3 +158,5 @@ int	ktrace __P((const char *, int, int, pid_t));
 __END_DECLS
 
 #endif	/* !KERNEL */
+
+#endif
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 15f7361..cedd4dc 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: conf.h,v 1.2 1994/08/02 07:52:44 davidg Exp $
  */
 
+#ifndef _SYS_CONF_H_
+#define _SYS_CONF_H_
+
 /*
  * Definitions of device driver entry switches
  */
@@ -122,3 +125,5 @@ struct swdevt {
 #ifdef KERNEL
 extern struct swdevt swdevt[];
 #endif
+
+#endif
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index e72122a..09b2b68 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $Id: lockf.h,v 1.2 1994/08/02 07:54:50 davidg Exp $
+ * $Id: lockf.h,v 1.1 1994/08/08 17:30:58 davidg Exp $
  */
 
+#ifndef _SYS_LOCKF_H_
+#define _SYS_LOCKF_H_
+
 /*
  * The lockf structure is a kernel structure which contains the information
  * associated with a byte range lock.  The lockf structures are linked into
@@ -79,3 +82,5 @@ void	lf_print __P((char *, struct lockf *));
 void	lf_printlist __P((char *, struct lockf *));
 __END_DECLS
 #endif
+
+#endif
diff --git a/sys/sys/map.h b/sys/sys/map.h
index 6877a3d..1254660 100644
--- a/sys/sys/map.h
+++ b/sys/sys/map.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)map.h	8.3 (Berkeley) 1/26/94
- * $Id$
+ * $Id: map.h,v 1.2 1994/08/02 07:53:11 davidg Exp $
  */
 
+#ifndef _SYS_MAP_H_
+#define _SYS_MAP_H_
+
 /*
  * Resource allocation maps.
  *
@@ -81,3 +84,5 @@ long	rmalloc __P((struct map *, long));
 void	rmfree __P((struct map *, long, long));
 void	rminit __P((struct map *, long, long, char *, int));
 #endif
+
+#endif
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 47ab7f5..d8c1f8d 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.3 (Berkeley) 1/21/94
- * $Id: mbuf.h,v 1.2 1994/08/02 07:53:12 davidg Exp $
+ * $Id: mbuf.h,v 1.3 1994/08/06 11:26:16 davidg Exp $
  */
 
+#ifndef _SYS_MALLOC_H_
+#define _SYS_MALLOC_H_
+
 #ifndef M_WAITOK
 #include <sys/malloc.h>
 #endif
@@ -429,3 +432,5 @@ int mbtypes[] = {				/* XXX */
 };
 #endif
 #endif
+
+#endif
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index 12ae916..bb77cda 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.1 (Berkeley) 6/2/93
- * $Id: mman.h,v 1.2 1994/08/02 07:53:14 davidg Exp $
+ * $Id: mman.h,v 1.3 1994/08/02 15:06:58 davidg Exp $
  */
 
+#ifndef _SYS_MMAN_H_
+#define _SYS_MMAN_H_
+
 /*
  * Protections are chosen from these bits, or-ed together
  */
@@ -89,3 +92,5 @@ int	munlock __P((caddr_t, size_t));
 __END_DECLS
 
 #endif /* !KERNEL */
+
+#endif
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 5b3743d..13f5519 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.13 (Berkeley) 3/27/94
- * $Id: mount.h,v 1.2 1994/08/02 07:53:15 davidg Exp $
+ * $Id: mount.h,v 1.3 1994/08/20 16:03:23 davidg Exp $
  */
 
+#ifndef _SYS_MOUNT_H_
+#define _SYS_MOUNT_H_
+
 #ifndef KERNEL
 #include <sys/ucred.h>
 #endif
@@ -417,4 +420,6 @@ int	statfs __P((const char *, struct statfs *));
 int	unmount __P((const char *, int));
 __END_DECLS
 
+
+#endif
 #endif /* KERNEL */
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 87f8552..3d2f4b0 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $Id: msgbuf.h,v 1.2 1994/08/02 07:53:16 davidg Exp $
+ * $Id: msgbuf.h,v 1.3 1994/08/18 22:35:44 wollman Exp $
  */
 
+#ifndef _SYS_MSGBUF_H_
+#define _SYS_MSGBUF_H_
+
 #define	MSG_BSIZE	(4096 - 3 * sizeof(long))
 struct	msgbuf {
 #define	MSG_MAGIC	0x063061
@@ -45,3 +48,5 @@ struct	msgbuf {
 #ifdef KERNEL
 extern struct	msgbuf *msgbufp;
 #endif
+
+#endif
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 0d5b1a7..50d8c2f 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: param.h,v 1.3 1994/08/02 07:53:19 davidg Exp $
  */
 
+#ifndef _SYS_PARAM_H_
+#define _SYS_PARAM_H_
+
 #define	BSD	199306		/* System version (year & month). */
 #define BSD4_3	1
 #define BSD4_4	1
@@ -215,3 +218,5 @@
  */
 #define	FSHIFT	11		/* bits to right of fixed binary point */
 #define FSCALE	(1<<FSHIFT)
+
+#endif
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index f1030d7..c104552 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: protosw.h,v 1.2 1994/08/02 07:53:22 davidg Exp $
  */
 
+#ifndef _SYS_PROTOSW_H_
+#define _SYS_PROTOSW_H_
+
 /*
  * Protocol switch table.
  *
@@ -209,3 +212,5 @@ char	*prcorequests[] = {
 #ifdef KERNEL
 extern	struct protosw *pffindproto(), *pffindtype();
 #endif
+
+#endif
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index a05266e..772bfb5 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: reboot.h,v 1.2 1994/08/02 07:53:26 davidg Exp $
  */
 
+#ifndef _SYS_REBOOT_H_
+#define _SYS_REBOOT_H_
+
 /*
  * Arguments to reboot system call.
  * These are passed to boot program in r11,
@@ -87,3 +90,5 @@
 	(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \
 	((controller) << B_CONTROLLERSHIFT) | ((unit) << B_UNITSHIFT) | \
 	((partition) << B_PARTITIONSHIFT) | B_DEVMAGIC)
+
+#endif
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 6ded3a6..6ad7b3c 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.1 (Berkeley) 6/2/93
- * $Id: socketvar.h,v 1.2 1994/08/02 07:53:36 davidg Exp $
+ * $Id: socketvar.h,v 1.3 1994/08/18 22:35:45 wollman Exp $
  */
 
+#ifndef _SYS_SOCKETVAR_H_
+#define _SYS_SOCKETVAR_H_
+
 #include <sys/select.h>			/* for struct selinfo */
 
 /*
@@ -206,3 +209,5 @@ int	soo_ioctl __P((struct file *fp, int com, caddr_t data, struct proc *p));
 int	soo_select __P((struct file *fp, int which, struct proc *p));
 int 	soo_close __P((struct file *fp, struct proc *p));
 #endif
+
+#endif
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index a16e5bb..2f381e0 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $Id: syslimits.h,v 1.3 1994/08/07 23:00:50 wollman Exp $
+ * $Id: syslimits.h,v 1.4 1994/08/08 09:12:43 davidg Exp $
  */
 
+#ifndef _SYS_SYSLIMITS_H_
+#define _SYS_SYSLIMITS_H_
+
 #define	ARG_MAX			65536	/* max bytes for an exec function */
 #define	CHILD_MAX		   40	/* max simultaneous processes */
 #define	LINK_MAX		32767	/* max file link count */
@@ -53,3 +56,5 @@
 #define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
 #define	LINE_MAX		 2048	/* max bytes in an input line */
 #define	RE_DUP_MAX		  255	/* max RE's in interval notation */
+
+#endif
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index 2f4e238..969717b 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $Id: syslog.h,v 1.2 1994/08/02 07:53:43 davidg Exp $
+ * $Id: syslog.h,v 1.3 1994/08/18 22:35:46 wollman Exp $
  */
 
+#ifndef _SYS_SYSLOG_H_
+#define _SYS_SYSLOG_H_
+
 #define	_PATH_LOG	"/dev/log"
 
 /*
@@ -188,3 +191,5 @@ void	vsyslog __P((int, const char *, _BSD_VA_LIST_));
 __END_DECLS
 
 #endif /* !KERNEL */
+
+#endif
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 01d9a52..d54c7bc 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.4 (Berkeley) 2/23/94
- * $Id: systm.h,v 1.6 1994/08/13 14:21:58 davidg Exp $
+ * $Id: systm.h,v 1.7 1994/08/18 22:35:47 wollman Exp $
  */
 
+#ifndef _SYS_SYSTM_H_
+#define _SYS_SYSTM_H_
+
 #include <machine/cpufunc.h>
 
 /*
@@ -189,3 +192,5 @@ typedef timeout_t *timeout_func_t; /* a pointer to this type */
 
 void timeout(timeout_func_t, void *, int);
 void untimeout(timeout_func_t, void *);
+
+#endif
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index a1b3379..8759a7c 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: timeb.h,v 1.2 1994/08/02 07:53:49 davidg Exp $
  */
 
+#ifndef _SYS_TIMEB_H_
+#define _SYS_TIMEB_H_
+
 /* The ftime(2) system call structure -- deprecated. */
 struct timeb {
 	time_t	time;			/* seconds since the Epoch */
@@ -46,3 +49,5 @@ struct timeb {
 	short	timezone;		/* minutes west of CUT */
 	short	dstflag;		/* DST == non-zero */
 };
+
+#endif
diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h
index 01a90d7..5ef2934 100644
--- a/sys/sys/tprintf.h
+++ b/sys/sys/tprintf.h
@@ -31,12 +31,17 @@
  * SUCH DAMAGE.
  *
  *	@(#)tprintf.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: tprintf.h,v 1.2 1994/08/02 07:53:51 davidg Exp $
  */
 
+#ifndef _SYS_TPRINTF_H_
+#define _SYS_TPRINTF_H_
+
 typedef struct session *tpr_t;
 
 tpr_t	tprintf_open __P((struct proc *));
 void	tprintf_close __P((tpr_t));
 
 void	tprintf __P((tpr_t, const char *fmt, ...));
+
+#endif
diff --git a/sys/sys/trace.h b/sys/sys/trace.h
index 57592ce..85b4759 100644
--- a/sys/sys/trace.h
+++ b/sys/sys/trace.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)trace.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: trace.h,v 1.2 1994/08/02 07:53:52 davidg Exp $
  */
 
+#ifndef _SYS_TRACE_H_
+#define _SYS_TRACE_H_
+
 /*
  * File system buffer tracing points; all trace <pack(dev, size), bn>
  */
@@ -115,3 +118,5 @@ char	traceflags[TR_NFLAGS];
 #define	trace(a,b,c)
 #endif
 #endif
+
+#endif
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 8b40a41..180094e 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
- * $Id: tty.h,v 1.2 1994/08/02 07:53:54 davidg Exp $
+ * $Id: tty.h,v 1.3 1994/08/18 22:35:50 wollman Exp $
  */
 
+#ifndef _SYS_TTY_H_
+#define _SYS_TTY_H_
+
 #include <sys/termios.h>
 #include <sys/select.h>		/* For struct selinfo. */
 
@@ -216,3 +219,5 @@ int	 ttysleep __P((struct tty *tp,
 int	 ttywait __P((struct tty *tp));
 int	 ttywflush __P((struct tty *tp));
 #endif
+
+#endif
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 58f489a..86540f9 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $Id: ttychars.h,v 1.2 1994/08/02 07:53:55 davidg Exp $
  */
 
+#ifndef _SYS_TTYCHARS_H_
+#define _SYS_TTYCHARS_H_
+
 /*
  * 4.3 COMPATIBILITY FILE
  *
@@ -62,3 +65,5 @@ struct ttychars {
 #include <sys/ttydefaults.h>	/* to pick up character defaults */
 #endif
 #endif /* !_SYS_TTYCHARS_H_ */
+
+#endif
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index b8ab6c0..91523b5 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $Id: ttydefaults.h,v 1.2 1994/08/02 07:53:57 davidg Exp $
  */
 
+#ifndef _SYS_TTYDEFAULTS_H_
+#define _SYS_TTYDEFAULTS_H_
+
 /*
  * System wide defaults for terminal state.
  */
@@ -95,3 +98,5 @@ cc_t	ttydefchars[NCCS] = {
 };
 #undef TTYDEFCHARS
 #endif
+
+#endif
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 8ee3038..c1b4270 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: un.h,v 1.3 1994/08/02 07:54:03 davidg Exp $
  */
 
+#ifndef _SYS_UN_H_
+#define _SYS_UN_H_
+
 /*
  * Definitions for UNIX IPC domain.
  */
@@ -48,3 +51,5 @@ struct	sockaddr_un {
 #define SUN_LEN(su) \
 	(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
 #endif
+
+#endif
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index d7afc61..41d8cfc 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: unpcb.h,v 1.2 1994/08/02 07:54:05 davidg Exp $
  */
 
+#ifndef _SYS_UNPCB_H_
+#define _SYS_UNPCB_H_
+
 /*
  * Protocol control block for an active
  * instance of a UNIX internal protocol.
@@ -72,3 +75,5 @@ struct	unpcb {
 };
 
 #define	sotounpcb(so)	((struct unpcb *)((so)->so_pcb))
+
+#endif
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 4c1f6a6..607acdd 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $Id$
+ * $Id: user.h,v 1.2 1994/08/02 07:54:06 davidg Exp $
  */
 
+#ifndef _SYS_USER_H_
+#define _SYS_USER_H_
+
 #include <machine/pcb.h>
 #ifndef KERNEL
 /* stuff that *used* to be included by user.h, or is now needed */
@@ -90,3 +93,5 @@ struct	user {
 #define	u_sig	U_sig
 #define	u_code	U_code
 #endif /* KERNEL */
+
+#endif
diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h
index e9a07b9..e8ed723 100644
--- a/sys/sys/vadvise.h
+++ b/sys/sys/vadvise.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vadvise.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: vadvise.h,v 1.2 1994/08/02 07:54:08 davidg Exp $
  */
 
+#ifndef _SYS_VADVISE_H_
+#define _SYS_VADVISE_H_
+
 /*
  * Parameters to vadvise() to tell system of particular paging
  * behaviour:
@@ -48,3 +51,5 @@
 #define	VA_ANOM		1
 #define	VA_SEQL		2
 #define	VA_FLUSH 	3
+
+#endif
diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h
index 8c4554e..4d59e36 100644
--- a/sys/sys/vcmd.h
+++ b/sys/sys/vcmd.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vcmd.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: vcmd.h,v 1.2 1994/08/02 07:54:09 davidg Exp $
  */
 
+#ifndef _SYS_VCMD_H_
+#define _SYS_VCMD_H_
+
 #include <sys/ioctl.h>
 
 #define	VPRINT		0100
@@ -42,3 +45,5 @@
 
 #define	VGETSTATE	_IOR('v', 0, int)
 #define	VSETSTATE	_IOW('v', 1, int)
+
+#endif
diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h
index ec45285..9cd1bf5 100644
--- a/sys/sys/vlimit.h
+++ b/sys/sys/vlimit.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vlimit.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: vlimit.h,v 1.2 1994/08/02 07:54:11 davidg Exp $
  */
 
+#ifndef _SYS_VLIMIT_H_
+#define _SYS_VLIMIT_H_
+
 /*
  * Limits for u.u_limit[i], per process, inherited.
  */
@@ -48,3 +51,5 @@
 #define	NLIMITS		6
 
 #define	INFINITY	0x7fffffff
+
+#endif 
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index a642770..6679ae0 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: vmmeter.h,v 1.3 1994/08/02 07:54:12 davidg Exp $
  */
 
+#ifndef _SYS_VMMETER_H_
+#define _SYS_VMMETER_H_
+
 /*
  * System wide statistics counters.
  */
@@ -148,3 +151,5 @@ int	rres;
 unsigned rectime;		/* accumulator for reclaim times */
 unsigned pgintime;		/* accumulator for page in times */
 #endif
+
+#endif
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index c6c0e46..ed5108e 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id$
+ * $Id: vnode.h,v 1.2 1994/08/02 07:54:13 davidg Exp $
  */
 
+#ifndef _SYS_VNODE_H_
+#define _SYS_VNODE_H_
+
 #include <sys/queue.h>
 
 /*
@@ -396,3 +399,5 @@ void 	vput __P((struct vnode *vp));
 void 	vref __P((struct vnode *vp));
 void 	vrele __P((struct vnode *vp));
 #endif /* KERNEL */
+
+#endif
diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h
index f15cc0b..3d67cd6 100644
--- a/sys/sys/vsio.h
+++ b/sys/sys/vsio.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vsio.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: vsio.h,v 1.2 1994/08/02 07:54:14 davidg Exp $
  */
 
+#ifndef _SYS_VSIO_H_
+#define _SYS_VSIO_H_
+
  /****************************************************************************
  *									    *
  *  Copyright (c) 1983, 1984 by						    *
@@ -152,3 +155,5 @@ typedef struct _vsIoAddr {
 	vsBox	 mbox;			/* atomic read/write */
 } vsIoAddr;
 typedef vsIoAddr *vsIoAddrAddr;
+
+#endif
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 6f7411a..85ae401 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: wait.h,v 1.2 1994/08/02 07:54:15 davidg Exp $
  */
 
+#ifndef _SYS_WAIT_H_
+#define _SYS_WAIT_H_
+
 /*
  * This file holds definitions relevent to the wait4 system call
  * and the alternate interfaces that use it (wait, wait3, waitpid).
@@ -155,3 +158,5 @@ pid_t	wait4 __P((pid_t, int *, int, struct rusage *));
 #endif
 __END_DECLS
 #endif
+
+#endif