From 943685687a914f34bb028d07fefeff4a802b6d5b Mon Sep 17 00:00:00 2001
From: Jim Bloom <bloom@ucbvax.Berkeley.EDU>
Date: Thu, 30 Aug 1984 03:30:44 -0800
Subject: [PATCH] Change to includes.  no more ../h

SCCS-vsn: sys/kern/init_main.c 6.6
SCCS-vsn: sys/kern/kern_acct.c 6.5
SCCS-vsn: sys/kern/kern_clock.c 6.9
SCCS-vsn: sys/kern/kern_descrip.c 6.5
SCCS-vsn: sys/kern/kern_exec.c 6.7
SCCS-vsn: sys/kern/kern_exit.c 6.4
SCCS-vsn: sys/kern/kern_fork.c 6.5
SCCS-vsn: sys/kern/kern_proc.c 6.4
SCCS-vsn: sys/kern/kern_prot.c 6.2
SCCS-vsn: sys/kern/kern_resource.c 6.3
SCCS-vsn: sys/kern/kern_sig.c 6.6
SCCS-vsn: sys/kern/kern_subr.c 6.3
SCCS-vsn: sys/kern/kern_synch.c 6.4
SCCS-vsn: sys/kern/kern_time.c 6.3
SCCS-vsn: sys/kern/kern_xxx.c 6.2
SCCS-vsn: sys/kern/subr_log.c 6.3
SCCS-vsn: sys/kern/subr_prof.c 6.4
SCCS-vsn: sys/kern/subr_prf.c 6.3
SCCS-vsn: sys/kern/subr_rmap.c 6.2
SCCS-vsn: sys/kern/subr_rmap.c.sav 6.2
SCCS-vsn: sys/kern/subr_xxx.c 6.5
SCCS-vsn: sys/kern/sys_generic.c 6.4
SCCS-vsn: sys/kern/sys_process.c 6.2
SCCS-vsn: sys/kern/sys_socket.c 6.3
SCCS-vsn: sys/kern/tty.c 6.10
SCCS-vsn: sys/kern/tty_bk.c 6.2
SCCS-vsn: sys/kern/tty_conf.c 6.3
SCCS-vsn: sys/kern/tty_pty.c 6.6
SCCS-vsn: sys/kern/tty_subr.c 6.3
SCCS-vsn: sys/kern/tty_tb.c 6.3
SCCS-vsn: sys/kern/tty_tty.c 6.2
SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 6.5
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 6.5
SCCS-vsn: sys/kern/vfs_bio.c 6.4
SCCS-vsn: sys/kern/vfs_cluster.c 6.4
SCCS-vsn: sys/ufs/ffs/ffs_balloc.c 6.2
SCCS-vsn: sys/ufs/lfs/lfs_balloc.c 6.2
SCCS-vsn: sys/ufs/ffs/ufs_disksubr.c 6.2
SCCS-vsn: sys/ufs/ufs/ufs_disksubr.c 6.2
SCCS-vsn: sys/kern/vfs_vnops.c 6.3
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 6.11
SCCS-vsn: sys/ufs/ffs/ufs_inode.c 6.11
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 6.11
SCCS-vsn: sys/ufs/ufs/ufs_inode.c 6.11
SCCS-vsn: sys/ufs/ffs/ffs_vfsops.c 6.8
SCCS-vsn: sys/ufs/ffs/ufs_vfsops.c 6.8
SCCS-vsn: sys/ufs/lfs/lfs_vfsops.c 6.8
SCCS-vsn: sys/ufs/ufs/ufs_vfsops.c 6.8
SCCS-vsn: sys/kern/vfs_lookup.c 6.15
SCCS-vsn: sys/ufs/ffs/ufs_lookup.c 6.15
SCCS-vsn: sys/ufs/ufs/ufs_lookup.c 6.15
SCCS-vsn: sys/ufs/ffs/ffs_subr.c 6.5
SCCS-vsn: sys/kern/vfs_syscalls.c 6.14
SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 6.14
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 6.14
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 6.14
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 6.14
SCCS-vsn: sys/ufs/ffs/ffs_tables.c 6.2
SCCS-vsn: sys/kern/vfs_xxx.c 6.3
SCCS-vsn: sys/kern/uipc_domain.c 6.3
SCCS-vsn: sys/kern/uipc_mbuf.c 6.3
SCCS-vsn: sys/kern/uipc_pipe.c 6.2
SCCS-vsn: sys/kern/uipc_proto.c 6.3
SCCS-vsn: sys/kern/uipc_socket.c 6.7
SCCS-vsn: sys/kern/uipc_socket2.c 6.4
SCCS-vsn: sys/kern/uipc_syscalls.c 6.4
SCCS-vsn: sys/kern/uipc_usrreq.c 6.10
SCCS-vsn: sys/vm/vm_meter.c 6.3
SCCS-vsn: sys/vm/vm_swap.c 6.3
SCCS-vsn: sys/kern/kern_physio.c 6.3
---
 usr/src/sys/kern/init_main.c       | 40 +++++++++++++++---------------
 usr/src/sys/kern/kern_acct.c       | 20 +++++++--------
 usr/src/sys/kern/kern_clock.c      | 24 +++++++++---------
 usr/src/sys/kern/kern_descrip.c    | 34 ++++++++++++-------------
 usr/src/sys/kern/kern_exec.c       | 34 ++++++++++++-------------
 usr/src/sys/kern/kern_exit.c       | 28 ++++++++++-----------
 usr/src/sys/kern/kern_fork.c       | 30 +++++++++++-----------
 usr/src/sys/kern/kern_physio.c     | 26 +++++++++----------
 usr/src/sys/kern/kern_proc.c       | 38 ++++++++++++++--------------
 usr/src/sys/kern/kern_prot.c       | 30 +++++++++++-----------
 usr/src/sys/kern/kern_resource.c   | 26 +++++++++----------
 usr/src/sys/kern/kern_sig.c        | 36 +++++++++++++--------------
 usr/src/sys/kern/kern_subr.c       | 12 ++++-----
 usr/src/sys/kern/kern_synch.c      | 22 ++++++++--------
 usr/src/sys/kern/kern_time.c       | 14 +++++------
 usr/src/sys/kern/kern_xxx.c        | 18 +++++++-------
 usr/src/sys/kern/subr_log.c        | 18 +++++++-------
 usr/src/sys/kern/subr_prf.c        | 26 +++++++++----------
 usr/src/sys/kern/subr_prof.c       |  8 +++---
 usr/src/sys/kern/subr_rmap.c       | 18 +++++++-------
 usr/src/sys/kern/subr_rmap.c.sav   | 18 +++++++-------
 usr/src/sys/kern/subr_xxx.c        | 26 +++++++++----------
 usr/src/sys/kern/sys_generic.c     | 24 +++++++++---------
 usr/src/sys/kern/sys_process.c     | 24 +++++++++---------
 usr/src/sys/kern/sys_socket.c      | 28 ++++++++++-----------
 usr/src/sys/kern/tty.c             | 30 +++++++++++-----------
 usr/src/sys/kern/tty_bk.c          | 26 +++++++++----------
 usr/src/sys/kern/tty_conf.c        | 12 ++++-----
 usr/src/sys/kern/tty_pty.c         | 24 +++++++++---------
 usr/src/sys/kern/tty_subr.c        | 16 ++++++------
 usr/src/sys/kern/tty_tb.c          | 26 +++++++++----------
 usr/src/sys/kern/tty_tty.c         | 20 +++++++--------
 usr/src/sys/kern/uipc_domain.c     | 14 +++++------
 usr/src/sys/kern/uipc_mbuf.c       | 20 +++++++--------
 usr/src/sys/kern/uipc_pipe.c       | 14 +++++------
 usr/src/sys/kern/uipc_proto.c      | 12 ++++-----
 usr/src/sys/kern/uipc_socket.c     | 38 ++++++++++++++--------------
 usr/src/sys/kern/uipc_socket2.c    | 28 ++++++++++-----------
 usr/src/sys/kern/uipc_syscalls.c   | 30 +++++++++++-----------
 usr/src/sys/kern/uipc_usrreq.c     | 30 +++++++++++-----------
 usr/src/sys/kern/vfs_bio.c         | 22 ++++++++--------
 usr/src/sys/kern/vfs_cluster.c     | 22 ++++++++--------
 usr/src/sys/kern/vfs_lookup.c      | 26 +++++++++----------
 usr/src/sys/kern/vfs_syscalls.c    | 36 +++++++++++++--------------
 usr/src/sys/kern/vfs_vnops.c       | 28 ++++++++++-----------
 usr/src/sys/kern/vfs_xxx.c         | 24 +++++++++---------
 usr/src/sys/ufs/ffs/ffs_alloc.c    | 24 +++++++++---------
 usr/src/sys/ufs/ffs/ffs_balloc.c   | 20 +++++++--------
 usr/src/sys/ufs/ffs/ffs_inode.c    | 26 +++++++++----------
 usr/src/sys/ufs/ffs/ffs_subr.c     | 24 +++++++++---------
 usr/src/sys/ufs/ffs/ffs_tables.c   |  4 +--
 usr/src/sys/ufs/ffs/ffs_vfsops.c   | 24 +++++++++---------
 usr/src/sys/ufs/ffs/ffs_vnops.c    | 36 +++++++++++++--------------
 usr/src/sys/ufs/ffs/ufs_disksubr.c |  8 +++---
 usr/src/sys/ufs/ffs/ufs_inode.c    | 26 +++++++++----------
 usr/src/sys/ufs/ffs/ufs_lookup.c   | 26 +++++++++----------
 usr/src/sys/ufs/ffs/ufs_vfsops.c   | 24 +++++++++---------
 usr/src/sys/ufs/ffs/ufs_vnops.c    | 36 +++++++++++++--------------
 usr/src/sys/ufs/lfs/lfs_alloc.c    | 24 +++++++++---------
 usr/src/sys/ufs/lfs/lfs_balloc.c   | 20 +++++++--------
 usr/src/sys/ufs/lfs/lfs_inode.c    | 26 +++++++++----------
 usr/src/sys/ufs/lfs/lfs_vfsops.c   | 24 +++++++++---------
 usr/src/sys/ufs/lfs/lfs_vnops.c    | 36 +++++++++++++--------------
 usr/src/sys/ufs/ufs/ufs_disksubr.c |  8 +++---
 usr/src/sys/ufs/ufs/ufs_inode.c    | 26 +++++++++----------
 usr/src/sys/ufs/ufs/ufs_lookup.c   | 26 +++++++++----------
 usr/src/sys/ufs/ufs/ufs_vfsops.c   | 24 +++++++++---------
 usr/src/sys/ufs/ufs/ufs_vnops.c    | 36 +++++++++++++--------------
 usr/src/sys/vm/vm_meter.c          | 24 +++++++++---------
 usr/src/sys/vm/vm_swap.c           | 22 ++++++++--------
 70 files changed, 847 insertions(+), 847 deletions(-)

