24 files changed, 327 insertions, 326 deletions

diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 670f212..786ae41 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: aha1542.c,v 1.25 1994/05/03 05:44:53 rgrimes Exp $
+ *      $Id: aha1542.c,v 1.27 1994/05/25 08:57:57 rgrimes Exp $
  */
 
 /*
@@ -21,7 +21,7 @@
 
 #include <sys/types.h>
 #ifdef	KERNEL			/* don't laugh.. look for main() */
-#include <aha.h>
+#include "aha.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,7 +38,7 @@
 
 #ifdef	KERNEL
 #include "ddb.h"
-#include "kernel.h"
+#include <sys/kernel.h>
 #else /*KERNEL */
 #define NAHA 1
 #endif /*KERNEL */
diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c
index 27bce5f..5ac65b8 100644
--- a/sys/i386/isa/aha1742.c
+++ b/sys/i386/isa/aha1742.c
@@ -14,13 +14,13 @@
  *
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  *
- *      $Id: aha1742.c,v 1.14 1994/01/11 07:24:32 rgrimes Exp $
+ *      $Id: aha1742.c,v 1.16 1994/05/25 08:58:13 rgrimes Exp $
  */
 
 #include <sys/types.h>
 
 #ifdef	KERNEL			/* don't laugh, it compiles as a program too.. look */
-#include <ahb.h>
+#include "ahb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
@@ -56,7 +56,7 @@ typedef timeout_func_t timeout_t;
 #endif
 
 typedef unsigned long int physaddr;
-#include "kernel.h"
+#include <sys/kernel.h>
 
 #define KVTOPHYS(x)   vtophys(x)
 
diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c
index 9a53a7a..0759b89 100644
--- a/sys/i386/isa/bt742a.c
+++ b/sys/i386/isa/bt742a.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: bt742a.c,v 1.14 1994/03/24 02:22:58 davidg Exp $
+ *      $Id: bt742a.c,v 1.17 1994/05/27 04:02:01 rgrimes Exp $
  */
 
 /*
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 
 #ifdef	KERNEL		/* don't laugh.. it compiles to a program too.. look */
-#include <bt.h>
+#include "bt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
@@ -39,7 +39,7 @@
 
 #ifdef	KERNEL
 #include "ddb.h"
-#include "kernel.h"
+#include <sys/kernel.h>
 #else /*KERNEL */
 #define	NBT 1
 #endif /*KERNEL */
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index b0ce0a7..cf0a7f6 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,22 +34,22 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.10 1994/05/25 08:58:32 rgrimes Exp $
+ *	$Id: clock.c,v 1.12 1994/08/11 00:28:24 wollman Exp $
  */
 
 /*
  * Primitive clock interrupt routines.
  */
-#include "param.h"
-#include "systm.h"
-#include "time.h"
-#include "kernel.h"
-#include "machine/segments.h"
-#include "machine/frame.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/rtc.h"
-#include "i386/isa/timerreg.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <machine/segments.h>
+#include <machine/frame.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/rtc.h>
+#include <i386/isa/timerreg.h>
 #include <machine/cpu.h>
 
 /* X-tals being what they are, it's nice to be able to fudge this one... */
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 259d451..518aa38 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.24 1994/03/08 16:25:29 nate Exp $
+ *	$Id: fd.c,v 1.26 1994/05/25 08:58:39 rgrimes Exp $
  *
  */
 
@@ -60,12 +60,12 @@
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/fdreg.h"
-#include "i386/isa/fdc.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/rtc.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/fdreg.h>
+#include <i386/isa/fdc.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/rtc.h>
 
 #if NFT > 0
 extern int ftopen(), ftintr(), ftattach(), ftclose(), ftioctl();
diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h
index 5deb02c..d0d69e2 100644
--- a/sys/i386/isa/fdreg.h
+++ b/sys/i386/isa/fdreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.3 1994/02/07 04:27:10 alm Exp $
+ *	$Id: fdreg.h,v 1.4 1994/02/07 22:12:42 alm Exp $
  */
 
 /*
@@ -39,7 +39,7 @@
  */
 
 /* uses NEC765 controller */
-#include "../i386/isa/ic/nec765.h"
+#include <i386/isa/ic/nec765.h>
 
 /* registers */
 #define	fdout	2	/* Digital Output Register (W) */
diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c
index bc5d7cc..b7ca761 100644
--- a/sys/i386/isa/ft.c
+++ b/sys/i386/isa/ft.c
@@ -17,7 +17,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  *
  *  ft.c - QIC-40/80 floppy tape driver
