you probably don't need to include vnode.h or reboot.h. you most definitely

absolutely do not need to include vnode.h because it includes uvm_extern.h
and you want the idiotic TRUE FALSE defines from uvm.

14 files changed, 25 insertions, 39 deletions

diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 98f869d1f28..9a9bf954d20 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.96 2012/03/01 08:49:22 ratchov Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.97 2013/03/28 03:31:55 tedu Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -45,10 +45,8 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/reboot.h>			/* for bootverbose */
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 
@@ -1426,7 +1424,7 @@ uaudio_io_terminaltype(int outtype, struct io_terminal *iot, int id)
 		}
 		it->output->terminals[0] = outtype;
 		it->output->size = 1;
-		it->direct = FALSE;
+		it->direct = 0;
 	}
 
 	switch (it->d.desc->bDescriptorSubtype) {
@@ -1467,7 +1465,7 @@ uaudio_io_terminaltype(int outtype, struct io_terminal *iot, int id)
 		src_id = it->d.ot->bSourceId;
 		it->inputs[0] = uaudio_io_terminaltype(outtype, iot, src_id);
 		it->inputs_size = 1;
-		iot[src_id].direct = TRUE;
+		iot[src_id].direct = 1;
 		return NULL;
 	case UDESCSUB_AC_MIXER:
 		it->inputs_size = 0;
@@ -1704,18 +1702,18 @@ uaudio_process_as(struct uaudio_softc *sc, const char *buf, int *offsp,
 	type = UE_GET_ISO_TYPE(ed->bmAttributes);
 
 	/* Check for sync endpoint. */
-	sync = FALSE;
+	sync = 0;
 	sync_addr = 0;
 	if (id->bNumEndpoints > 1 &&
 	    ((dir == UE_DIR_IN && type == UE_ISO_ADAPT) ||
 	    (dir != UE_DIR_IN && type == UE_ISO_ASYNC)))
-		sync = TRUE;
+		sync = 1;
 
 	/* Check whether sync endpoint address is given. */
 	if (ed->bLength >= USB_ENDPOINT_DESCRIPTOR_AUDIO_SIZE) {
 		/* bSynchAdress set to 0 indicates sync is not used. */
 		if (ed->bSynchAddress == 0)
-			sync = FALSE;
+			sync = 0;
 		else
 			sync_addr = ed->bSynchAddress;
 	}
@@ -1730,7 +1728,7 @@ uaudio_process_as(struct uaudio_softc *sc, const char *buf, int *offsp,
 		return (USBD_INVAL);
 
 	sync_ed = NULL;
-	if (sync == TRUE) {
+	if (sync == 1) {
 		sync_ed = (const void*)(buf + offs);
 		if (sync_ed->bDescriptorType != UDESC_ENDPOINT) {
 			printf("%s: sync ep descriptor wrong type\n",
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index d59eefaff4a..e5f67683ffe 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.54 2012/12/05 23:20:21 deraadt Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.55 2013/03/28 03:31:55 tedu Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -66,7 +66,6 @@
 #include <sys/file.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/poll.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index ca807d9dd96..f8aa9e43eab 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucycom.c,v 1.20 2011/07/03 15:47:17 matthew Exp $	*/
+/*	$OpenBSD: ucycom.c,v 1.21 2013/03/28 03:31:55 tedu Exp $	*/
 /*	$NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $	*/
 
 /*
@@ -46,7 +46,6 @@
 #include <sys/device.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/vnode.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index 0f1d4ff6d5c..88bf615ca7d 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udcf.c,v 1.54 2011/07/03 15:47:17 matthew Exp $ */
+/*	$OpenBSD: udcf.c,v 1.55 2013/03/28 03:31:55 tedu Exp $ */
 
 /*
  * Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -23,7 +23,6 @@
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 #include <sys/time.h>
diff --git a/sys/dev/usb/uhts.c b/sys/dev/usb/uhts.c
index a01ccc21d3a..bf9e5a0cf7a 100644
--- a/sys/dev/usb/uhts.c
+++ b/sys/dev/usb/uhts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhts.c,v 1.4 2011/07/03 15:47:17 matthew Exp $ */
+/*	$OpenBSD: uhts.c,v 1.5 2013/03/28 03:31:55 tedu Exp $ */
 /*
  * Copyright (c) 2009 Matthieu Herrb <matthieu@herrb.eu>
  * Copyright (c) 2007 Robert Nagy <robert@openbsd.org>
@@ -54,7 +54,6 @@
 #include <sys/file.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/poll.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/umbg.c b/sys/dev/usb/umbg.c
index bea02ce9709..80243cb611f 100644
--- a/sys/dev/usb/umbg.c
+++ b/sys/dev/usb/umbg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umbg.c,v 1.17 2011/07/03 15:47:17 matthew Exp $ */
+/*	$OpenBSD: umbg.c,v 1.18 2013/03/28 03:31:55 tedu Exp $ */
 
 /*
  * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -23,10 +23,8 @@
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
-#include <sys/syslog.h>
 #include <sys/time.h>
 #include <sys/sensors.h>
 
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 9ede748857f..94f6a06057f 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.33 2011/07/03 15:47:17 matthew Exp $	*/
+/*	$OpenBSD: umct.c,v 1.34 2013/03/28 03:31:55 tedu Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,6 @@
 #include <sys/file.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 73ac99ef278..9fdec4f5ad0 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi.c,v 1.33 2012/03/30 08:18:19 ratchov Exp $	*/
+/*	$OpenBSD: umidi.c,v 1.34 2013/03/28 03:31:55 tedu Exp $	*/
 /*	$NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,6 @@
 #include <sys/file.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/poll.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c
index 0f1e1458d0b..5d82657f09e 100644
--- a/sys/dev/usb/umidi_quirks.c
+++ b/sys/dev/usb/umidi_quirks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi_quirks.c,v 1.10 2012/02/28 23:53:02 jsg Exp $	*/
+/*	$OpenBSD: umidi_quirks.c,v 1.11 2013/03/28 03:31:55 tedu Exp $	*/
 /*	$NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 #include <sys/file.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/poll.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 2300b905ae3..292729890f5 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.45 2012/02/09 01:16:39 jsg Exp $ */
+/*	$OpenBSD: umodem.c,v 1.46 2013/03/28 03:31:55 tedu Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
 #include <sys/file.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index e1a1de762ef..ae2964b04cc 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.56 2011/07/03 15:47:17 matthew Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.57 2013/03/28 03:31:55 tedu Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,6 @@
 #include <sys/file.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 2f678e51bc6..895923efa09 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.82 2013/03/16 09:58:40 mpi Exp $	*/
+/*	$OpenBSD: usb.c,v 1.83 2013/03/28 03:31:56 tedu Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
 #include <sys/fcntl.h>
 #include <sys/poll.h>
 #include <sys/selinfo.h>
-#include <sys/vnode.h>
 #include <sys/signalvar.h>
 #include <sys/time.h>
 
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 0d6c1fe6b5e..5f71f7d867d 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvideo.c,v 1.167 2012/06/18 15:43:30 mpi Exp $ */
+/*	$OpenBSD: uvideo.c,v 1.168 2013/03/28 03:31:56 tedu Exp $ */
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -25,18 +25,16 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/reboot.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
-#include <sys/namei.h>
-#include <sys/vnode.h>
 #include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 #include <sys/timeout.h>
 #include <sys/kthread.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
@@ -132,6 +130,9 @@ usbd_status	uvideo_usb_control(struct uvideo_softc *sc, uint8_t rt, uint8_t r,
 		    uint16_t value, uint8_t *data, size_t length);
 
 #ifdef UVIDEO_DEBUG
+#include <sys/namei.h>
+#include <sys/vnode.h>
+
 void		uvideo_dump_desc_all(struct uvideo_softc *);
 void		uvideo_dump_desc_vc_header(struct uvideo_softc *,
 		    const usb_descriptor_t *);
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 328eea456a5..1ea24a36fbe 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvscom.c,v 1.24 2011/07/03 15:47:18 matthew Exp $ */
+/*	$OpenBSD: uvscom.c,v 1.25 2013/03/28 03:31:56 tedu Exp $ */
 /*	$NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -46,7 +46,6 @@
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/poll.h>
 
 #include <dev/usb/usb.h>