diff --git a/usr/src/sys/kern/init_main.c b/usr/src/sys/kern/init_main.c
index 0a150fb8af..b1930bc97c 100644
--- a/usr/src/sys/kern/init_main.c
+++ b/usr/src/sys/kern/init_main.c
@@ -1,28 +1,28 @@
-/*	init_main.c	6.5	84/08/01	*/
+/*	init_main.c	6.6	84/08/29	*/
 
 #include "../machine/pte.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/fs.h"
-#include "../h/mount.h"
-#include "../h/map.h"
-#include "../h/proc.h"
-#include "../h/inode.h"
-#include "../h/seg.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/vm.h"
-#include "../h/cmap.h"
-#include "../h/text.h"
-#include "../h/clist.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "fs.h"
+#include "mount.h"
+#include "map.h"
+#include "proc.h"
+#include "inode.h"
+#include "seg.h"
+#include "conf.h"
+#include "buf.h"
+#include "vm.h"
+#include "cmap.h"
+#include "text.h"
+#include "clist.h"
 #ifdef INET
-#include "../h/protosw.h"
+#include "protosw.h"
 #endif
-#include "../h/quota.h"
+#include "quota.h"
 #include "../machine/reg.h"
 #include "../machine/cpu.h"
 
diff --git a/usr/src/sys/kern/kern_acct.c b/usr/src/sys/kern/kern_acct.c
index b8e5172502..66d0db0884 100644
--- a/usr/src/sys/kern/kern_acct.c
+++ b/usr/src/sys/kern/kern_acct.c
@@ -1,14 +1,14 @@
-/*	kern_acct.c	6.4	84/07/15	*/
+/*	kern_acct.c	6.5	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/kernel.h"
-#include "../h/acct.h"
-#include "../h/uio.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "fs.h"
+#include "kernel.h"
+#include "acct.h"
+#include "uio.h"
 
 /*
  * SHOULD REPLACE THIS WITH A DRIVER THAT CAN BE READ TO SIMPLIFY.
diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c
index 5e7871c016..2b5b4f0945 100644
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -1,25 +1,25 @@
-/*	kern_clock.c	6.8	84/08/22	*/
+/*	kern_clock.c	6.9	84/08/29	*/
 
 #include "../machine/reg.h"
 #include "../machine/psl.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dk.h"
-#include "../h/callout.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/proc.h"
-#include "../h/vm.h"
-#include "../h/text.h"
+#include "param.h"
+#include "systm.h"
+#include "dk.h"
+#include "callout.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "proc.h"
+#include "vm.h"
+#include "text.h"
 
 #ifdef vax
 #include "../vax/mtpr.h"
 #endif
 
 #ifdef GPROF
-#include "../h/gprof.h"
+#include "gprof.h"
 #endif
 
 #define ADJTIME		/* For now... */
diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c
index d4d1dedbdf..39b991f033 100644
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -1,20 +1,20 @@
-/*	kern_descrip.c	6.4	84/08/22	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/conf.h"
-#include "../h/file.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/mount.h"
-#include "../h/stat.h"
-
-#include "../h/ioctl.h"
+/*	kern_descrip.c	6.5	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "inode.h"
+#include "proc.h"
+#include "conf.h"
+#include "file.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "mount.h"
+#include "stat.h"
+
+#include "ioctl.h"
 
 /*
  * Descriptor management.
diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index 6032599dc8..6d07d5d4bf 100644
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -1,25 +1,25 @@
-/*	kern_exec.c	6.6	84/07/29	*/
+/*	kern_exec.c	6.7	84/08/29	*/
 
 #include "../machine/reg.h"
 #include "../machine/pte.h"
 #include "../machine/psl.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/proc.h"
-#include "../h/buf.h"
-#include "../h/inode.h"
-#include "../h/seg.h"
-#include "../h/vm.h"
-#include "../h/text.h"
-#include "../h/file.h"
-#include "../h/uio.h"
-#include "../h/acct.h"
-#include "../h/exec.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "proc.h"
+#include "buf.h"
+#include "inode.h"
+#include "seg.h"
+#include "vm.h"
+#include "text.h"
+#include "file.h"
+#include "uio.h"
+#include "acct.h"
+#include "exec.h"
 
 #ifdef vax
 #include "../vax/mtpr.h"