- *  $Id: ft.c,v 1.6 1994/05/25 08:58:47 rgrimes Exp $
+ *  $Id: ft.c,v 1.7 1994/08/02 07:39:22 davidg Exp $
  *
  *
  *  01/26/94 v0.3b - Jim Babb
@@ -52,7 +52,7 @@
  *  06/03/93 v0.1 Alpha release
  *  Hopefully the last re-write.  Many bugs fixed, many remain.
  *
- * $Id$
+ * $Id: ft.c,v 1.7 1994/08/02 07:39:22 davidg Exp $
  */
 
 #include "ft.h"
@@ -70,12 +70,12 @@
 #include <sys/uio.h>
 #include <sys/ftape.h>
 #include <machine/pio.h>
-#include "i386/isa/isa_device.h"
-#include "i386/isa/fdreg.h"
-#include "i386/isa/fdc.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/rtc.h"
-#include "ftreg.h"
+#include <i386/isa/isa_device.h>
+#include <i386/isa/fdreg.h>
+#include <i386/isa/fdc.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/rtc.h>
+#include <i386/isa/ftreg.h>
 
 /* Enable or disable debugging messages. */
 #define FTDBGALL 0			/* everything */
diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s
index c713806..6d897d7 100644
--- a/sys/i386/isa/icu.s
+++ b/sys/i386/isa/icu.s
@@ -36,7 +36,7 @@
  *
  *	@(#)icu.s	7.2 (Berkeley) 5/21/91
  *
- *	$Id: icu.s,v 1.7 1993/12/20 14:58:21 wollman Exp $
+ *	$Id: icu.s,v 1.9 1994/05/25 08:58:55 rgrimes Exp $
  */
 
 /*
@@ -50,7 +50,7 @@
  * numbers are used without translation in the masks.
  */
 
-#include "../net/netisr.h"
+#include <net/netisr.h>
 
 	.data
 	.globl	_cpl
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 71d8a30..bca7f31 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -13,7 +13,7 @@
  *   the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
  *   and a variety of similar clones.
  *
- * $Id: if_ed.c,v 1.42 1994/08/08 16:45:11 jkh Exp $
+ * $Id: if_ed.c,v 1.43 1994/08/12 06:36:51 davidg Exp $
  */
 
 #include "ed.h"
@@ -21,42 +21,42 @@
 /* bpfilter included here in case it is needed in future net includes */
 #include "bpfilter.h"
 
-#include "param.h"
-#include "systm.h"
-#include "errno.h"
-#include "ioctl.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
 
-#include "net/if.h"
-#include "net/if_dl.h"
-#include "net/if_types.h"
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
 
 #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
 #endif
 
 #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
 #endif
 
 #if NBPFILTER > 0
-#include "net/bpf.h"
-#include "net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
 #endif
 
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/if_edreg.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/if_edreg.h>
 
-#include "i386/include/pio.h"
+#include <i386/include/pio.h>
 
 /* For backwards compatibility */
 #ifndef IFF_ALTPHYS
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index be18099..ceaac8f 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  * 
- * $Id: if_el.c,v 1.3 1994/08/02 07:39:32 davidg Exp $
+ * $Id: if_el.c,v 1.4 1994/08/08 13:33:12 davidg Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -23,40 +23,40 @@
 #if NEL > 0
 #include "bpfilter.h"
 
-#include "param.h"
-#include "systm.h"
-#include "errno.h"
-#include "ioctl.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
 
-#include "net/if.h"
-#include "net/if_dl.h"
-#include "net/if_types.h"
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
 
 #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
 #endif
 
 #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
 #endif
 
 #if NBPFILTER > 0
-#include "net/bpf.h"
-#include "net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
 #endif
 
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/if_elreg.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/if_elreg.h>
 
 #define ETHER_MIN_LEN	64
 #define ETHER_MAX_LEN	1518
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 348be72..2fbf289 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -39,7 +39,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.7 1994/08/08 13:33:15 davidg Exp $
+ *	$Id: if_ie.c,v 1.8 1994/08/12 06:06:19 davidg Exp $
  */
 
 /*
@@ -103,46 +103,46 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 #include "ie.h"
 #if NIE > 0
 
-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "ioctl.h"
-#include "errno.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+#include <sys/syslog.h>
 
-#include "net/if.h"
-#include "net/if_types.h"
-#include "net/if_dl.h"
-#include "net/route.h"
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/if_dl.h>
+#include <net/route.h>
 
 #include "bpfilter.h"
 
 #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
 #endif
 
 #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
 #endif
 
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/ic/i82586.h"
-#include "i386/isa/if_iereg.h"
-#include "i386/isa/icu.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/ic/i82586.h>
+#include <i386/isa/if_iereg.h>
+#include <i386/isa/icu.h>
 
-#include "vm/vm.h"
+#include <vm/vm.h>
 
 #if NBPFILTER > 0
-#include "net/bpf.h"
-#include "net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
 #endif
 
 #if (NBPFILTER > 0) || defined(MULTICAST)
diff --git a/sys/i386/isa/if_is.c b/sys/i386/isa/if_is.c
index 0217255..b2a6e87 100644
--- a/sys/i386/isa/if_is.c
+++ b/sys/i386/isa/if_is.c
@@ -11,7 +11,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_is.c,v 1.24 1994/08/02 07:39:37 davidg Exp $
+ * $Id: if_is.c,v 1.25 1994/08/08 13:33:16 davidg Exp $
  */
 
 /* TODO
@@ -27,41 +27,41 @@
 
 #include "bpfilter.h"
 
-#include "param.h"
-#include "systm.h"
-#include "errno.h"
-#include "ioctl.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
 
-#include "net/if.h"
-#include "net/if_dl.h"
-#include "net/if_types.h"
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
 
 #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
 #endif
 
 #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
 #endif
 
 #if NBPFILTER > 0
-#include "net/bpf.h"
-#include "net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
 #endif
 
-#include "i386/isa/isa_device.h"
-#include "i386/isa/if_isreg.h"
-#include "i386/isa/icu.h"
+#include <i386/isa/isa_device.h>
+#include <i386/isa/if_isreg.h>
+#include <i386/isa/icu.h>
 
-#include "vm/vm.h"
+#include <vm/vm.h>
 
 #define ETHER_MIN_LEN 64
 #define ETHER_MAX_LEN   1518
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 0daec32..80be9a5 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.18 1994/05/25 08:59:24 rgrimes Exp $
+ *	$Id: isa.c,v 1.19 1994/08/10 04:39:52 wollman Exp $
  */
 
 /*
@@ -47,24 +47,24 @@
  * isa_dmastart()
  */
 
-#include "param.h"
-#include "systm.h"		/* isn't it a joy */
-#include "kernel.h"		/* to have three of these */
-#include "conf.h"
-#include "file.h"
-#include "buf.h"
-#include "uio.h"
-#include "syslog.h"
-#include "malloc.h"
-#include "rlist.h"
-#include "machine/segments.h"
-#include "vm/vm.h"
+#include <sys/param.h>
+#include <sys/systm.h>		/* isn't it a joy */
+#include <sys/kernel.h>		/* to have three of these */
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <sys/syslog.h>
+#include <sys/malloc.h>
+#include <sys/rlist.h>
+#include <machine/segments.h>
+#include <vm/vm.h>
 #include <machine/spl.h>
-#include "i386/isa/isa_device.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/ic/i8237.h"
-#include "i386/isa/ic/i8042.h"
+#include <i386/isa/isa_device.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/ic/i8237.h>
+#include <i386/isa/ic/i8042.h>
 
 /*
 **  Register definitions for DMA controller 1 (channels 0..3):
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 786c0bf..884476d 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.13 1994/06/08 14:34:54 davidg Exp $
+ *	$Id: lpt.c,v 1.13 1994/08/13 00:37:03 phk Exp $
  */
 
 /*
@@ -102,34 +102,34 @@
 #include "lpt.h"
 #if NLPT > 0
 
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "user.h"
-#include "buf.h"
-#include "kernel.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "uio.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/buf.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/uio.h>
+#include <sys/syslog.h>
 
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/lptreg.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/lptreg.h>
 
-#include "i386/include/lpt.h"
+#include <i386/include/lpt.h>
 
 #ifdef INET
-#include "mbuf.h"
-#include "socket.h"
-#include "../net/if.h"
-#include "../net/if_types.h"
-#include "../net/netisr.h"
-#include "../net/route.h"
-#include "../netinet/in.h"
-#include "../netinet/in_systm.h"
-#include "../netinet/in_var.h"
-#include "../netinet/ip.h"
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/netisr.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
 #endif /* INET */
 
 #define	LPINITRDY	4	/* wait up to 4 seconds for a ready */
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 683b0e1..6722c5a 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -39,28 +39,28 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.15 1994/04/20 07:06:41 davidg Exp $
+ *	$Id: mcd.c,v 1.17 1994/05/25 08:59:30 rgrimes Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
 #if NMCD > 0
-#include "types.h"
-#include "param.h"
-#include "systm.h"
-#include "conf.h"
-#include "file.h"
-#include "buf.h"
-#include "stat.h"
-#include "uio.h"
-#include "ioctl.h"
-#include "cdio.h"
-#include "errno.h"
-#include "dkbad.h"
-#include "disklabel.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "mcdreg.h"
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+#include <sys/ioctl.h>
+#include <sys/cdio.h>
+#include <sys/errno.h>
+#include <sys/dkbad.h>
+#include <sys/disklabel.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/mcdreg.h>
 
 /* user definable options */
 /*#define MCD_TO_WARNING_ON*/	/* define to get timeout messages */
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 3653610..5ce5c03 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id$
+ * $Id: mse.c,v 1.5 1994/08/02 07:39:39 davidg Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -44,18 +44,18 @@
 
 #include "mse.h"
 #if NMSE > 0
-#include "param.h"
-#include "proc.h"
-#include "user.h"
-#include "buf.h"
-#include "systm.h"
-#include "kernel.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "uio.h"
-
-#include "i386/isa/isa_device.h"
-#include "i386/isa/icu.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/uio.h>
+
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
 
 static int mseprobe(struct isa_device *);
 static int mseattach(struct isa_device *);
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index a3ce1e2..f7f9b27 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,25 +32,25 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.6 1994/01/03 07:55:43 davidg Exp $
+ *	$Id: npx.c,v 1.9 1994/06/11 05:17:15 davidg Exp $
  */
 
 #include "npx.h"
 #if NNPX > 0
 
-#include "param.h"
-#include "systm.h"
-#include "conf.h"
-#include "file.h"
-#include "proc.h"
-#include "machine/cpu.h"
-#include "machine/pcb.h"
-#include "machine/trap.h"
-#include "ioctl.h"
-#include "machine/specialreg.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/isa.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <machine/cpu.h>
+#include <machine/pcb.h>
+#include <machine/trap.h>
+#include <sys/ioctl.h>
+#include <machine/specialreg.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/isa.h>
 
 /*
  * 387 and 287 Numeric Coprocessor Extension (NPX) Driver.
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 32995b3..5d51218 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -24,23 +24,23 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$ 
+ *	$Id: pcaudio.c,v 1.3 1994/05/20 12:24:15 sos Exp $ 
  */
 
-#include "param.h"
-#include "uio.h"
-#include "ioctl.h"
-#include "sound/ulaw.h"
-#include "machine/cpufunc.h"
-#include "machine/pio.h"
-#include "machine/pcaudioio.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/timerreg.h"
-
 #include "pca.h"
 #if NPCA > 0
 
+#include <sys/param.h>
+#include <sys/uio.h>
+#include <sys/ioctl.h>
+#include <sound/ulaw.h>
+#include <machine/cpufunc.h>
+#include <machine/pio.h>
+#include <machine/pcaudioio.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/timerreg.h>
+
 #define BUF_SIZE 	8192
 #define SAMPLE_RATE	8000
 #define INTERRUPT_RATE	16000
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index dd4ee55..de95e90 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.44 1994/04/03 12:25:57 ache Exp $
+ *	$Id: sio.c,v 1.47 1994/05/26 13:31:40 rgrimes Exp $
  */
 
 #include "sio.h"
@@ -43,22 +43,22 @@
  * Works for National Semiconductor NS8250-NS16550AF UARTs.
  * COM driver, based on HP dca driver.
  */
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "proc.h"
-#include "user.h"
-#include "conf.h"
-#include "file.h"
-#include "uio.h"
-#include "kernel.h"
-#include "syslog.h"
-
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/sioreg.h"
-#include "i386/isa/ic/ns16550.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/sioreg.h>
+#include <i386/isa/ic/ns16550.h>
 
 #define	FAKE_DCD(unit)	((unit) == comconsole)
 #define	LOTS_OF_EVENTS	64	/* helps separate urgent events from input */
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index d273f31..4f9f2fa 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,22 +4,22 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.7 1994/01/25 23:04:27 ache Exp $
+ *    $Id: spkr.c,v 1.8 1994/04/21 14:21:50 sos Exp $
  */
 
 #include "speaker.h"
 
 #if NSPEAKER > 0
 
-#include "param.h"
-#include "systm.h"
-#include "kernel.h"
-#include "errno.h"
-#include "buf.h"
-#include "uio.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/timerreg.h"
-#include "machine/speaker.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/errno.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/timerreg.h>
+#include <machine/speaker.h>
 
 /**************** MACHINE DEPENDENT PART STARTS HERE *************************
  *
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index a2a931c..ce391cd 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -35,40 +35,41 @@
  * SUCH DAMAGE.
  *
  *	from:@(#)syscons.c	1.3 940129
- *	$Id: syscons.c,v 1.46 1994/05/25 08:59:56 rgrimes Exp $
+ *	$Id: syscons.c,v 1.47 1994/08/01 10:38:19 davidg Exp $
  *
  */
 
+#include "sc.h"
+
+#if NSC > 0
+
 #if !defined(__FreeBSD__)
 #define FAT_CURSOR
 #endif
 
-#include "param.h"
+#include <sys/param.h>
 #include <sys/systm.h>
-#include "conf.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "user.h"
-#include "tty.h"
-#include "uio.h"
-#include "callout.h"
-#include "kernel.h"
-#include "syslog.h"
-#include "errno.h"
-#include "malloc.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/timerreg.h"
-#include "i386/i386/cons.h"
-#include "machine/console.h"
-#include "machine/psl.h"
-#include "machine/frame.h"
-#include "machine/pc/display.h"
-#include "iso8859.font"
-#include "kbdtables.h"
-#include "sc.h"
-
-#if NSC > 0
+#include <sys/conf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/tty.h>
+#include <sys/uio.h>
+#include <sys/callout.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+#include <sys/errno.h>
+#include <sys/malloc.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/timerreg.h>
+#include <i386/i386/cons.h>
+#include <machine/console.h>
+#include <machine/psl.h>
+#include <machine/frame.h>
+#include <machine/pc/display.h>
+#include <i386/isa/iso8859.font>
+#include <i386/isa/kbdtables.h>
 
 #if !defined(NCONS)
 #define NCONS 12
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c
index aa99917..a89eeca 100644
--- a/sys/i386/isa/ultra14f.c
+++ b/sys/i386/isa/ultra14f.c
@@ -19,13 +19,13 @@
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  * slight mod to make work with 34F as well: Wed Jun  2 18:05:48 WST 1993
  *
- *      $Id: ultra14f.c,v 1.16 1994/03/20 00:30:04 wollman Exp $
+ *      $Id: ultra14f.c,v 1.19 1994/05/27 04:02:08 rgrimes Exp $
  */
 
 #include <sys/types.h>
 
 #ifdef	KERNEL			/* don't laugh.. this compiles to a program too.. look */
-#include <uha.h>
+#include "uha.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 6524264..31c7e28 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -37,7 +37,7 @@ static int wdtest = 0;
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.40 1994/08/08 13:53:33 davidg Exp $
+ *	$Id: wd.c,v 1.41 1994/08/08 13:56:46 davidg Exp $
  */
 
 /* TODO:
@@ -64,24 +64,24 @@ static int wdtest = 0;
 #include "wd.h"
 #if	NWDC > 0
 
-#include "param.h"
-#include "dkbad.h"
-#include "systm.h"
-#include "kernel.h"
-#include "conf.h"
-#include "file.h"
-#include "stat.h"
-#include "ioctl.h"
-#include "disklabel.h"
-#include "buf.h"
-#include "uio.h"
-#include "malloc.h"
-#include "machine/cpu.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/wdreg.h"
-#include "syslog.h"
-#include "vm/vm.h"
+#include <sys/param.h>
+#include <sys/dkbad.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/disklabel.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <sys/malloc.h>
+#include <machine/cpu.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/wdreg.h>
+#include <sys/syslog.h>
+#include <vm/vm.h>
 
 #define TIMEOUT		10000
 #define	RETRIES		5	/* number of retries before giving up */
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 21a6ed9..5b287a4 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.4 1993/12/13 18:38:43 alm Exp $
+ * $Id: wt.c,v 1.7 1994/05/27 04:02:10 rgrimes Exp $
  *
  */
 
@@ -53,18 +53,18 @@
 #include "wt.h"
 #if NWT > 0
 
-#include "sys/param.h"
-#include "systm.h"
-#include "kernel.h"
-#include "sys/buf.h"
-#include "sys/fcntl.h"
-#include "sys/malloc.h"
-#include "sys/ioctl.h"
-#include "sys/mtio.h"
-#include "vm/vm_param.h"
-#include "i386/include/pio.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/wtreg.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/buf.h>
+#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/ioctl.h>
+#include <sys/mtio.h>
+#include <vm/vm_param.h>
+#include <i386/include/pio.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/wtreg.h>
 
 /*
  * Uncomment this to enable internal device tracing.