diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index 4ddd510e1196..357ebe01b1fa 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -33,6 +33,9 @@
  *	@(#)fifo.h	7.1 (Berkeley) 4/15/91
  */
 
+#ifndef _SYS_FIFO_H_
+#define _SYS_FIFO_H_
+
 #ifdef FIFO
 /*
  * Prototypes for fifo operations on vnodes.
@@ -178,3 +181,5 @@ int	fifo_advlock __P((
 		struct flock *fl,
 		int flags));
 #endif /* FIFO */
+
+#endif /* !_SYS_FIFO_H_ */
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index 2012ca7ab774..6f4b6a6a8a0d 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -33,6 +33,9 @@
  *	@(#)specdev.h	7.4 (Berkeley) 4/19/91
  */
 
+#ifndef _SYS_SPECDEV_H_
+#define _SYS_SPECDEV_H_
+
 /*
  * This structure defines the information maintained about
  * special devices. It is allocated in checkalias and freed
@@ -218,3 +221,5 @@ int	spec_advlock __P((
 		int op,
 		struct flock *fl,
 		int flags));
+
+#endif /* !_SYS_SPECDEV_H_ */
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/asm.h b/sys/sys/asm.h
index 6085dcd5e831..404432991acc 100644
--- a/sys/sys/asm.h
+++ b/sys/sys/asm.h
@@ -36,6 +36,9 @@
  *	@(#)asm.h	5.5 (Berkeley) 5/7/91
  */
 
+#ifndef _SYS_ASM_H_
+#define _SYS_ASM_H_
+
 #ifdef PROF
 # ifdef __STDC__
 #  define ENTRY(x)	.globl _ ## x; \
@@ -55,3 +58,4 @@
 #endif PROF
 #define	ASMSTR		.asciz
 
+#endif /* !_SYS_ASM_H_ */
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 16dc1f6467d4..063aa4b4b195 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -1 +1 @@
-revision 1.2 intentionally removed
+revision 1.3 intentionally removed
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index fbe572a444ae..c1332892093a 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -33,8 +33,8 @@
  *	@(#)cdefs.h	7.6 (Berkeley) 5/4/91
  */
 
-#ifndef	_CDEFS_H_
-#define	_CDEFS_H_
+#ifndef	_SYS_CDEFS_H_
+#define	_SYS_CDEFS_H_
 
 #if defined(__cplusplus)
 #define	__BEGIN_DECLS	extern "C" {
@@ -75,4 +75,4 @@
 #endif	/* !__GNUC__ */
 #endif	/* !(__STDC__ || __cplusplus) */
 
-#endif /* !_CDEFS_H_ */
+#endif /* !_SYS_CDEFS_H_ */
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index 0bd4ea774887..9200ab33def3 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -7,6 +7,10 @@
  *
  * 16 Feb 93	Julian Elischer		ADDED for SCSI system
  */
+
+#ifndef _SYS_CDIO_H_
+#define _SYS_CDIO_H_
+
 /* Shared between kernel & process */
 
 struct cd_toc_entry {
@@ -145,5 +149,4 @@ struct	ioc_vol
 #define	CDIOCSTOP	_IO('c',23)
 #define	CDIOCEJECT	_IO('c',24)
 
-
-
+#endif /* !_SYS_CDIO_H_ */
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index 532e6eed54dc..77fb836b7500 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -44,11 +44,12 @@
    Stefan Grefen grefen@goofy.zdv.uni-mainz.de 
  */
 
+#ifndef _SYS_CHIO_H_
+#define _SYS_CHIO_H_
+
 /*
  * Structures and definitions for changer io control commands
  */
-#ifndef _CHIO_H_
-#define _CHIO_H_
 
 #define CH_INVERT		0x10000
 #define CH_ADDR_MASK		0xffff
@@ -124,4 +125,5 @@ struct chop {
 
 /* Changer IO control command */
 #define	CHIOOP	_IOWR('c', 1, struct chop)	/* do a mag tape op */
-#endif
+
+#endif /* !_SYS_CHIO_H_ */
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 71810938696b..f1894df6e954 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -33,6 +33,9 @@
  *	@(#)clist.h	7.3 (Berkeley) 2/15/91
  */
 
+#ifndef _SYS_CLIST_H_
+#define _SYS_CLIST_H_
+
 struct cblock {
 	struct cblock *c_next;		/* next cblock in queue */
 	char c_quote[CBQSIZE];		/* quoted characters */
@@ -43,3 +46,5 @@ struct cblock {
 struct cblock *cfree, *cfreelist;
 int cfreecount, nclist;
 #endif
+
+#endif /* !_SYS_CLIST_H_ */
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index bc4ca3ffa92d..4a66fd8d225d 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -33,14 +33,14 @@
  *	@(#)dir.h	7.3 (Berkeley) 2/5/91
  */
 
+#ifndef _SYS_DIR_H_
+#define	_SYS_DIR_H_
+
 /*
  * The information in this file should be obtained from <dirent.h>
  * and is provided solely (and temporarily) for backward compatibility.
  */
 
-#ifndef _DIR_H_
-#define	_DIR_H_
-
 #include <dirent.h>
 
 /*
@@ -58,4 +58,4 @@
 #define DIRSIZ(dp) \
     ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
 
-#endif /* !_DIR_H_ */
+#endif /* !_SYS_DIR_H_ */
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index c49ffeaa44fc..0640d228e0e5 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -33,9 +33,13 @@
  *	@(#)disklabel.h	7.19 (Berkeley) 5/7/91
  */
 
+#ifndef _SYS_DISKLABEL_H_
+#define _SYS_DISKLABEL_H_
+
 /*
  * Disk description table, see disktab(5)
  */
+
 #define	_PATH_DISKTAB	"/etc/disktab"
 #define	DISKTAB		"/etc/disktab"		/* deprecated */
 
@@ -362,3 +366,5 @@ struct disklabel *getdiskbyname __P((const char *));
 __END_DECLS
 
 #endif
+
+#endif /* !_SYS_DISKLABEL_H_ */
diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index 9857d97b9209..7c22771a076e 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -33,6 +33,9 @@
  *	@(#)dkbad.h	7.2 (Berkeley) 2/15/91
  */
 
+#ifndef _SYS_DKBAD_H_
+#define _SYS_DKBAD_H_
+
 /*
  * Definitions needed to perform bad sector revectoring ala DEC STD 144.
  *
@@ -66,3 +69,5 @@ struct dkbad {
 #define	SSE	1
 #define	BSE	2
 #define	CONT	3
+
+#endif /* !_SYS_DKBAD_H_ */
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h
index 5284b410a71c..29574335dea5 100644
--- a/sys/sys/dmap.h
+++ b/sys/sys/dmap.h
@@ -33,13 +33,14 @@
  *	@(#)dmap.h	7.3 (Berkeley) 2/15/91
  */
 
-#ifndef _DMAP_H_
-#define	_DMAP_H_
+#ifndef _SYS_DMAP_H_
+#define	_SYS_DMAP_H_
 
 /*
  * Definitions for the mapping of vitual swap space to the physical swap
  * area - the disk map.
  */
+
 #define	NDMAP	38		/* size of the swap area map */
 
 struct dmap {
@@ -57,4 +58,5 @@ struct dblock {
 	swblk_t db_base;	/* base of physical contig drum block */
 	swblk_t db_size;	/* size of block */
 };
-#endif	/* !_DMAP_H_ */
+
+#endif	/* !_SYS_DMAP_H_ */
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 955551681272..4ab5b77e0587 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -33,6 +33,9 @@
  *	@(#)domain.h	7.4 (Berkeley) 6/28/90
  */
 
+#ifndef _SYS_DOMAIN_H_
+#define _SYS_DOMAIN_H_
+
 /*
  * Structure per communications domain.
  */
@@ -49,3 +52,5 @@ struct	domain {
 #ifdef KERNEL
 struct	domain *domains;
 #endif
+
+#endif /* !_SYS_DOMAIN_H_ */
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 16dc1f6467d4..063aa4b4b195 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -1 +1 @@
-revision 1.2 intentionally removed
+revision 1.3 intentionally removed
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/fifo.h b/sys/sys/fifo.h
index 4ddd510e1196..357ebe01b1fa 100644
--- a/sys/sys/fifo.h
+++ b/sys/sys/fifo.h
@@ -33,6 +33,9 @@
  *	@(#)fifo.h	7.1 (Berkeley) 4/15/91
  */
 
+#ifndef _SYS_FIFO_H_
+#define _SYS_FIFO_H_
+
 #ifdef FIFO
 /*
  * Prototypes for fifo operations on vnodes.
@@ -178,3 +181,5 @@ int	fifo_advlock __P((
 		struct flock *fl,
 		int flags));
 #endif /* FIFO */
+
+#endif /* !_SYS_FIFO_H_ */
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 31f198937e8c..34c3760f9899 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -33,6 +33,9 @@
  *	@(#)file.h	7.10 (Berkeley) 6/4/91
  */
 
+#ifndef _SYS_FILE_H_
+#define _SYS_FILE_H_
+
 #include <sys/fcntl.h>
 #include <sys/unistd.h>
 
@@ -71,3 +74,5 @@ extern int maxfiles;		/* kernel limit on number of open files */
 extern int nfiles;		/* actual number of open files */
 
 #endif /* KERNEL */
+
+#endif /* !_SYS_FILE_H_ */
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index b6243c28e068..9b6e7252c72c 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -33,6 +33,9 @@
  *	@(#)filedesc.h	7.4 (Berkeley) 5/4/91
  */
 
+#ifndef _SYS_FILEDESC_H_
+#define _SYS_FILEDESC_H_
+
 /*
  * This structure is used for the management of descriptors.  It may be
  * shared by multiple processes.
@@ -97,3 +100,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 /* !_SYS_FILEDESC_H_ */
diff --git a/sys/sys/gprof.h b/sys/sys/gprof.h
index 03167191a46b..db7f15e26a08 100644
--- a/sys/sys/gprof.h
+++ b/sys/sys/gprof.h
@@ -33,6 +33,9 @@
  *	@(#)gprof.h	7.2 (Berkeley) 2/15/91
  */
 
+#ifndef _SYS_GPROF_H_
+#define _SYS_GPROF_H_
+
 struct phdr {
     char	*lpc;
     char	*hpc;
@@ -112,3 +115,5 @@ struct rawarc {
      */
 #define ROUNDDOWN(x,y)	(((x)/(y))*(y))
 #define ROUNDUP(x,y)	((((x)+(y)-1)/(y))*(y))
+
+#endif /* !_SYS_GPROF_H_ */
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index 16dc1f6467d4..063aa4b4b195 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -1 +1 @@
-revision 1.2 intentionally removed
+revision 1.3 intentionally removed
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index 16dc1f6467d4..063aa4b4b195 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -1 +1 @@
-revision 1.2 intentionally removed
+revision 1.3 intentionally removed
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 16dc1f6467d4..063aa4b4b195 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -1 +1 @@
-revision 1.2 intentionally removed
+revision 1.3 intentionally removed
diff --git a/sys/sys/kinfo.h b/sys/sys/kinfo.h
index c4a155c3dd62..9c2f4533d992 100644
--- a/sys/sys/kinfo.h
+++ b/sys/sys/kinfo.h
@@ -33,6 +33,9 @@
  *	@(#)kinfo.h	7.9 (Berkeley) 6/26/91
  */
 
+#ifndef _SYS_KINFO_H_
+#define _SYS_KINFO_H_
+
 /*
  * Get kernel info
  */
@@ -89,3 +92,5 @@ __BEGIN_DECLS
 int	getkerninfo __P((int, void *, int *, int));
 __END_DECLS
 #endif
+
+#endif /* !_SYS_KINFO_H_ */
diff --git a/sys/sys/kinfo_proc.h b/sys/sys/kinfo_proc.h
index 28b2c177ce67..b927e22bb357 100644
--- a/sys/sys/kinfo_proc.h
+++ b/sys/sys/kinfo_proc.h
@@ -33,8 +33,8 @@
  *	@(#)kinfo_proc.h	7.1 (Berkeley) 5/9/91
  */
 
-#ifndef _KINFO_PROC_H_
-#define	_KINFO_PROC_H_
+#ifndef _SYS_KINFO_PROC_H_
+#define	_SYS_KINFO_PROC_H_
 
 #ifndef KERNEL
 #include <sys/time.h>
@@ -78,4 +78,4 @@ struct kinfo_proc {
 void	fill_eproc __P((struct proc *, struct eproc *));
 #endif
 
-#endif	/* !_KINFO_PROC_H_ */
+#endif	/* !_SYS_KINFO_PROC_H_ */
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 9f63359e2d47..4ca1a6590e2d 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -33,6 +33,9 @@
  *	@(#)ktrace.h	7.4 (Berkeley) 5/7/91
  */
 
+#ifndef _SYS_KTRACE_H_
+#define _SYS_KTRACE_H_
+
 /*
  * operations to ktrace system call  (KTROP(op))
  */
@@ -142,3 +145,5 @@ int	ktrace __P((const char *, int, int, pid_t));
 __END_DECLS
 
 #endif	/* !KERNEL */
+
+#endif /* !_SYS_KTRACE_H_ */
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 4dd6806326bb..8c5594c63243 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -33,8 +33,8 @@
  *	@(#)malloc.h	7.25 (Berkeley) 5/15/91
  */
 
-#ifndef _MALLOC_H_
-#define	_MALLOC_H_
+#ifndef _SYS_MALLOC_H_
+#define	_SYS_MALLOC_H_
 
 #define KMEMSTATS
 
@@ -266,4 +266,5 @@ extern struct kmembuckets bucket[];
 extern void *malloc __P((unsigned long size, int type, int flags));
 extern void free __P((void *addr, int type));
 #endif /* KERNEL */
-#endif /* !_MALLOC_H_ */
+
+#endif /* !_SYS_MALLOC_H_ */
diff --git a/sys/sys/mapmem.h b/sys/sys/mapmem.h
index 654eb32ed205..0c1b63e15afd 100644
--- a/sys/sys/mapmem.h
+++ b/sys/sys/mapmem.h
@@ -40,6 +40,9 @@
  *	@(#)mapmem.h	7.2 (Berkeley) 6/6/90
  */
 
+#ifndef _SYS_MAPMEM_H_
+#define _SYS_MAPMEM_H_
+
 /*
  * Mapped memory descriptors.
  *
@@ -110,3 +113,5 @@ struct mapmem {
 #define MMFREE(mp) \
 	free((caddr_t)(mp), M_MAPMEM)
 #endif
+
+#endif /* !_SYS_MAPMEM_H_ */
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 290b917a10e5..d56e2dca969c 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -33,6 +33,9 @@
  *	@(#)mbuf.h	7.14 (Berkeley) 12/5/90
  */
 
+#ifndef _SYS_MBUF_H_
+#define _SYS_MBUF_H_
+
 #ifndef M_WAITOK
 #include "malloc.h"
 #endif
@@ -380,3 +383,5 @@ int mbtypes[] = {				/* XXX */
 };
 #endif
 #endif
+
+#endif /* !_SYS_MBUF_H_ */
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index b3e19d7a2223..5fa1b20d505b 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -33,6 +33,9 @@
  *	@(#)mman.h	7.5 (Berkeley) 6/27/91
  */
 
+#ifndef _SYS_MMAN_H_
+#define _SYS_MMAN_H_
+
 /*
  * Protections are chosen from these bits, or-ed together
  */
@@ -85,3 +88,5 @@ int	msync __P((caddr_t, int));
 __END_DECLS
 
 #endif /* !KERNEL */
+
+#endif /* !_SYS_MMAN_H_ */
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 2b4301e0c920..4e6dcbd636b2 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -33,6 +33,9 @@
  *	@(#)mount.h	7.22 (Berkeley) 6/3/91
  */
 
+#ifndef _SYS_MOUNT_H_
+#define _SYS_MOUNT_H_
+
 typedef quad fsid_t;			/* file system id type */
 
 /*
@@ -301,3 +304,5 @@ int	unmount __P((const char *, int));
 __END_DECLS
 
 #endif /* KERNEL */
+
+#endif /* !_SYS_MOUNT_H_ */
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 821b12493852..b4b9bb2b391b 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -33,6 +33,9 @@
  *	@(#)msgbuf.h	7.5 (Berkeley) 5/2/91
  */
 
+#ifndef _SYS_MSGBUF_H_
+#define _SYS_MSGBUF_H_
+
 #define	MSG_BSIZE	(4096 - 3 * sizeof(long))
 struct	msgbuf {
 #define	MSG_MAGIC	0x063061
@@ -44,3 +47,5 @@ struct	msgbuf {
 #ifdef KERNEL
 struct	msgbuf *msgbufp;
 #endif
+
+#endif /* !_SYS_MSGBUF_H_ */
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index e42c92bd021d..df5fbea325d0 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -33,6 +33,9 @@
  *	@(#)mtio.h	7.6 (Berkeley) 2/5/91
  */
 
+#ifndef _SYS_MTIO_H_
+#define _SYS_MTIO_H_
+
 /*
  * Structures and definitions for mag tape io control commands
  */
@@ -115,3 +118,5 @@ struct mtget {
 #define	T_6250BPI	020		/* select 6250 bpi */
 #define	T_BADBPI	030		/* undefined selection */
 #endif
+
+#endif /* !_SYS_MTIO_H_ */
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 9c8d5ac91b8c..acb724997d7e 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -33,8 +33,8 @@
  *	@(#)namei.h	7.15 (Berkeley) 5/15/91
  */
 
-#ifndef _NAMEI_H_
-#define	_NAMEI_H_
+#ifndef _SYS_NAMEI_H_
+#define _SYS_NAMEI_H_
 
 /*
  * Encapsulation of namei parameters.
@@ -164,4 +164,5 @@ struct	nchstats {
 	long	ncs_pass2;		/* names found with passes == 2 */
 	long	ncs_2passes;		/* number of times we attempt it */
 };
-#endif /* !_NAMEI_H_ */
+
+#endif /* !_SYS_NAMEI_H_ */
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 16dc1f6467d4..063aa4b4b195 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1 +1 @@
-revision 1.2 intentionally removed
+revision 1.3 intentionally removed
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index 64222879b6f4..d4b7709f1d5c 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -33,6 +33,9 @@
  *	@(#)protosw.h	7.8 (Berkeley) 4/28/91
  */
 
+#ifndef _SYS_PROTOSW_H_
+#define _SYS_PROTOSW_H_
+
 /*
  * Protocol switch table.
  *
@@ -207,3 +210,5 @@ char	*prcorequests[] = {
 #ifdef KERNEL
 extern	struct protosw *pffindproto(), *pffindtype();
 #endif
+
+#endif /* !_SYS_PROTOSW_H_ */
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index e4ca21abb710..cf0686306b92 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -33,8 +33,8 @@
  *	@(#)ptrace.h	7.4 (Berkeley) 2/22/91
  */
 
-#ifndef	_PTRACE_H_
-#define	_PTRACE_H_
+#ifndef _SYS_PTRACE_H_
+#define _SYS_PTRACE_H_
 
 #define	PT_TRACE_ME	0	/* child declares it's being traced */
 #define	PT_READ_I	1	/* read word in child's I space */
@@ -57,4 +57,4 @@ __END_DECLS
 
 #endif /* !KERNEL */
 
-#endif	/* !_PTRACE_H_ */
+#endif /* !_SYS_PTRACE_H_ */
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index 3c33eeafdbd5..2aabd0fd34cd 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -33,6 +33,9 @@
  *	@(#)reboot.h	7.6 (Berkeley) 6/28/90
  */
 
+#ifndef _SYS_REBOOT_H_
+#define _SYS_REBOOT_H_
+
 /*
  * Arguments to reboot system call.
  * These are passed to boot program in r11,
@@ -85,3 +88,5 @@
 	(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \
 	((controller) << B_CONTROLLERSHIFT) | ((unit) << B_UNITSHIFT) | \
 	((partition) << B_PARTITIONSHIFT) | B_DEVMAGIC)
+
+#endif /* !_SYS_REBOOT_H_ */
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index d440d3fb5041..714bcaaf12e9 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -33,8 +33,8 @@
  *	@(#)resource.h	7.5 (Berkeley) 3/17/91
  */
 
-#ifndef _RESOURCE_H_
-#define	_RESOURCE_H_
+#ifndef _SYS_RESOURCE_H_
+#define _SYS_RESOURCE_H_
 
 /*
  * Process priority specifications to get/setpriority.
@@ -108,4 +108,5 @@ int	setrlimit __P((int, const struct rlimit *));
 __END_DECLS
 
 #endif	/* !KERNEL */
-#endif	/* !_RESOURCE_H_ */
+
+#endif /* !_SYS_RESOURCE_H_ */
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 5148af2a5173..d3a91a79e2d9 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -33,8 +33,8 @@
  *	@(#)resourcevar.h	7.1 (Berkeley) 5/9/91
  */
 
-#ifndef	_RESOURCEVAR_H_		/* tmp for user.h */
-#define	_RESOURCEVAR_H_
+#ifndef _SYS_RESOURCEVAR_H_
+#define _SYS_RESOURCEVAR_H_
 
 /*
  * Kernel per-process accounting / statistics
@@ -80,4 +80,5 @@ struct plimit {
 
 /* make copy of plimit structure */
 struct	plimit *limcopy __P((struct plimit *lim));
-#endif	/* !_RESOURCEVAR_H_ */
+
+#endif /* !_SYS_RESOURCEVAR_H_ */
diff --git a/sys/sys/rlist.h b/sys/sys/rlist.h
index 8c76a251b3c3..b00ab60282f8 100644
--- a/sys/sys/rlist.h
+++ b/sys/sys/rlist.h
@@ -14,9 +14,12 @@
  *	Usage:
  *		rlist_free(&swapmap, 100, 200);	add space to swapmap
  *		rlist_alloc(&swapmap, 100, &loc); obtain 100 sectors from swap
- * $Header: /cvsroot/src/sys/sys/Attic/rlist.h,v 1.1.1.1 1993/03/21 09:45:37 cgd Exp $
+ * $Header: /cvsroot/src/sys/sys/Attic/rlist.h,v 1.2 1993/04/19 01:23:08 mycroft Exp $
  */
 
+#ifndef _SYS_RLIST_H_
+#define _SYS_RLIST_H_
+
 /* A resource list element. */
 struct rlist {
 	unsigned	rl_start;	/* boundaries of extent - inclusive */
@@ -32,3 +35,5 @@ extern rlist_destroy __P((struct rlist **));
 
 /* heads of lists */
 struct rlist *swapmap;
+
+#endif /* !_SYS_RLIST_H_ */
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index d446d93d2836..1bed15daaeab 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -33,8 +33,8 @@
  *	@(#)signalvar.h	7.1 (Berkeley) 5/9/91
  */
 
-#ifndef	_SIGNALVAR_H_		/* tmp for user.h */
-#define	_SIGNALVAR_H_
+#ifndef _SYS_SIGNALVAR_H_
+#define _SYS_SIGNALVAR_H_
 
 /*
  * Kernel signal definitions and data structures,
@@ -163,4 +163,5 @@ int	coredump __P((struct proc *p));
  */
 void	sendsig __P((sig_t action, int sig, int returnmask, unsigned code));
 #endif	/* KERNEL */
-#endif	/* !_SIGNALVAR_H_ */
+
+#endif /* !_SYS_SIGNALVAR_H_ */
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 58febae34dfa..ecc00a5f174c 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -33,6 +33,9 @@
  *	@(#)socket.h	7.13 (Berkeley) 4/20/91
  */
 
+#ifndef _SYS_SOCKET_H_
+#define _SYS_SOCKET_H_
+
 /*
  * Definitions related to sockets: types, address families, options.
  */
@@ -257,4 +260,6 @@ int	socket __P((int, int, int));
 int	socketpair __P((int, int, int, int *));
 __END_DECLS
 
-#endif	/* !KERNEL */
+#endif /* KERNEL */
+
+#endif /* !_SYS_SOCKET_H_ */
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index ca115a1d593c..444f6b7cb932 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -40,6 +40,9 @@
  * 11 Dec 92	Williams Jolitz		Fixed tty handling
  */
 
+#ifndef _SYS_SOCKETVAR_H_
+#define _SYS_SOCKETVAR_H_
+
 /*
  * Kernel structure per socket.
  * Contains send and receive buffer queues,
@@ -204,3 +207,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 /* !_SYS_SOCKETVAR_H_ */
diff --git a/sys/sys/specdev.h b/sys/sys/specdev.h
index 2012ca7ab774..6f4b6a6a8a0d 100644
--- a/sys/sys/specdev.h
+++ b/sys/sys/specdev.h
@@ -33,6 +33,9 @@
  *	@(#)specdev.h	7.4 (Berkeley) 4/19/91
  */
 
+#ifndef _SYS_SPECDEV_H_
+#define _SYS_SPECDEV_H_
+
 /*
  * This structure defines the information maintained about
  * special devices. It is allocated in checkalias and freed
@@ -218,3 +221,5 @@ int	spec_advlock __P((
 		int op,
 		struct flock *fl,
 		int flags));
+
+#endif /* !_SYS_SPECDEV_H_ */
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 976c704fc007..8eccc93197d3 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -5,6 +5,9 @@
  * created from	@(#)syscalls.master	7.26 (Berkeley) 3/25/91
  */
 
+#ifndef _SYS_SYSCALL_H_
+#define _SYS_SYSCALL_H_
+
 #define	SYS_exit	1
 #define	SYS_fork	2
 #define	SYS_read	3
@@ -166,3 +169,5 @@
 #define	SYS_setgid	181
 #define	SYS_setegid	182
 #define	SYS_seteuid	183
+
+#endif /* !_SYS_SYSCALL_H_ */
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 0eac7b93c0fe..a7303d0b91db 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -33,6 +33,9 @@
  *	@(#)syslimits.h	7.4 (Berkeley) 2/4/91
  */
 
+#ifndef _SYS_SYSLIMITS_H_
+#define _SYS_SYSLIMITS_H_
+
 #define	ARG_MAX		20480	/* 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 length in bytes of an input line */
 #define	RE_DUP_MAX	255	/* max repeated RE's using interval notation */
+
+#endif /* !_SYS_SYSLIMITS_H_ */
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index f5635da03b8a..d0c8c5fdfb80 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -33,6 +33,9 @@
  *	@(#)syslog.h	7.20 (Berkeley) 2/23/91
  */
 
+#ifndef _SYS_SYSLOG_H_
+#define _SYS_SYSLOG_H_
+
 #define	_PATH_LOG	"/dev/log"
 
 /*
@@ -176,3 +179,5 @@ void	vsyslog __P((int, const char *, va_list));
 __END_DECLS
 
 #endif /* !KERNEL */
+
+#endif /* !_SYS_SYSLOG_H_ */
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 063aa4b4b195..6d9f5eab7a63 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1 +1 @@
-revision 1.3 intentionally removed
+revision 1.4 intentionally removed
diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h
index 34347b6aff71..e00f00587d94 100644
--- a/sys/sys/tablet.h
+++ b/sys/sys/tablet.h
@@ -33,12 +33,13 @@
  *	@(#)tablet.h	7.5 (Berkeley) 2/15/91
  */
 
-#ifndef _TABLET_H_
-#define	_TABLET_H_
+#ifndef _SYS_TABLET_H_
+#define _SYS_TABLET_H_
 
 /*
  * Tablet line discipline.
  */
+
 /*
  * Reads on the tablet return one of the following structures, depending on
  * the underlying tablet type.  The first two are defined such that a read of
@@ -89,4 +90,4 @@ struct	polpos {
 #define BIOSTYPE	_IOW('b', 3, int)	/* set tablet type */
 #define BIOGTYPE	_IOR('b', 4, int)	/* get tablet type*/
 
-#endif /* !_TABLET_H_ */
+#endif /* !_SYS_TABLET_H_ */
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index 98ab1eaf9ab4..e6c4e84afef5 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -33,11 +33,12 @@
  *	@(#)termios.h	7.22 (Berkeley) 5/7/91
  */
 
+#ifndef _SYS_TERMIOS_H_
+#define _SYS_TERMIOS_H_
+
 /*
  *  termios structure
  */
-#ifndef _TERMIOS_H_
-#define _TERMIOS_H_
 
 /* 
  * Special Control Characters 
@@ -254,10 +255,7 @@ __END_DECLS
 
 #endif /* !KERNEL */
 
-/*
- * END OF PROTECTED INCLUDE.
- */
-#endif /* !_TERMIOS_H_ */
+#endif /* !_SYS_TERMIOS_H_ */
 
 #ifndef _POSIX_SOURCE
 #ifdef KERNEL
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/times.h b/sys/sys/times.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h
index 3bb8daddc9c8..577cecaecea7 100644
--- a/sys/sys/tprintf.h
+++ b/sys/sys/tprintf.h
@@ -33,9 +33,14 @@
  *	@(#)tprintf.h	7.2 (Berkeley) 5/4/91
  */
 
+#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 /* !_SYS_TPRINTF_H_ */
diff --git a/sys/sys/trace.h b/sys/sys/trace.h
index 573d3fb70caa..e2d278e0e3b7 100644
--- a/sys/sys/trace.h
+++ b/sys/sys/trace.h
@@ -33,6 +33,9 @@
  *	@(#)trace.h	7.6 (Berkeley) 5/5/91
  */
 
+#ifndef _SYS_TRACE_H_
+#define _SYS_TRACE_H_
+
 /*
  * File system buffer tracing points; all trace <pack(dev, size), bn>
  */
@@ -112,3 +115,5 @@ int	tracewhich;
 #define	trace(a,b,c)	;
 #endif
 #endif
+
+#endif /* !_SYS_TRACE_H_ */
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 16dc1f6467d4..063aa4b4b195 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -1 +1 @@
-revision 1.2 intentionally removed
+revision 1.3 intentionally removed
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 27bb20c43451..73aa276efcbb 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -33,13 +33,14 @@
  *	@(#)ttychars.h	7.6 (Berkeley) 5/9/91
  */
 
+#ifndef _SYS_TTYCHARS_H_
+#define _SYS_TTYCHARS_H_
+
 /*
  * 4.3 COMPATIBILITY FILE
  *
  * User visible structures and constants related to terminal handling.
  */
-#ifndef _TTYCHARS_H_
-#define	_TTYCHARS_H_
 
 struct ttychars {
 	char	tc_erase;	/* erase last character */
@@ -60,4 +61,5 @@ struct ttychars {
 #ifdef USE_OLD_TTY
 #include <sys/ttydefaults.h>	/* to pick up character defaults */
 #endif
-#endif /* !_TTYCHARS_H_ */
+
+#endif /* !_SYS_TTYCHARS_H_ */
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index 84b6d38fefbb..8a0d2861f3a8 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -33,10 +33,10 @@
  *	@(#)ttydev.h	7.8 (Berkeley) 5/9/91
  */
 
-/* COMPATABILITY HEADER FILE */
+#ifndef _SYS_TTYDEV_H_
+#define _SYS_TTYDEV_H_
 
-#ifndef _TTYDEV_H_
-#define	_TTYDEV_H_
+/* COMPATABILITY HEADER FILE */
 
 #ifdef USE_OLD_TTY
 #define B0	0
@@ -57,4 +57,4 @@
 #define EXTB	15
 #endif /* USE_OLD_TTY */
 
-#endif /* !_TTYDEV_H_ */
+#endif /* !_SYS_TTYDEV_H_ */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 2ecd4e9c15b1..16dc1f6467d4 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -1 +1 @@
-revision 1.1.1.1 intentionally removed
+revision 1.2 intentionally removed
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index 3e9950530008..9bc28151d297 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -33,8 +33,8 @@
  *	@(#)ucred.h	7.5 (Berkeley) 2/5/91
  */
 
-#ifndef _UCRED_H_
-#define	_UCRED_H_
+#ifndef _SYS_UCRED_H_
+#define _SYS_UCRED_H_
 
 /*
  * Credentials.
@@ -55,4 +55,4 @@ struct ucred *crcopy();
 struct ucred *crdup();
 #endif KERNEL
 
-#endif /* !_UCRED_H_ */
+#endif /* !_SYS_UCRED_H_ */
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index 30d315e6ed6c..961fc0983eb4 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -33,8 +33,8 @@
  *	@(#)uio.h	7.8 (Berkeley) 4/15/91
  */
 
-#ifndef _UIO_H_
-#define	_UIO_H_
+#ifndef _SYS_UIO_H_
+#define _SYS_UIO_H_
 
 struct iovec {
 	caddr_t	iov_base;
@@ -79,4 +79,4 @@ __END_DECLS
 
 #endif	/* !KERNEL */
 
-#endif /* !_UIO_H_ */
+#endif /* !_SYS_UIO_H_ */
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 445878185e8b..af7cf9e108f6 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -33,6 +33,9 @@
  *	@(#)un.h	7.7 (Berkeley) 6/28/90
  */
 
+#ifndef _SYS_UN_H_
+#define _SYS_UN_H_
+
 /*
  * Definitions for UNIX IPC domain.
  */
@@ -50,3 +53,5 @@ int	unp_discard();
 #define SUN_LEN(su) \
 	(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
 #endif
+
+#endif /* !_SYS_UN_H_ */
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 4d3460af16c2..e9ee73861013 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -34,7 +34,7 @@
  */
 
 #ifndef _SYS_UNISTD_H_
-#define	_SYS_UNISTD_H_
+#define _SYS_UNISTD_H_
 
 /* compile-time symbolic constants */
 #define	_POSIX_JOB_CONTROL	/* implementation supports job control */
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index f7014fff612c..98b76e3bad5e 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -33,6 +33,9 @@
  *	@(#)unpcb.h	7.6 (Berkeley) 6/28/90
  */
 
+#ifndef _SYS_UNPCB_H_
+#define _SYS_UNPCB_H_
+
 /*
  * Protocol control block for an active
  * instance of a UNIX internal protocol.
@@ -71,3 +74,5 @@ struct	unpcb {
 };
 
 #define	sotounpcb(so)	((struct unpcb *)((so)->so_pcb))
+
+#endif /* !_SYS_UNPCB_H_ */
diff --git a/sys/sys/user.h b/sys/sys/user.h
index b175752e0aa3..7c4f8fde0b7f 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -33,6 +33,9 @@
  *	@(#)user.h	7.19 (Berkeley) 5/4/91
  */
 
+#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 */
@@ -88,3 +91,5 @@ struct	user {
 #define	u_sig	U_sig
 #define	u_code	U_code
 #endif /* KERNEL */
+
+#endif /* !_SYS_USER_H_ */
diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h
index 71ae7856f0c0..3e134ae47719 100644
--- a/sys/sys/vadvise.h
+++ b/sys/sys/vadvise.h
@@ -33,6 +33,9 @@
  *	@(#)vadvise.h	7.2 (Berkeley) 5/5/91
  */
 
+#ifndef _SYS_VADVISE_H_
+#define _SYS_VADVISE_H_
+
 /*
  * Parameters to vadvise() to tell system of particular paging
  * behaviour:
@@ -47,3 +50,5 @@
 #define	VA_ANOM		1
 #define	VA_SEQL		2
 #define	VA_FLUSH 	3
+
+#endif /* !_SYS_VADVISE_H_ */
diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h
index 8057499c1d76..640e8ca9f424 100644
--- a/sys/sys/vcmd.h
+++ b/sys/sys/vcmd.h
@@ -33,6 +33,9 @@
  *	@(#)vcmd.h	7.4 (Berkeley) 5/5/91
  */
 
+#ifndef _SYS_VCMD_H_
+#define _SYS_VCMD_H_
+
 #include <sys/ioctl.h>
 
 #define	VPRINT		0100
@@ -41,3 +44,5 @@
 
 #define	VGETSTATE	_IOR('v', 0, int)
 #define	VSETSTATE	_IOW('v', 1, int)
+
+#endif /* !_SYS_VCMD_H_ */
diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h
index 1306818535ec..1e2bbecaa278 100644
--- a/sys/sys/vlimit.h
+++ b/sys/sys/vlimit.h
@@ -33,6 +33,9 @@
  *	@(#)vlimit.h	7.2 (Berkeley) 5/5/91
  */
 
+#ifndef _SYS_VLIMIT_H_
+#define _SYS_VLIMIT_H_
+
 /*
  * Limits for u.u_limit[i], per process, inherited.
  */
@@ -47,3 +50,5 @@
 #define	NLIMITS		6
 
 #define	INFINITY	0x7fffffff
+
+#endif /* !_SYS_VLIMIT_H_ */
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 99cd4ebc7c3b..fe66e19a784c 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -33,6 +33,9 @@
  *	@(#)vmmeter.h	7.3 (Berkeley) 5/5/91
  */
 
+#ifndef _SYS_VMMETER_H_
+#define _SYS_VMMETER_H_
+
 /*
  * Virtual memory related instrumentation
  */
@@ -139,3 +142,5 @@ int	rres;
 unsigned rectime;		/* accumulator for reclaim times */
 unsigned pgintime;		/* accumulator for page in times */
 #endif
+
+#endif /* !_SYS_VMMETER_H_ */
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 5a0eac10368b..7c424d05247c 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -33,6 +33,9 @@
  *	@(#)vnode.h	7.39 (Berkeley) 6/27/91
  */
 
+#ifndef _SYS_VNODE_H_
+#define _SYS_VNODE_H_
+
 #ifndef KERNEL
 #include <machine/endian.h>
 #endif
@@ -331,3 +334,5 @@ extern	struct vnode *rootdir;		/* root (i.e. "/") vnode */
 extern	long desiredvnodes;		/* number of vnodes desired */
 extern	struct vattr va_null;		/* predefined null vattr structure */
 #endif
+
+#endif /* !_SYS_VNODE_H_ */
diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h
index e9a78a1c3509..cde18a5cc5c6 100644
--- a/sys/sys/vsio.h
+++ b/sys/sys/vsio.h
@@ -33,6 +33,9 @@
  *	@(#)vsio.h	7.4 (Berkeley) 5/9/91
  */
 
+#ifndef _SYS_VSIO_H_
+#define _SYS_VSIO_H_
+
  /****************************************************************************
  *									    *
  *  Copyright (c) 1983, 1984 by						    *
@@ -151,3 +154,5 @@ typedef struct _vsIoAddr {
 	vsBox	 mbox;			/* atomic read/write */
 } vsIoAddr;
 typedef vsIoAddr *vsIoAddrAddr;
+
+#endif /* !_SYS_VSIO_H_ */
diff --git a/sys/sys/vtimes.h b/sys/sys/vtimes.h
index a614568a4355..4e1585192490 100644
--- a/sys/sys/vtimes.h
+++ b/sys/sys/vtimes.h
@@ -33,6 +33,9 @@
  *	@(#)vtimes.h	7.2 (Berkeley) 5/5/91
  */
 
+#ifndef _SYS_VTIMES_H_
+#define _SYS_VTIMES_H_
+
 /*
  * Structure returned by vtimes() and in vwait().
  * In vtimes() two of these are returned, one for the process itself
@@ -52,3 +55,5 @@ struct vtimes {
 	int	vm_inblk;		/* block reads */
 	int	vm_oublk;		/* block writes */
 };
+
+#endif /* !_SYS_VTIMES_H_ */
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index de3a50d6f6fa..4c6226d2ca2e 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -33,6 +33,9 @@
  *	@(#)wait.h	7.17 (Berkeley) 6/19/91
  */
 
+#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).
@@ -156,3 +159,5 @@ pid_t	wait4 __P((pid_t, int *, int, struct rusage *));
 #endif
 __END_DECLS
 #endif
+
+#endif /* !_SYS_WAIT_H_ */