diff --git a/usr/src/sys/kern/kern_exit.c b/usr/src/sys/kern/kern_exit.c
index d82929d670..375ce2db25 100644
--- a/usr/src/sys/kern/kern_exit.c
+++ b/usr/src/sys/kern/kern_exit.c
@@ -1,21 +1,21 @@
-/*	kern_exit.c	6.3	84/06/10	*/
+/*	kern_exit.c	6.4	84/08/29	*/
 
 #include "../machine/reg.h"
 #include "../machine/psl.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/proc.h"
-#include "../h/buf.h"
-#include "../h/wait.h"
-#include "../h/vm.h"
-#include "../h/file.h"
-#include "../h/mbuf.h"
-#include "../h/inode.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "proc.h"
+#include "buf.h"
+#include "wait.h"
+#include "vm.h"
+#include "file.h"
+#include "mbuf.h"
+#include "inode.h"
 
 /*
  * Exit system call: pass back caller's arg
diff --git a/usr/src/sys/kern/kern_fork.c b/usr/src/sys/kern/kern_fork.c
index 6e2abc414b..d32f74fb81 100644
--- a/usr/src/sys/kern/kern_fork.c
+++ b/usr/src/sys/kern/kern_fork.c
@@ -1,23 +1,23 @@
-/*	kern_fork.c	6.4	84/07/14	*/
+/*	kern_fork.c	6.5	84/08/29	*/
 
 #include "../machine/reg.h"
 #include "../machine/pte.h"
 #include "../machine/psl.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/proc.h"
-#include "../h/inode.h"
-#include "../h/seg.h"
-#include "../h/vm.h"
-#include "../h/text.h"
-#include "../h/file.h"
-#include "../h/acct.h"
-#include "../h/quota.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "proc.h"
+#include "inode.h"
+#include "seg.h"
+#include "vm.h"
+#include "text.h"
+#include "file.h"
+#include "acct.h"
+#include "quota.h"
 
 /*
  * fork system call.
diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index daf720857b..8e0cab3c91 100644
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -1,19 +1,19 @@
-/*	kern_physio.c	6.2	83/09/09	*/
+/*	kern_physio.c	6.3	84/08/29	*/
 
 #include "../machine/pte.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/proc.h"
-#include "../h/seg.h"
-#include "../h/vm.h"
-#include "../h/trace.h"
-#include "../h/map.h"
-#include "../h/uio.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "conf.h"
+#include "proc.h"
+#include "seg.h"
+#include "vm.h"
+#include "trace.h"
+#include "map.h"
+#include "uio.h"
 
 /*
  * Swap IO headers -
diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index c7a14a2e06..704407a902 100644
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,27 +1,27 @@
-/*	kern_proc.c	6.3	84/07/08	*/
+/*	kern_proc.c	6.4	84/08/29	*/
 
 #include "../machine/reg.h"
 #include "../machine/pte.h"
 #include "../machine/psl.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/proc.h"
-#include "../h/buf.h"
-#include "../h/inode.h"
-#include "../h/seg.h"
-#include "../h/acct.h"
-#include "../h/wait.h"
-#include "../h/vm.h"
-#include "../h/text.h"
-#include "../h/file.h"
-#include "../h/quota.h"
-#include "../h/uio.h"
-#include "../h/mbuf.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "proc.h"
+#include "buf.h"
+#include "inode.h"
+#include "seg.h"
+#include "acct.h"
+#include "wait.h"
+#include "vm.h"
+#include "text.h"
+#include "file.h"
+#include "quota.h"
+#include "uio.h"
+#include "mbuf.h"
 
 spgrp(top, npgrp)
 	register struct proc *top;
diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c
index 3f48b53666..70e6024709 100644
--- a/usr/src/sys/kern/kern_prot.c
+++ b/usr/src/sys/kern/kern_prot.c
@@ -1,4 +1,4 @@
-/*	kern_prot.c	6.1	83/07/29	*/
+/*	kern_prot.c	6.2	84/08/29	*/
 
 /*
  * System calls related to processes and protection
@@ -6,20 +6,20 @@
 
 #include "../machine/reg.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/timeb.h"
-#include "../h/times.h"
-#include "../h/reboot.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/mount.h"
-#include "../h/quota.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "proc.h"
+#include "timeb.h"
+#include "times.h"
+#include "reboot.h"
+#include "fs.h"
+#include "conf.h"
+#include "buf.h"
+#include "mount.h"
+#include "quota.h"
 
 getpid()
 {
diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index 42a4ad8c2b..734fc138ce 100644
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -1,16 +1,16 @@
-/*	kern_resource.c	6.2	84/05/22	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/seg.h"
-#include "../h/fs.h"
-#include "../h/uio.h"
-#include "../h/vm.h"
-#include "../h/kernel.h"
+/*	kern_resource.c	6.3	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "proc.h"
+#include "seg.h"
+#include "fs.h"
+#include "uio.h"
+#include "vm.h"
+#include "kernel.h"
 
 /*
  * Resource controls and accounting.
diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index b3b5cec680..2c4fddd675 100644
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -1,26 +1,26 @@
-/*	kern_sig.c	6.5	84/08/24	*/
+/*	kern_sig.c	6.6	84/08/29	*/
 
 #include "../machine/reg.h"
 #include "../machine/pte.h"
 #include "../machine/psl.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/timeb.h"
-#include "../h/times.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/mount.h"
-#include "../h/text.h"
-#include "../h/seg.h"
-#include "../h/vm.h"
-#include "../h/acct.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "proc.h"
+#include "timeb.h"
+#include "times.h"
+#include "conf.h"
+#include "buf.h"
+#include "mount.h"
+#include "text.h"
+#include "seg.h"
+#include "vm.h"
+#include "acct.h"
+#include "uio.h"
+#include "kernel.h"
 
 #define	mask(s)	(1 << ((s)-1))
 #define	cantmask	(mask(SIGKILL)|mask(SIGCONT)|mask(SIGSTOP))
diff --git a/usr/src/sys/kern/kern_subr.c b/usr/src/sys/kern/kern_subr.c
index 2ed3f3279e..c42582bbfa 100644
--- a/usr/src/sys/kern/kern_subr.c
+++ b/usr/src/sys/kern/kern_subr.c
@@ -1,10 +1,10 @@
-/*	kern_subr.c	6.2	84/07/08	*/
+/*	kern_subr.c	6.3	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/uio.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "uio.h"
 
 uiomove(cp, n, rw, uio)
 	register caddr_t cp;
diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c
index 9ff8a7a349..d13afe2f8d 100644
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -1,17 +1,17 @@
-/*	kern_synch.c	6.3	84/07/31	*/
+/*	kern_synch.c	6.4	84/08/29	*/
 
 #include "../machine/pte.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/file.h"
-#include "../h/inode.h"
-#include "../h/vm.h"
-#include "../h/kernel.h"
-#include "../h/buf.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "file.h"
+#include "inode.h"
+#include "vm.h"
+#include "kernel.h"
+#include "buf.h"
 
 #ifdef vax
 #include "../vax/mtpr.h"	/* XXX */
diff --git a/usr/src/sys/kern/kern_time.c b/usr/src/sys/kern/kern_time.c
index 9f427ca56f..086a1cecc5 100644
--- a/usr/src/sys/kern/kern_time.c
+++ b/usr/src/sys/kern/kern_time.c
@@ -1,13 +1,13 @@
-/*	kern_time.c	6.2	84/06/06	*/
+/*	kern_time.c	6.3	84/08/29	*/
 
 #include "../machine/reg.h"
 
