Don't include <sys/ioctl.h> in the kernel. Stage 1: don't include

it when it is not used.  In most cases, the reasons for including it
went away when the special ioctl headers became self-sufficient.

106 files changed, 86 insertions, 193 deletions

diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 52d37ad..bce496a 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id$
+ *	$Id: npx.c,v 1.39 1997/02/22 09:36:57 peter Exp $
  */
 
 #include "npx.h"
@@ -48,7 +48,6 @@
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #ifdef NPX_DEBUG
 #include <sys/syslog.h>
 #endif
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index c1094ee..adac1ef 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.229 1997/02/24 00:37:43 alex Exp $
+ *	$Id: machdep.c,v 1.230 1997/03/22 18:52:10 kato Exp $
  */
 
 #include "npx.h"
@@ -61,7 +61,6 @@
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/msgbuf.h>
-#include <sys/ioctl.h>
 #include <sys/sysent.h>
 #include <sys/tty.h>
 #include <sys/sysctl.h>
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index 52d37ad..bce496a 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id$
+ *	$Id: npx.c,v 1.39 1997/02/22 09:36:57 peter Exp $
  */
 
 #include "npx.h"
@@ -48,7 +48,6 @@
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #ifdef NPX_DEBUG
 #include <sys/syslog.h>
 #endif
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index e4400af..e2e59ca 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -25,7 +25,7 @@
  * (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: linux_file.c,v 1.11 1997/02/22 09:38:20 peter Exp $
  */
 
 #include <sys/param.h>
@@ -35,7 +35,6 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 706e83d..7d5bd59 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (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: linux_misc.c,v 1.24 1997/02/22 09:38:23 peter Exp $
+ *  $Id: linux_misc.c,v 1.25 1997/03/23 03:36:04 bde Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,6 @@
 #include <sys/dirent.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/imgact_aout.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index 76cbfd6..f6f9508 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
- *	$Id$
+ *	$Id: linux_util.c,v 1.5 1997/02/22 09:38:29 peter Exp $
  */
 
 #include <sys/param.h>
@@ -37,7 +37,6 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 3b8e6a4..5973878 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ccd.c,v 1.21 1997/02/22 09:28:56 peter Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -104,7 +104,6 @@
 #include <sys/namei.h>
 #include <sys/conf.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <ufs/ffs/fs.h> 
 #include <sys/device.h>
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 54443dc..d867751 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.45 1997/02/22 09:36:03 peter Exp $
+ *	$Id: cy.c,v 1.46 1997/03/23 03:34:44 bde Exp $
  */
 
 #include "cy.h"
@@ -71,7 +71,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 54443dc..d867751 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.45 1997/02/22 09:36:03 peter Exp $
+ *	$Id: cy.c,v 1.46 1997/03/23 03:34:44 bde Exp $
  */
 
 #include "cy.h"
@@ -71,7 +71,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 10f7728..cdabe71 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.23 1997/02/22 09:29:42 peter Exp $
+ *  dgb.c $Id: dgb.c,v 1.24 1997/03/23 03:33:56 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -45,7 +45,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index b18ad71..562fcbe 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.97 1997/02/22 09:36:09 peter Exp $
+ *	$Id: fd.c,v 1.98 1997/03/23 03:34:47 bde Exp $
  *
  */
 
@@ -60,7 +60,6 @@
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
 #include <machine/clock.h>
 #include <machine/ioctl_fd.h>
 #include <sys/disklabel.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index d48add7..0b87a27 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * 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.85 1997/02/22 09:36:53 peter Exp $
+ *	$Id: mcd.c,v 1.86 1997/03/23 03:34:51 bde Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -55,7 +55,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 #include <sys/proc.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>
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index e00037f..ee196b5 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/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.31 1997/02/22 09:36:56 peter Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -52,7 +52,6 @@
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index 05798e0..9ef1c2c 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,7 @@
  * (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: if_fea.c,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $
+ * $Id: if_fea.c,v 1.2 1997/01/17 23:54:37 joerg Exp $
  */
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #if defined(__bsdi__) || defined(__NetBSD__)
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 4ea3abe..6bd8037 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,7 @@
  * (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: if_fpa.c,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $
+ * $Id: if_fpa.c,v 1.2 1997/01/17 23:54:42 joerg Exp $
  *
  */
 
@@ -37,7 +37,6 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #if defined(__bsdi__) || defined(__NetBSD__)
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 5a2ce2c..c88b95e 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index eef043f..3b34ed2 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id$ */
+/* $Id: scd.c,v 1.27 1997/02/22 09:37:03 peter Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -58,7 +58,6 @@
 #include <sys/proc.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>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 896812e..9f59b1a 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.159 1997/02/22 09:37:09 peter Exp $
+ *	$Id: sio.c,v 1.160 1997/03/23 03:35:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -51,7 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 4db4f9a..cbeae8b 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (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: syscons.c,v 1.204 1997/02/28 14:26:34 bde Exp $
+ *  $Id: syscons.c,v 1.205 1997/03/01 23:53:46 jmg Exp $
  */
 
 #include "sc.h"
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/tty.h>
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index f2936c9..168ac84 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.44 1997/02/22 09:28:58 peter Exp $
+ *	$Id: vn.c,v 1.45 1997/03/23 03:33:39 bde Exp $
  */
 
 /*
@@ -76,7 +76,6 @@
 #include <sys/errno.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 5c2bf7c..a687768 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.19 1997/02/22 09:38:50 peter Exp $
+ * $Id: cd9660_vfsops.c,v 1.20 1997/03/23 03:36:11 bde Exp $
  */
 
 #include <sys/param.h>
@@ -49,7 +49,6 @@
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 3f079e3..4370e0c 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_ctl.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id$
+ *	$Id: procfs_ctl.c,v 1.13 1997/02/22 09:40:27 peter Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/ptrace.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 1211747..b4c25bf 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id$
+ *	$Id: procfs_map.c,v 1.10 1997/02/22 09:40:28 peter Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 70fc4cc..c9ece43 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id$
+ *	$Id: procfs_status.c,v 1.8 1997/02/22 09:40:29 peter Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index fc74b36..bdb83d5 100644
--- a/sys/fs/procfs/procfs_type.c
+++ b/sys/fs/procfs/procfs_type.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: procfs_type.c,v 1.3 1997/02/22 09:40:30 peter Exp $
  */
 
 #include <sys/param.h>
@@ -44,7 +44,6 @@
 #include <sys/proc.h>
 #include <sys/sysent.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index cd61b6e..1efeedb 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id$
+ * $Id: spec_vnops.c,v 1.37 1997/02/22 09:40:34 peter Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,6 @@
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/disklabel.h>
 #include <sys/vmmeter.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 3b8e6a4..5973878 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ccd.c,v 1.21 1997/02/22 09:28:56 peter Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -104,7 +104,6 @@
 #include <sys/namei.h>
 #include <sys/conf.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <ufs/ffs/fs.h> 
 #include <sys/device.h>
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 3330a22..9f756dd 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -57,7 +57,6 @@
 #include <sys/mbuf.h>
 #include <sys/fcntl.h>
 #include <sys/disklabel.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 3330a22..9f756dd 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -57,7 +57,6 @@
 #include <sys/mbuf.h>
 #include <sys/fcntl.h>
 #include <sys/disklabel.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 10f7728..cdabe71 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.23 1997/02/22 09:29:42 peter Exp $
+ *  dgb.c $Id: dgb.c,v 1.24 1997/03/23 03:33:56 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -45,7 +45,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/i386/eisa/if_fea.c b/sys/i386/eisa/if_fea.c
index 05798e0..9ef1c2c 100644
--- a/sys/i386/eisa/if_fea.c
+++ b/sys/i386/eisa/if_fea.c
@@ -21,7 +21,7 @@
  * (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: if_fea.c,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $
+ * $Id: if_fea.c,v 1.2 1997/01/17 23:54:37 joerg Exp $
  */
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #if defined(__bsdi__) || defined(__NetBSD__)
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index c1094ee..adac1ef 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.229 1997/02/24 00:37:43 alex Exp $
+ *	$Id: machdep.c,v 1.230 1997/03/22 18:52:10 kato Exp $
  */
 
 #include "npx.h"
@@ -61,7 +61,6 @@
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/msgbuf.h>
-#include <sys/ioctl.h>
 #include <sys/sysent.h>
 #include <sys/tty.h>
 #include <sys/sysctl.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index 2a64eaf..526baf5 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -22,7 +22,7 @@
  * (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: ibcs2_ipc.c,v 1.10 1997/02/22 09:33:19 peter Exp $
  */
 
 #include <sys/param.h>
@@ -32,7 +32,6 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/ipc.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index aa5e1d8..4364180 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -45,7 +45,7 @@
  *
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
- * $Id: ibcs2_misc.c,v 1.16 1997/02/22 09:33:22 peter Exp $
+ * $Id: ibcs2_misc.c,v 1.17 1997/03/23 03:34:07 bde Exp $
  */
 
 /*
@@ -61,7 +61,6 @@
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index e3bca1e..82dbc42 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -25,7 +25,7 @@
  * (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: ibcs2_signal.c,v 1.9 1997/02/22 09:33:26 peter Exp $
  */
 
 #include <sys/param.h>
@@ -33,7 +33,6 @@
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index b354014..5ebcd14 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -28,11 +28,9 @@
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/sysproto.h>
 #include <net/if.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/ibcs2/ibcs2_stat.c b/sys/i386/ibcs2/ibcs2_stat.c
index 9d8ce85..103ebfe 100644
--- a/sys/i386/ibcs2/ibcs2_stat.c
+++ b/sys/i386/ibcs2/ibcs2_stat.c
@@ -33,7 +33,6 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
diff --git a/sys/i386/ibcs2/ibcs2_util.c b/sys/i386/ibcs2/ibcs2_util.c
index 425f5a8..15851e7 100644
--- a/sys/i386/ibcs2/ibcs2_util.c
+++ b/sys/i386/ibcs2/ibcs2_util.c
@@ -36,7 +36,6 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 63de77a..01a8778 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.67 1997/03/23 04:39:26 bde Exp $
+ *      $Id: aha1542.c,v 1.68 1997/03/23 06:26:46 bde Exp $
  */
 
 /*
@@ -26,7 +26,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index 66495e9..c0ab38f 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -31,7 +31,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.27 1997/03/23 04:39:35 bde Exp $
+ * $Id: aic6360.c,v 1.28 1997/03/23 06:26:47 bde Exp $
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
@@ -120,7 +120,6 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 7edb123..97e534b 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id$
+ * $Id: asc.c,v 1.24 1997/02/22 09:35:56 peter Exp $
  */
 
 #include "asc.h"
@@ -60,7 +60,6 @@
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
-#include <sys/ioctl.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 8a00299..e4840e5 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id$
+ *	$Id: ctx.c,v 1.23 1997/02/22 09:36:01 peter Exp $
  */
 
 /*
@@ -114,7 +114,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 0893b05c..029e46d 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -24,7 +24,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
-#include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 54443dc..d867751 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.45 1997/02/22 09:36:03 peter Exp $
+ *	$Id: cy.c,v 1.46 1997/03/23 03:34:44 bde Exp $
  */
 
 #include "cy.h"
@@ -71,7 +71,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index b18ad71..562fcbe 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.97 1997/02/22 09:36:09 peter Exp $
+ *	$Id: fd.c,v 1.98 1997/03/23 03:34:47 bde Exp $
  *
  */
 
@@ -60,7 +60,6 @@
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
 #include <machine/clock.h>
 #include <machine/ioctl_fd.h>
 #include <sys/disklabel.h>
diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c
index 9e5a94f..2c57e61 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.31 1997/02/22 09:36:12 peter Exp $
+ *  $Id: ft.c,v 1.32 1997/03/24 07:19:55 kato Exp $
  *
  *  01/19/95 ++sg
  *  Cleaned up recalibrate/seek code at attach time for FreeBSD 2.x.
@@ -73,7 +73,6 @@
 #include <sys/disklabel.h>	/* temp. for dkunit() in fdc.h */
 #include <sys/file.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 503ac5c..b30f898 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -27,7 +27,6 @@
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index ff9f775..9985f55 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -42,7 +42,6 @@
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
-#include <sys/ioctl.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 314cad0..76dc3b7 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.9 1997/03/13 03:51:25 davidn Exp $
+ * $Id: istallion.c,v 1.10 1997/03/23 03:34:49 bde Exp $
  */
 
 /*****************************************************************************/
@@ -44,7 +44,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 5ee59da..c374748 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.22 1997/02/22 09:38:11 peter Exp $ */
+/* $Id: matcd.c,v 1.23 1997/03/23 03:35:32 bde Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
@@ -352,7 +352,6 @@ static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank
 #include	<sys/cdio.h>
 #include	<sys/disklabel.h>
 #include	<sys/fcntl.h>
-#include	<sys/ioctl.h>
 #include	<sys/proc.h>
 
 #include	"i386/isa/matcd/options.h"	/*Conditional compile options
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index d48add7..0b87a27 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * 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.85 1997/02/22 09:36:53 peter Exp $
+ *	$Id: mcd.c,v 1.86 1997/03/23 03:34:51 bde Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -55,7 +55,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 #include <sys/proc.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>
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index e00037f..ee196b5 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.31 1997/02/22 09:36:56 peter Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -52,7 +52,6 @@
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
diff --git a/sys/i386/isa/ncr5380.c b/sys/i386/isa/ncr5380.c
index 5a335e0..e1fffcc 100644
--- a/sys/i386/isa/ncr5380.c
+++ b/sys/i386/isa/ncr5380.c
@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 52d37ad..bce496a 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id$
+ *	$Id: npx.c,v 1.39 1997/02/22 09:36:57 peter Exp $
  */
 
 #include "npx.h"
@@ -48,7 +48,6 @@
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #ifdef NPX_DEBUG
 #include <sys/syslog.h>
 #endif
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 951c9fd..b33ceba 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -72,7 +72,6 @@
 
 #include <sys/param.h>
 #include <sys/conf.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/tty.h>
diff --git a/sys/i386/isa/qcam.c b/sys/i386/isa/qcam.c
index ecd48bf..ae09aa6 100644
--- a/sys/i386/isa/qcam.c
+++ b/sys/i386/isa/qcam.c
@@ -40,7 +40,6 @@
 #include	<sys/systm.h>
 #include	<sys/kernel.h>
 #include	<sys/conf.h>
-#include	<sys/ioctl.h>
 #include	<sys/uio.h>
 #include	<sys/malloc.h>
 #include	<sys/errno.h>
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 5a2ce2c..c88b95e 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index eef043f..3b34ed2 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id$ */
+/* $Id: scd.c,v 1.27 1997/02/22 09:37:03 peter Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -58,7 +58,6 @@
 #include <sys/proc.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>
diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c
index dff3dba..499a4d4 100644
--- a/sys/i386/isa/seagate.c
+++ b/sys/i386/isa/seagate.c
@@ -60,7 +60,7 @@
  *               that category, with the possible exception of scanners and
  *               some of the older MO drives.
  *
- * $Id: seagate.c,v 1.20 1997/02/22 09:37:05 peter Exp $
+ * $Id: seagate.c,v 1.21 1997/03/23 04:39:51 bde Exp $
  */
 
 /*
@@ -117,7 +117,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 896812e..9f59b1a 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.159 1997/02/22 09:37:09 peter Exp $
+ *	$Id: sio.c,v 1.160 1997/03/23 03:35:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -51,7 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index cc38328..2643166 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -55,7 +55,6 @@ error "Can only have 1 spigot configured."
 #include	<sys/systm.h>
 #include	<sys/kernel.h>
 #include	<sys/conf.h>
-#include	<sys/ioctl.h>
 #include	<sys/proc.h>
 #include	<sys/signalvar.h>
 #include	<sys/file.h>
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 7ae93af..3239b6d 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: stallion.c,v 1.8 1997/03/23 03:35:06 bde Exp $
+ * $Id: stallion.c,v 1.9 1997/03/24 07:25:31 davidn Exp $
  */
 
 /*****************************************************************************/
@@ -44,7 +44,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 4db4f9a..cbeae8b 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (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: syscons.c,v 1.204 1997/02/28 14:26:34 bde Exp $
+ *  $Id: syscons.c,v 1.205 1997/03/01 23:53:46 jmg Exp $
  */
 
 #include "sc.h"
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/tty.h>
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index eafa9b5..2a5a7f7 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -134,7 +134,6 @@
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
 #include <sys/select.h>
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c
index ca56282..6ee3439 100644
--- a/sys/i386/isa/ultra14f.c
+++ b/sys/i386/isa/ultra14f.c
@@ -22,7 +22,7 @@
  * today: Fri Jun  2 17:21:03 EST 1994
  * added 24F support  ++sg
  *
- *      $Id: ultra14f.c,v 1.52 1997/03/23 04:39:57 bde Exp $
+ *      $Id: ultra14f.c,v 1.53 1997/03/23 06:33:30 bde Exp $
  */
 
 #include <sys/types.h>
@@ -33,7 +33,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index 74af3f0..904b5ea 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -27,7 +27,6 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
-#include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/cdio.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index a693780..3ce9fb5 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.125 1997/02/22 09:37:25 peter Exp $
+ *	$Id: wd.c,v 1.126 1997/03/11 23:17:04 se Exp $
  */
 
 /* TODO:
@@ -72,7 +72,6 @@
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
 #include <sys/buf.h>
diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c
index c6175e6..e110e82 100644
--- a/sys/i386/isa/wd7000.c
+++ b/sys/i386/isa/wd7000.c
@@ -54,7 +54,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/dkbad.h>
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index f084f82..f01148b 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id$
+ * $Id: wt.c,v 1.38 1997/02/22 09:37:28 peter Exp $
  *
  */
 
@@ -66,7 +66,6 @@
 #include <sys/buf.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
-#include <sys/ioctl.h>
 #include <sys/mtio.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c
index e4400af..e2e59ca 100644
--- a/sys/i386/linux/linux_file.c
+++ b/sys/i386/linux/linux_file.c
@@ -25,7 +25,7 @@
  * (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: linux_file.c,v 1.11 1997/02/22 09:38:20 peter Exp $
  */
 
 #include <sys/param.h>
@@ -35,7 +35,6 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 706e83d..7d5bd59 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (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: linux_misc.c,v 1.24 1997/02/22 09:38:23 peter Exp $
+ *  $Id: linux_misc.c,v 1.25 1997/03/23 03:36:04 bde Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,6 @@
 #include <sys/dirent.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/imgact_aout.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
diff --git a/sys/i386/linux/linux_util.c b/sys/i386/linux/linux_util.c
index 76cbfd6..f6f9508 100644
--- a/sys/i386/linux/linux_util.c
+++ b/sys/i386/linux/linux_util.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
- *	$Id$
+ *	$Id: linux_util.c,v 1.5 1997/02/22 09:38:29 peter Exp $
  */
 
 #include <sys/param.h>
@@ -37,7 +37,6 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index b18ad71..562fcbe 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.97 1997/02/22 09:36:09 peter Exp $
+ *	$Id: fd.c,v 1.98 1997/03/23 03:34:47 bde Exp $
  *
  */
 
@@ -60,7 +60,6 @@
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
 #include <machine/clock.h>
 #include <machine/ioctl_fd.h>
 #include <sys/disklabel.h>
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 896812e..9f59b1a 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.159 1997/02/22 09:37:09 peter Exp $
+ *	$Id: sio.c,v 1.160 1997/03/23 03:35:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -51,7 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 4db4f9a..cbeae8b 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,7 +25,7 @@
  * (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: syscons.c,v 1.204 1997/02/28 14:26:34 bde Exp $
+ *  $Id: syscons.c,v 1.205 1997/03/01 23:53:46 jmg Exp $
  */
 
 #include "sc.h"
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/tty.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 5c2bf7c..a687768 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.19 1997/02/22 09:38:50 peter Exp $
+ * $Id: cd9660_vfsops.c,v 1.20 1997/03/23 03:36:11 bde Exp $
  */
 
 #include <sys/param.h>
@@ -49,7 +49,6 @@
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index fbbe6f4..f72d2d0 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- *	$Id: kern_acct.c,v 1.13 1997/02/22 09:39:00 peter Exp $
+ *	$Id: kern_acct.c,v 1.14 1997/03/23 03:36:17 bde Exp $
  */
 
 #include <sys/param.h>
@@ -55,7 +55,6 @@
 #include <sys/errno.h>
 #include <sys/acct.h>
 #include <sys/resourcevar.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 
 /*
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index bd67d8b..2f8074c 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id$
+ * $Id: kern_exit.c,v 1.45 1997/02/22 09:39:04 peter Exp $
  */
 
 #include "opt_ktrace.h"
@@ -45,7 +45,6 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/sysent.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/time.h>
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 16fd67b..f371c37 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,13 +30,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.37 1997/02/27 16:40:20 bde Exp $
+ * $Id: kern_lkm.c,v 1.38 1997/03/23 03:36:20 bde Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index a49a1de..cecf89f 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id$
+ * $Id: kern_proc.c,v 1.25 1997/02/22 09:39:08 peter Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +47,6 @@
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/signalvar.h>
 #include <vm/vm.h>
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 24091f6..d907b47 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.25 1997/02/22 09:39:26 peter Exp $
+ * $Id: tty_subr.c,v 1.26 1997/03/05 16:45:01 bde Exp $
  */
 
 /*
@@ -34,7 +34,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/clist.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index f9648e0..44e01b0 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id$
+ *	$Id: subr_diskslice.c,v 1.35 1997/02/22 09:39:15 peter Exp $
  */
 
 #include <sys/param.h>
@@ -56,7 +56,6 @@
 #include <sys/diskslice.h>
 #include <sys/dkbad.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
 #include <sys/syslog.h>
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 24091f6..d907b47 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.25 1997/02/22 09:39:26 peter Exp $
+ * $Id: tty_subr.c,v 1.26 1997/03/05 16:45:01 bde Exp $
  */
 
 /*
@@ -34,7 +34,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/clist.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index b1acc26..be164d5 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.14 1997/02/22 09:39:27 peter Exp $
+ * $Id: tty_tty.c,v 1.15 1997/03/23 03:36:30 bde Exp $
  */
 
 /*
@@ -40,7 +40,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/vnode.h>
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index 3f079e3..4370e0c 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_ctl.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id$
+ *	$Id: procfs_ctl.c,v 1.13 1997/02/22 09:40:27 peter Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/ptrace.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c
index 1211747..b4c25bf 100644
--- a/sys/miscfs/procfs/procfs_map.c
+++ b/sys/miscfs/procfs/procfs_map.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id$
+ *	$Id: procfs_map.c,v 1.10 1997/02/22 09:40:28 peter Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index 70fc4cc..c9ece43 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id$
+ *	$Id: procfs_status.c,v 1.8 1997/02/22 09:40:29 peter Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/miscfs/procfs/procfs_type.c b/sys/miscfs/procfs/procfs_type.c
index fc74b36..bdb83d5 100644
--- a/sys/miscfs/procfs/procfs_type.c
+++ b/sys/miscfs/procfs/procfs_type.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: procfs_type.c,v 1.3 1997/02/22 09:40:30 peter Exp $
  */
 
 #include <sys/param.h>
@@ -44,7 +44,6 @@
 #include <sys/proc.h>
 #include <sys/sysent.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index cd61b6e..1efeedb 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id$
+ * $Id: spec_vnops.c,v 1.37 1997/02/22 09:40:34 peter Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,6 @@
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/disklabel.h>
 #include <sys/vmmeter.h>
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 434486c..d2f480e 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $Id: if_fddisubr.c,v 1.16 1997/02/22 09:41:01 peter Exp $
+ * $Id: if_fddisubr.c,v 1.17 1997/03/15 19:58:43 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,6 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index f1c9e07..4ac992e 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: ppp_tty.c,v 1.13 1997/02/22 09:41:11 peter Exp $ */
+/* $Id: ppp_tty.c,v 1.14 1997/03/23 03:37:17 bde Exp $ */
 /* from Id: ppp_tty.c,v 1.3 1995/08/16 01:36:40 paulus Exp */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 
@@ -86,7 +86,6 @@
 #include <sys/mbuf.h>
 #include <sys/dkstat.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/tty.h>
 #include <sys/kernel.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index b7f17eb..42715e8 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.40 1997/02/22 09:41:14 peter Exp $
+ *	$Id: route.c,v 1.41 1997/03/05 08:01:28 julian Exp $
  */
 
 #include "opt_mrouting.h"
@@ -46,7 +46,6 @@
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
-#include <sys/ioctl.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 3f03a30..985cf40 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -9,7 +9,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
-#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 3f03a30..985cf40 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -9,7 +9,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
-#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index ff2bc30..81409ce 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- *	$Id: in_pcb.c,v 1.27 1997/02/22 09:41:29 peter Exp $
+ *	$Id: in_pcb.c,v 1.28 1997/03/03 09:23:33 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -42,7 +42,6 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/proc.h>
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index 4ea3abe..6bd8037 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,7 @@
  * (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: if_fpa.c,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $
+ * $Id: if_fpa.c,v 1.2 1997/01/17 23:54:42 joerg Exp $
  *
  */
 
@@ -37,7 +37,6 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #if defined(__bsdi__) || defined(__NetBSD__)
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 17b34ea..fce922d 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -153,7 +153,6 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index ca5a311..976c37a 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.79 1997/03/23 03:37:23 bde Exp $
+ *      $Id: cd.c,v 1.80 1997/03/23 06:33:44 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -29,7 +29,6 @@
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 50bbb22..f8c5e57 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ch.c,v 1.38 1997/03/23 04:39:12 bde Exp $
+ *      $Id: ch.c,v 1.39 1997/03/24 04:26:46 bde Exp $
  */
 
 #include "opt_scsi.h"
@@ -41,7 +41,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/chio.h>
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 3f80678..5f69a35 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.28 1997/02/22 09:44:26 peter Exp $
+ *	$Id: od.c,v 1.29 1997/03/23 06:33:45 bde Exp $
  */
 
 /*
@@ -68,7 +68,6 @@
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 62db1de..c2c5138 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -15,7 +15,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.102 1997/02/22 09:44:37 peter Exp $
+ *      $Id: sd.c,v 1.103 1997/03/23 06:33:52 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -26,7 +26,6 @@
 #include <sys/kernel.h>
 #include <sys/dkbad.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 7292672..49bf3d0 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.76 1997/02/22 09:44:39 peter Exp $
+ * $Id: st.c,v 1.77 1997/03/23 06:33:53 bde Exp $
  */
 
 /*
@@ -37,7 +37,6 @@
 
 #include <sys/fcntl.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index c0d74b0..82a8fa2 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.33 1997/02/22 09:44:41 peter Exp $
+ *      $Id: worm.c,v 1.34 1997/03/23 06:33:55 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -53,7 +53,6 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #include <sys/wormio.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 31c5486..e552c7e 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.50 1997/03/23 03:37:34 bde Exp $
+ * $Id: ffs_vfsops.c,v 1.51 1997/03/23 20:08:19 guido Exp $
  */
 
 #include "opt_quota.h"
@@ -48,7 +48,6 @@
 #include <sys/mbuf.h>
 #include <sys/fcntl.h>
 #include <sys/disklabel.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 0b85cdd..25d8b2c 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vfsops.c	8.20 (Berkeley) 6/10/95
- * $Id: lfs_vfsops.c,v 1.17 1997/03/23 00:45:23 bde Exp $
+ * $Id: lfs_vfsops.c,v 1.18 1997/03/23 03:37:42 bde Exp $
  */
 
 #include "opt_quota.h"
@@ -47,7 +47,6 @@
 #include <sys/mbuf.h>
 #include <sys/fcntl.h>
 #include <sys/disklabel.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index e2421ed..6972bb3 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vfsops.c	8.11 (Berkeley) 6/19/95
- * $Id: mfs_vfsops.c,v 1.27 1997/03/05 01:57:54 msmith Exp $
+ * $Id: mfs_vfsops.c,v 1.28 1997/03/22 03:59:46 bde Exp $
  */
 
 #include <sys/param.h>
@@ -44,7 +44,6 @@
 #include <sys/mbuf.h>
 #include <sys/file.h>
 #include <sys/disklabel.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/signalvar.h>
 #include <sys/vnode.h>