-#include "../h/param.h"
-#include "../h/dir.h"		/* XXX */
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
+#include "param.h"
+#include "dir.h"		/* XXX */
+#include "user.h"
+#include "kernel.h"
+#include "inode.h"
+#include "proc.h"
 
 /* 
  * Time of day and interval timer support.
diff --git a/usr/src/sys/kern/kern_xxx.c b/usr/src/sys/kern/kern_xxx.c
index ee6fd32ccc..d39feb3b97 100644
--- a/usr/src/sys/kern/kern_xxx.c
+++ b/usr/src/sys/kern/kern_xxx.c
@@ -1,12 +1,12 @@
-/*	kern_xxx.c	6.1	83/07/29	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/proc.h"
-#include "../h/reboot.h"
+/*	kern_xxx.c	6.2	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "proc.h"
+#include "reboot.h"
 
 gethostid()
 {
diff --git a/usr/src/sys/kern/subr_log.c b/usr/src/sys/kern/subr_log.c
index 436f81f915..8c97f9cd2f 100644
--- a/usr/src/sys/kern/subr_log.c
+++ b/usr/src/sys/kern/subr_log.c
@@ -1,17 +1,17 @@
-/*	subr_log.c	6.2	84/07/17	*/
+/*	subr_log.c	6.3	84/08/29	*/
 
 /*
  * Error log buffer for kernel printf's.
  */
 
-#include "../h/param.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/ioctl.h"
-#include "../h/msgbuf.h"
-#include "../h/file.h"
-#include "../h/errno.h"
+#include "param.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "ioctl.h"
+#include "msgbuf.h"
+#include "file.h"
+#include "errno.h"
 
 #define LOG_RDPRI	(PZERO + 1)
 
diff --git a/usr/src/sys/kern/subr_prf.c b/usr/src/sys/kern/subr_prf.c
index 4cec58cd0a..8a6211b01e 100644
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -1,17 +1,17 @@
-/*	subr_prf.c	6.2	84/07/17	*/
+/*	subr_prf.c	6.3	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/seg.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/reboot.h"
-#include "../h/vm.h"
-#include "../h/msgbuf.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/tty.h"
+#include "param.h"
+#include "systm.h"
+#include "seg.h"
+#include "buf.h"
+#include "conf.h"
+#include "reboot.h"
+#include "vm.h"
+#include "msgbuf.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "tty.h"
 
 #ifdef vax
 #include "../vax/mtpr.h"
diff --git a/usr/src/sys/kern/subr_prof.c b/usr/src/sys/kern/subr_prof.c
index ea965de269..9fda33cd70 100644
--- a/usr/src/sys/kern/subr_prof.c
+++ b/usr/src/sys/kern/subr_prof.c
@@ -1,11 +1,11 @@
-/*	subr_prof.c	6.3	84/08/12	*/
+/*	subr_prof.c	6.4	84/08/29	*/
 
 /* last integrated from: gmon.c	4.10 (Berkeley) 1/14/83 */
 
 #ifdef GPROF
-#include "../h/gprof.h"
-#include "../h/param.h"
-#include "../h/systm.h"
+#include "gprof.h"
+#include "param.h"
+#include "systm.h"
 
 /*
  * Froms is actually a bunch of unsigned shorts indexing tos
diff --git a/usr/src/sys/kern/subr_rmap.c b/usr/src/sys/kern/subr_rmap.c
index fa1e532406..6ff91985c0 100644
--- a/usr/src/sys/kern/subr_rmap.c
+++ b/usr/src/sys/kern/subr_rmap.c
@@ -1,13 +1,13 @@
-/*	subr_rmap.c	6.1	83/07/29	*/
+/*	subr_rmap.c	6.2	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/text.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "text.h"
+#include "kernel.h"
 
 /*
  * Resource map handling routines.
diff --git a/usr/src/sys/kern/subr_rmap.c.sav b/usr/src/sys/kern/subr_rmap.c.sav
index 03f322c3ee..1d131b054a 100644
--- a/usr/src/sys/kern/subr_rmap.c.sav
+++ b/usr/src/sys/kern/subr_rmap.c.sav
@@ -1,13 +1,13 @@
-/*	subr_rmap.c.sav	6.1	83/07/29	*/
+/*	subr_rmap.c.sav	6.2	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/text.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "text.h"
+#include "kernel.h"
 
 /*
  * Resource map handling routines.
diff --git a/usr/src/sys/kern/subr_xxx.c b/usr/src/sys/kern/subr_xxx.c
index afadb73ccc..3593d11430 100644
--- a/usr/src/sys/kern/subr_xxx.c
+++ b/usr/src/sys/kern/subr_xxx.c
@@ -1,19 +1,19 @@
-/*	subr_xxx.c	6.4	84/08/22	*/
+/*	subr_xxx.c	6.5	84/08/29	*/
 
 #include "../machine/pte.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/conf.h"
-#include "../h/inode.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/fs.h"
-#include "../h/vm.h"
-#include "../h/cmap.h"
-#include "../h/uio.h"
+#include "param.h"
+#include "systm.h"
+#include "conf.h"
+#include "inode.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "proc.h"
+#include "fs.h"
+#include "vm.h"
+#include "cmap.h"
+#include "uio.h"
 
 /*
  * Routine placed in illegal entries in the bdevsw and cdevsw tables.
diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index b63109d517..043e8dd7d2 100644
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -1,15 +1,15 @@
-/*	sys_generic.c	6.3	84/08/22	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/ioctl.h"
-#include "../h/file.h"
-#include "../h/proc.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
-#include "../h/stat.h"
+/*	sys_generic.c	6.4	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "ioctl.h"
+#include "file.h"
+#include "proc.h"
+#include "uio.h"
+#include "kernel.h"
+#include "stat.h"
 
 /*
  * Read system call.
diff --git a/usr/src/sys/kern/sys_process.c b/usr/src/sys/kern/sys_process.c
index 6b65692a83..45fe2b3353 100644
--- a/usr/src/sys/kern/sys_process.c
+++ b/usr/src/sys/kern/sys_process.c
@@ -1,20 +1,20 @@
-/*	sys_process.c	6.1	83/07/29	*/
+/*	sys_process.c	6.2	84/08/29	*/
 
 #include "../machine/reg.h"
 #include "../machine/psl.h"
 #include "../machine/pte.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/inode.h"
-#include "../h/text.h"
-#include "../h/seg.h"
-#include "../h/vm.h"
-#include "../h/buf.h"
-#include "../h/acct.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "inode.h"
+#include "text.h"
+#include "seg.h"
+#include "vm.h"
+#include "buf.h"
+#include "acct.h"
 
 /*
  * Priority for tracing
diff --git a/usr/src/sys/kern/sys_socket.c b/usr/src/sys/kern/sys_socket.c
index 90ea1ad56a..9ec59c6200 100644
--- a/usr/src/sys/kern/sys_socket.c
+++ b/usr/src/sys/kern/sys_socket.c
@@ -1,17 +1,17 @@
-/*	sys_socket.c	6.2	84/08/21	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/file.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/ioctl.h"
-#include "../h/uio.h"
-#include "../h/stat.h"
+/*	sys_socket.c	6.3	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "file.h"
+#include "mbuf.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "ioctl.h"
+#include "uio.h"
+#include "stat.h"
 
 #include "../net/if.h"
 #include "../net/route.h"
diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index 9cf471c404..2b1e6fe9f0 100644
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -1,21 +1,21 @@
-/*	tty.c	6.9	84/02/15	*/
+/*	tty.c	6.10	84/08/29	*/
 
 #include "../machine/reg.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/ioctl.h"
-#include "../h/tty.h"
-#include "../h/proc.h"
-#include "../h/inode.h"
-#include "../h/file.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/dk.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "proc.h"
+#include "inode.h"
+#include "file.h"
+#include "conf.h"
+#include "buf.h"
+#include "dk.h"
+#include "uio.h"
+#include "kernel.h"
 
 /*
  * Table giving parity for characters and indicating
diff --git a/usr/src/sys/kern/tty_bk.c b/usr/src/sys/kern/tty_bk.c
index 310e0586a5..abf5ccfd05 100644
--- a/usr/src/sys/kern/tty_bk.c
+++ b/usr/src/sys/kern/tty_bk.c
@@ -1,20 +1,20 @@
-/*	tty_bk.c	6.1	83/07/29	*/
+/*	tty_bk.c	6.2	84/08/29	*/
 
 #include "bk.h"
 
 #if NBK > 0
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/ioctl.h"
-#include "../h/tty.h"
-#include "../h/proc.h"
-#include "../h/inode.h"
-#include "../h/file.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/uio.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "proc.h"
+#include "inode.h"
+#include "file.h"
+#include "conf.h"
+#include "buf.h"
+#include "uio.h"
 
 /*
  * Line discipline for Berkeley network.
diff --git a/usr/src/sys/kern/tty_conf.c b/usr/src/sys/kern/tty_conf.c
index 333a9b7168..5c98ba8ce4 100644
--- a/usr/src/sys/kern/tty_conf.c
+++ b/usr/src/sys/kern/tty_conf.c
@@ -1,10 +1,10 @@
-/*	tty_conf.c	6.2	83/09/25	*/
+/*	tty_conf.c	6.3	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/buf.h"
-#include "../h/tty.h"
-#include "../h/conf.h"
+#include "param.h"
+#include "systm.h"
+#include "buf.h"
+#include "tty.h"
+#include "conf.h"
 
 int	nodev();
 int	nulldev();
diff --git a/usr/src/sys/kern/tty_pty.c b/usr/src/sys/kern/tty_pty.c
index d50c3b33f4..5aa4319b04 100644
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/*	tty_pty.c	6.5	84/07/29	*/
+/*	tty_pty.c	6.6	84/08/29	*/
 
 /*
  * Pseudo-teletype Driver
@@ -7,17 +7,17 @@
 #include "pty.h"
 
 #if NPTY > 0
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/ioctl.h"
-#include "../h/tty.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/conf.h"
-#include "../h/file.h"
-#include "../h/proc.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "dir.h"
+#include "user.h"
+#include "conf.h"
+#include "file.h"
+#include "proc.h"
+#include "uio.h"
+#include "kernel.h"
 
 #if NPTY == 1
 #undef	NPTY
diff --git a/usr/src/sys/kern/tty_subr.c b/usr/src/sys/kern/tty_subr.c
index 7bcdbd1a55..505da1ffde 100644
--- a/usr/src/sys/kern/tty_subr.c
+++ b/usr/src/sys/kern/tty_subr.c
@@ -1,11 +1,11 @@
-/*	tty_subr.c	6.2	84/07/29	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/tty.h"
-#include "../h/clist.h"
+/*	tty_subr.c	6.3	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "conf.h"
+#include "buf.h"
+#include "tty.h"
+#include "clist.h"
 
 char	cwaiting;
 
diff --git a/usr/src/sys/kern/tty_tb.c b/usr/src/sys/kern/tty_tb.c
index 62f125c108..de23b6cdb6 100644
--- a/usr/src/sys/kern/tty_tb.c
+++ b/usr/src/sys/kern/tty_tb.c
@@ -1,20 +1,20 @@
-/*	tty_tb.c	6.2	83/09/22	*/
+/*	tty_tb.c	6.3	84/08/29	*/
 
 #include "tb.h"
 #if NTB > 0
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/ioctl.h"
-#include "../h/tty.h"
-#include "../h/proc.h"
-#include "../h/inode.h"
-#include "../h/file.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/uio.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "proc.h"
+#include "inode.h"
+#include "file.h"
+#include "conf.h"
+#include "buf.h"
+#include "uio.h"
 
 /*
  * Line discipline for RS232 tablets.
diff --git a/usr/src/sys/kern/tty_tty.c b/usr/src/sys/kern/tty_tty.c
index 1b89416640..05acb8804a 100644
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -1,19 +1,19 @@
-/*	tty_tty.c	6.1	83/07/29	*/
+/*	tty_tty.c	6.2	84/08/29	*/
 
 /*
  * Indirect driver for controlling tty.
  *
  * THIS IS GARBAGE: MUST SOON BE DONE WITH struct inode * IN PROC TABLE.
  */
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/conf.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/ioctl.h"
-#include "../h/tty.h"
-#include "../h/proc.h"
-#include "../h/uio.h"
+#include "param.h"
+#include "systm.h"
+#include "conf.h"
+#include "dir.h"
+#include "user.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "proc.h"
+#include "uio.h"
 
 /*ARGSUSED*/
 syopen(dev, flag)
diff --git a/usr/src/sys/kern/uipc_domain.c b/usr/src/sys/kern/uipc_domain.c
index b5622328f1..9a9fcd1054 100644
--- a/usr/src/sys/kern/uipc_domain.c
+++ b/usr/src/sys/kern/uipc_domain.c
@@ -1,11 +1,11 @@
-/*	uipc_domain.c	6.2	84/08/21	*/
+/*	uipc_domain.c	6.3	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/socket.h"
-#include "../h/protosw.h"
-#include "../h/domain.h"
-#include "../h/time.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "socket.h"
+#include "protosw.h"
+#include "domain.h"
+#include "time.h"
+#include "kernel.h"
 
 #define	ADDDOMAIN(x)	{ \
 	extern struct domain x/**/domain; \
diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index 76ebcdd533..4d3b56b2c9 100644
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -1,16 +1,16 @@
-/*	uipc_mbuf.c	6.2	84/02/22	*/
+/*	uipc_mbuf.c	6.3	84/08/29	*/
 
 #include "../machine/pte.h"
 
-#include "../h/param.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/cmap.h"
-#include "../h/map.h"
-#include "../h/mbuf.h"
-#include "../h/vm.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "cmap.h"
+#include "map.h"
+#include "mbuf.h"
+#include "vm.h"
+#include "kernel.h"
 
 mbinit()
 {
diff --git a/usr/src/sys/kern/uipc_pipe.c b/usr/src/sys/kern/uipc_pipe.c
index 1394443fe9..c4b1266450 100644
--- a/usr/src/sys/kern/uipc_pipe.c
+++ b/usr/src/sys/kern/uipc_pipe.c
@@ -1,11 +1,11 @@
-/*	uipc_pipe.c	6.1	83/07/29	*/
+/*	uipc_pipe.c	6.2	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/unpcb.h"
+#include "param.h"
+#include "mbuf.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "unpcb.h"
 
 #define	PIPSIZ	4096
 
diff --git a/usr/src/sys/kern/uipc_proto.c b/usr/src/sys/kern/uipc_proto.c
index 73a9929771..228161832c 100644
--- a/usr/src/sys/kern/uipc_proto.c
+++ b/usr/src/sys/kern/uipc_proto.c
@@ -1,10 +1,10 @@
-/*	uipc_proto.c	6.2	84/08/21	*/
+/*	uipc_proto.c	6.3	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/socket.h"
-#include "../h/protosw.h"
-#include "../h/domain.h"
-#include "../h/mbuf.h"
+#include "param.h"
+#include "socket.h"
+#include "protosw.h"
+#include "domain.h"
+#include "mbuf.h"
 
 /*
  * Definitions of protocols supported in the UNIX domain.
diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 9a8d447b47..1d308d92b4 100644
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,22 +1,22 @@
-/*	uipc_socket.c	6.6	84/08/21	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/file.h"
-#include "../h/inode.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
-#include "../h/un.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/stat.h"
-#include "../h/ioctl.h"
-#include "../h/uio.h"
+/*	uipc_socket.c	6.7	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "file.h"
+#include "inode.h"
+#include "buf.h"
+#include "mbuf.h"
+#include "un.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "stat.h"
+#include "ioctl.h"
+#include "uio.h"
 #include "../net/route.h"
 #include "../netinet/in.h"
 #include "../net/if.h"
diff --git a/usr/src/sys/kern/uipc_socket2.c b/usr/src/sys/kern/uipc_socket2.c
index a20e727a8a..18cf110d1c 100644
--- a/usr/src/sys/kern/uipc_socket2.c
+++ b/usr/src/sys/kern/uipc_socket2.c
@@ -1,17 +1,17 @@
-/*	uipc_socket2.c	6.3	84/08/21	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/file.h"
-#include "../h/inode.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
+/*	uipc_socket2.c	6.4	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "file.h"
+#include "inode.h"
+#include "buf.h"
+#include "mbuf.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
 
 /*
  * Primitive routines for operating on sockets and socket buffers
diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c
index eaeda740c9..bd683e81f1 100644
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,18 +1,18 @@
-/*	uipc_syscalls.c	6.3	84/07/08	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/file.h"
-#include "../h/inode.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/uio.h"
+/*	uipc_syscalls.c	6.4	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "file.h"
+#include "inode.h"
+#include "buf.h"
+#include "mbuf.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "uio.h"
 
 /*
  * System call interface to the socket abstraction.
diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c
index e57de62d4e..db98705517 100644
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -1,18 +1,18 @@
-/*	uipc_usrreq.c	6.9	84/08/27	*/
-
-#include "../h/param.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/mbuf.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/unpcb.h"
-#include "../h/un.h"
-#include "../h/inode.h"
-#include "../h/file.h"
-#include "../h/stat.h"
+/*	uipc_usrreq.c	6.10	84/08/29	*/
+
+#include "param.h"
+#include "dir.h"
+#include "user.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "unpcb.h"
+#include "un.h"
+#include "inode.h"
+#include "file.h"
+#include "stat.h"
 
 /*
  * Unix communications domain.
diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 2e7ac99c29..e2fe96d9d9 100644
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -1,17 +1,17 @@
-/*	vfs_bio.c	6.3	84/08/07	*/
+/*	vfs_bio.c	6.4	84/08/29	*/
 
 #include "../machine/pte.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/proc.h"
-#include "../h/seg.h"
-#include "../h/vm.h"
-#include "../h/trace.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "conf.h"
+#include "proc.h"
+#include "seg.h"
+#include "vm.h"
+#include "trace.h"
 
 /*
  * Read in (if necessary) the block and return a buffer pointer.
diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index a2a1d8daad..1c7e330637 100644
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -1,17 +1,17 @@
-/*	vfs_cluster.c	6.3	84/08/07	*/
+/*	vfs_cluster.c	6.4	84/08/29	*/
 
 #include "../machine/pte.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/proc.h"
-#include "../h/seg.h"
-#include "../h/vm.h"
-#include "../h/trace.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "conf.h"
+#include "proc.h"
+#include "seg.h"
+#include "vm.h"
+#include "trace.h"
 
 /*
  * Read in (if necessary) the block and return a buffer pointer.
diff --git a/usr/src/sys/kern/vfs_lookup.c b/usr/src/sys/kern/vfs_lookup.c
index 778c81bedc..07cf2bdbaa 100644
--- a/usr/src/sys/kern/vfs_lookup.c
+++ b/usr/src/sys/kern/vfs_lookup.c
@@ -1,16 +1,16 @@
-/*	vfs_lookup.c	6.14	84/07/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/mount.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
+/*	vfs_lookup.c	6.15	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "inode.h"
+#include "fs.h"
+#include "mount.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "conf.h"
+#include "uio.h"
+#include "kernel.h"
 
 struct	buf *blkatoff();
 struct	buf *freenamebuf;
diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index 8c092315a8..a293e523ae 100644
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -1,21 +1,21 @@
-/*	vfs_syscalls.c	6.13	84/07/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/file.h"
-#include "../h/stat.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/quota.h"
-#include "../h/uio.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/mount.h"
+/*	vfs_syscalls.c	6.14	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "file.h"
+#include "stat.h"
+#include "inode.h"
+#include "fs.h"
+#include "buf.h"
+#include "proc.h"
+#include "quota.h"
+#include "uio.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "mount.h"
 
 extern	struct fileops inodeops;
 struct	file *getinode();
diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c
index 3f76e75930..21a2bc764a 100644
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -1,20 +1,20 @@
-/*	vfs_vnops.c	6.2	84/07/08	*/
+/*	vfs_vnops.c	6.3	84/08/29	*/
 
 #include "../machine/reg.h"
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/fs.h"
-#include "../h/file.h"
-#include "../h/conf.h"
-#include "../h/inode.h"
-#include "../h/acct.h"
-#include "../h/mount.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/proc.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "fs.h"
+#include "file.h"
+#include "conf.h"
+#include "inode.h"
+#include "acct.h"
+#include "mount.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "proc.h"
 
 /*
  * Check mode permission on inode pointer.
diff --git a/usr/src/sys/kern/vfs_xxx.c b/usr/src/sys/kern/vfs_xxx.c
index 662ecbf9a8..5a1b815ecd 100644
--- a/usr/src/sys/kern/vfs_xxx.c
+++ b/usr/src/sys/kern/vfs_xxx.c
@@ -1,18 +1,18 @@
-/*	vfs_xxx.c	6.2	84/07/08	*/
+/*	vfs_xxx.c	6.3	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/mount.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
+#include "param.h"
+#include "systm.h"
+#include "inode.h"
+#include "fs.h"
+#include "mount.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "conf.h"
 
 #ifdef COMPAT
-#include "../h/file.h"
-#include "../h/kernel.h"
+#include "file.h"
+#include "kernel.h"
 
 /*
  * Oh, how backwards compatibility is ugly!!!
diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index 26b860103f..d436d91d32 100644
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -1,16 +1,16 @@
-/*	ffs_alloc.c	6.4	84/07/28	*/
+/*	ffs_alloc.c	6.5	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mount.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/inode.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/quota.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "mount.h"
+#include "fs.h"
+#include "conf.h"
+#include "buf.h"
+#include "inode.h"
+#include "dir.h"
+#include "user.h"
+#include "quota.h"
+#include "kernel.h"
 
 extern u_long		hashalloc();
 extern ino_t		ialloccg();
diff --git a/usr/src/sys/ufs/ffs/ffs_balloc.c b/usr/src/sys/ufs/ffs/ffs_balloc.c
index da978474ae..934d13b8f7 100644
--- a/usr/src/sys/ufs/ffs/ffs_balloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_balloc.c
@@ -1,14 +1,14 @@
-/*	ffs_balloc.c	6.1	83/07/29	*/
+/*	ffs_balloc.c	6.2	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/conf.h"
-#include "../h/inode.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/fs.h"
+#include "param.h"
+#include "systm.h"
+#include "conf.h"
+#include "inode.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "proc.h"
+#include "fs.h"
 
 /*
  * Bmap defines the structure of file system storage
diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index 64ec8b0236..2620c48abd 100644
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -1,18 +1,18 @@
-/*	ffs_inode.c	6.10	84/08/03	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mount.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
+/*	ffs_inode.c	6.11	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "mount.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "fs.h"
+#include "conf.h"
+#include "buf.h"
 #ifdef QUOTA
-#include "../h/quota.h"
+#include "quota.h"
 #endif
-#include "../h/kernel.h"
+#include "kernel.h"
 
 #define	INOHSZ	512
 #if	((INOHSZ&(INOHSZ-1)) == 0)
diff --git a/usr/src/sys/ufs/ffs/ffs_subr.c b/usr/src/sys/ufs/ffs/ffs_subr.c
index adb68d724a..4d461705a8 100644
--- a/usr/src/sys/ufs/ffs/ffs_subr.c
+++ b/usr/src/sys/ufs/ffs/ffs_subr.c
@@ -1,17 +1,17 @@
-/*	ffs_subr.c	6.4	84/08/09	*/
+/*	ffs_subr.c	6.5	84/08/29	*/
 
 #ifdef KERNEL
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mount.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/inode.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/quota.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "mount.h"
+#include "fs.h"
+#include "conf.h"
+#include "buf.h"
+#include "inode.h"
+#include "dir.h"
+#include "user.h"
+#include "quota.h"
+#include "kernel.h"
 #else
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/usr/src/sys/ufs/ffs/ffs_tables.c b/usr/src/sys/ufs/ffs/ffs_tables.c
index e6212cd6fc..7f739c9fdc 100644
--- a/usr/src/sys/ufs/ffs/ffs_tables.c
+++ b/usr/src/sys/ufs/ffs/ffs_tables.c
@@ -1,6 +1,6 @@
-/*	ffs_tables.c	6.1	83/07/29	*/
+/*	ffs_tables.c	6.2	84/08/29	*/
 
-#include "../h/param.h"
+#include "param.h"
 
 /*
  * Bit patterns for identifying fragments in the block map
diff --git a/usr/src/sys/ufs/ffs/ffs_vfsops.c b/usr/src/sys/ufs/ffs/ffs_vfsops.c
index 580719ca49..25ce66b4df 100644
--- a/usr/src/sys/ufs/ffs/ffs_vfsops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vfsops.c
@@ -1,16 +1,16 @@
-/*	ffs_vfsops.c	6.7	84/07/18	*/
+/*	ffs_vfsops.c	6.8	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/mount.h"
-#include "../h/file.h"
-#include "../h/conf.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "proc.h"
+#include "fs.h"
+#include "buf.h"
+#include "mount.h"
+#include "file.h"
+#include "conf.h"
 
 smount()
 {
diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index 817ced72ab..4c3eba3bc5 100644
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -1,21 +1,21 @@
-/*	ffs_vnops.c	6.13	84/07/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/file.h"
-#include "../h/stat.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/quota.h"
-#include "../h/uio.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/mount.h"
+/*	ffs_vnops.c	6.14	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "file.h"
+#include "stat.h"
+#include "inode.h"
+#include "fs.h"
+#include "buf.h"
+#include "proc.h"
+#include "quota.h"
+#include "uio.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "mount.h"
 
 extern	struct fileops inodeops;
 struct	file *getinode();
diff --git a/usr/src/sys/ufs/ffs/ufs_disksubr.c b/usr/src/sys/ufs/ffs/ufs_disksubr.c
index be940e80ae..7388b88ecf 100644
--- a/usr/src/sys/ufs/ffs/ufs_disksubr.c
+++ b/usr/src/sys/ufs/ffs/ufs_disksubr.c
@@ -1,4 +1,4 @@
-/*	ufs_disksubr.c	6.1	83/07/29	*/
+/*	ufs_disksubr.c	6.2	84/08/29	*/
 
 /*
  * Seek sort for disks.  We depend on the driver
@@ -17,9 +17,9 @@
  * blocks are allocated.
  */
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/buf.h"
+#include "param.h"
+#include "systm.h"
+#include "buf.h"
 
 #define	b_cylin	b_resid
 
diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c
index faa1e88484..897c7d31e7 100644
--- a/usr/src/sys/ufs/ffs/ufs_inode.c
+++ b/usr/src/sys/ufs/ffs/ufs_inode.c
@@ -1,18 +1,18 @@
-/*	ufs_inode.c	6.10	84/08/03	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mount.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
+/*	ufs_inode.c	6.11	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "mount.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "fs.h"
+#include "conf.h"
+#include "buf.h"
 #ifdef QUOTA
-#include "../h/quota.h"
+#include "quota.h"
 #endif
-#include "../h/kernel.h"
+#include "kernel.h"
 
 #define	INOHSZ	512
 #if	((INOHSZ&(INOHSZ-1)) == 0)
diff --git a/usr/src/sys/ufs/ffs/ufs_lookup.c b/usr/src/sys/ufs/ffs/ufs_lookup.c
index ebae5ef17e..c3f06b9cf6 100644
--- a/usr/src/sys/ufs/ffs/ufs_lookup.c
+++ b/usr/src/sys/ufs/ffs/ufs_lookup.c
@@ -1,16 +1,16 @@
-/*	ufs_lookup.c	6.14	84/07/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/mount.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
+/*	ufs_lookup.c	6.15	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "inode.h"
+#include "fs.h"
+#include "mount.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "conf.h"
+#include "uio.h"
+#include "kernel.h"
 
 struct	buf *blkatoff();
 struct	buf *freenamebuf;
diff --git a/usr/src/sys/ufs/ffs/ufs_vfsops.c b/usr/src/sys/ufs/ffs/ufs_vfsops.c
index ace2861d08..30c4ffdb59 100644
--- a/usr/src/sys/ufs/ffs/ufs_vfsops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vfsops.c
@@ -1,16 +1,16 @@
-/*	ufs_vfsops.c	6.7	84/07/18	*/
+/*	ufs_vfsops.c	6.8	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/mount.h"
-#include "../h/file.h"
-#include "../h/conf.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "proc.h"
+#include "fs.h"
+#include "buf.h"
+#include "mount.h"
+#include "file.h"
+#include "conf.h"
 
 smount()
 {
diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 7f801ffc2d..0529034966 100644
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -1,21 +1,21 @@
-/*	ufs_vnops.c	6.13	84/07/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/file.h"
-#include "../h/stat.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/quota.h"
-#include "../h/uio.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/mount.h"
+/*	ufs_vnops.c	6.14	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "file.h"
+#include "stat.h"
+#include "inode.h"
+#include "fs.h"
+#include "buf.h"
+#include "proc.h"
+#include "quota.h"
+#include "uio.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "mount.h"
 
 extern	struct fileops inodeops;
 struct	file *getinode();
diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 634d62f114..ed5c494548 100644
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -1,16 +1,16 @@
-/*	lfs_alloc.c	6.4	84/07/28	*/
+/*	lfs_alloc.c	6.5	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mount.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/inode.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/quota.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "mount.h"
+#include "fs.h"
+#include "conf.h"
+#include "buf.h"
+#include "inode.h"
+#include "dir.h"
+#include "user.h"
+#include "quota.h"
+#include "kernel.h"
 
 extern u_long		hashalloc();
 extern ino_t		ialloccg();
diff --git a/usr/src/sys/ufs/lfs/lfs_balloc.c b/usr/src/sys/ufs/lfs/lfs_balloc.c
index 72af800720..2f86fd4db0 100644
--- a/usr/src/sys/ufs/lfs/lfs_balloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_balloc.c
@@ -1,14 +1,14 @@
-/*	lfs_balloc.c	6.1	83/07/29	*/
+/*	lfs_balloc.c	6.2	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/conf.h"
-#include "../h/inode.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/fs.h"
+#include "param.h"
+#include "systm.h"
+#include "conf.h"
+#include "inode.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "proc.h"
+#include "fs.h"
 
 /*
  * Bmap defines the structure of file system storage
diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index ff5b06aa21..d1f23a7c86 100644
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -1,18 +1,18 @@
-/*	lfs_inode.c	6.10	84/08/03	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mount.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
+/*	lfs_inode.c	6.11	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "mount.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "fs.h"
+#include "conf.h"
+#include "buf.h"
 #ifdef QUOTA
-#include "../h/quota.h"
+#include "quota.h"
 #endif
-#include "../h/kernel.h"
+#include "kernel.h"
 
 #define	INOHSZ	512
 #if	((INOHSZ&(INOHSZ-1)) == 0)
diff --git a/usr/src/sys/ufs/lfs/lfs_vfsops.c b/usr/src/sys/ufs/lfs/lfs_vfsops.c
index 3758ee09fb..83aa0abde3 100644
--- a/usr/src/sys/ufs/lfs/lfs_vfsops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vfsops.c
@@ -1,16 +1,16 @@
-/*	lfs_vfsops.c	6.7	84/07/18	*/
+/*	lfs_vfsops.c	6.8	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/mount.h"
-#include "../h/file.h"
-#include "../h/conf.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "proc.h"
+#include "fs.h"
+#include "buf.h"
+#include "mount.h"
+#include "file.h"
+#include "conf.h"
 
 smount()
 {
diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index 22387acc1a..cf71517b40 100644
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -1,21 +1,21 @@
-/*	lfs_vnops.c	6.13	84/07/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/file.h"
-#include "../h/stat.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/quota.h"
-#include "../h/uio.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/mount.h"
+/*	lfs_vnops.c	6.14	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "file.h"
+#include "stat.h"
+#include "inode.h"
+#include "fs.h"
+#include "buf.h"
+#include "proc.h"
+#include "quota.h"
+#include "uio.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "mount.h"
 
 extern	struct fileops inodeops;
 struct	file *getinode();
diff --git a/usr/src/sys/ufs/ufs/ufs_disksubr.c b/usr/src/sys/ufs/ufs/ufs_disksubr.c
index be940e80ae..7388b88ecf 100644
--- a/usr/src/sys/ufs/ufs/ufs_disksubr.c
+++ b/usr/src/sys/ufs/ufs/ufs_disksubr.c
@@ -1,4 +1,4 @@
-/*	ufs_disksubr.c	6.1	83/07/29	*/
+/*	ufs_disksubr.c	6.2	84/08/29	*/
 
 /*
  * Seek sort for disks.  We depend on the driver
@@ -17,9 +17,9 @@
  * blocks are allocated.
  */
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/buf.h"
+#include "param.h"
+#include "systm.h"
+#include "buf.h"
 
 #define	b_cylin	b_resid
 
diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c
index faa1e88484..897c7d31e7 100644
--- a/usr/src/sys/ufs/ufs/ufs_inode.c
+++ b/usr/src/sys/ufs/ufs/ufs_inode.c
@@ -1,18 +1,18 @@
-/*	ufs_inode.c	6.10	84/08/03	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mount.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
+/*	ufs_inode.c	6.11	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "mount.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "fs.h"
+#include "conf.h"
+#include "buf.h"
 #ifdef QUOTA
-#include "../h/quota.h"
+#include "quota.h"
 #endif
-#include "../h/kernel.h"
+#include "kernel.h"
 
 #define	INOHSZ	512
 #if	((INOHSZ&(INOHSZ-1)) == 0)
diff --git a/usr/src/sys/ufs/ufs/ufs_lookup.c b/usr/src/sys/ufs/ufs/ufs_lookup.c
index ebae5ef17e..c3f06b9cf6 100644
--- a/usr/src/sys/ufs/ufs/ufs_lookup.c
+++ b/usr/src/sys/ufs/ufs/ufs_lookup.c
@@ -1,16 +1,16 @@
-/*	ufs_lookup.c	6.14	84/07/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/mount.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
+/*	ufs_lookup.c	6.15	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "inode.h"
+#include "fs.h"
+#include "mount.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "conf.h"
+#include "uio.h"
+#include "kernel.h"
 
 struct	buf *blkatoff();
 struct	buf *freenamebuf;
diff --git a/usr/src/sys/ufs/ufs/ufs_vfsops.c b/usr/src/sys/ufs/ufs/ufs_vfsops.c
index ace2861d08..30c4ffdb59 100644
--- a/usr/src/sys/ufs/ufs/ufs_vfsops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vfsops.c
@@ -1,16 +1,16 @@
-/*	ufs_vfsops.c	6.7	84/07/18	*/
+/*	ufs_vfsops.c	6.8	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/mount.h"
-#include "../h/file.h"
-#include "../h/conf.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "proc.h"
+#include "fs.h"
+#include "buf.h"
+#include "mount.h"
+#include "file.h"
+#include "conf.h"
 
 smount()
 {
diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 7f801ffc2d..0529034966 100644
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -1,21 +1,21 @@
-/*	ufs_vnops.c	6.13	84/07/27	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/file.h"
-#include "../h/stat.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/quota.h"
-#include "../h/uio.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/mount.h"
+/*	ufs_vnops.c	6.14	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "file.h"
+#include "stat.h"
+#include "inode.h"
+#include "fs.h"
+#include "buf.h"
+#include "proc.h"
+#include "quota.h"
+#include "uio.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "mount.h"
 
 extern	struct fileops inodeops;
 struct	file *getinode();
diff --git a/usr/src/sys/vm/vm_meter.c b/usr/src/sys/vm/vm_meter.c
index 4083d24110..eb24f6e4c2 100644
--- a/usr/src/sys/vm/vm_meter.c
+++ b/usr/src/sys/vm/vm_meter.c
@@ -1,15 +1,15 @@
-/*	vm_meter.c	6.3	84/08/22	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/seg.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/text.h"
-#include "../h/vm.h"
-#include "../h/cmap.h"
-#include "../h/kernel.h"
+/*	vm_meter.c	6.3	84/08/29	*/
+
+#include "param.h"
+#include "systm.h"
+#include "seg.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "text.h"
+#include "vm.h"
+#include "cmap.h"
+#include "kernel.h"
 
 int	maxslp = MAXSLP;
 int	saferss = SAFERSS;
diff --git a/usr/src/sys/vm/vm_swap.c b/usr/src/sys/vm/vm_swap.c
index fc349272c2..f3928adb19 100644
--- a/usr/src/sys/vm/vm_swap.c
+++ b/usr/src/sys/vm/vm_swap.c
@@ -1,15 +1,15 @@
-/*	vm_swap.c	6.2	84/07/08	*/
+/*	vm_swap.c	6.3	84/08/29	*/
 
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/map.h"
-#include "../h/uio.h"
-#include "../h/file.h"
+#include "param.h"
+#include "systm.h"
+#include "buf.h"
+#include "conf.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "map.h"
+#include "uio.h"
+#include "file.h"
 
 struct	buf rswbuf;
 /*
-- 
2.20.1