diff --git a/sys/arch/i386/isa/ahc_isa.c b/sys/arch/i386/isa/ahc_isa.c
index 9175d9d0c77b..1483fdc69999 100644
--- a/sys/arch/i386/isa/ahc_isa.c
+++ b/sys/arch/i386/isa/ahc_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_isa.c,v 1.13 2000/03/15 02:05:19 fvdl Exp $	*/
+/*	$NetBSD: ahc_isa.c,v 1.14 2000/09/24 12:37:04 jdolecek Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -122,6 +122,7 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
+#include <sys/reboot.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
@@ -142,16 +143,6 @@
 #include <dev/ic/aic77xxvar.h>
 #include <dev/ic/smc93cx6var.h>
 
-/*
- * Under normal circumstances, these messages are unnecessary
- * and not terribly cosmetic.
- */
-#ifdef DEBUG
-#define bootverbose	1
-#else
-#define bootverbose	1
-#endif
-
 /* IO port address setting range as EISA slot number */
 #define AHC_ISA_MIN_SLOT	0x1	/* from iobase = 0x1c00 */
 #define AHC_ISA_MAX_SLOT	0xe	/* to   iobase = 0xec00 */
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index ca674ad0c0a0..d201f863da5b 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_eisa.c,v 1.18 2000/03/15 02:04:43 fvdl Exp $	*/
+/*	$NetBSD: ahc_eisa.c,v 1.19 2000/09/24 12:37:04 jdolecek Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -35,6 +35,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
+#include <sys/reboot.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
@@ -52,16 +53,6 @@
 #include <dev/ic/aic77xxreg.h>
 #include <dev/ic/aic77xxvar.h>
 
-/*
- * Under normal circumstances, these messages are unnecessary
- * and not terribly cosmetic.
- */
-#ifdef DEBUG
-#define bootverbose	1
-#else
-#define bootverbose	1
-#endif
-
 int	ahc_eisa_match __P((struct device *, struct cfdata *, void *));
 void	ahc_eisa_attach __P((struct device *, struct device *, void *));
 
diff --git a/sys/dev/ic/aic7xxx_seeprom.c b/sys/dev/ic/aic7xxx_seeprom.c
index c915fb6764cb..045a30bf2419 100644
--- a/sys/dev/ic/aic7xxx_seeprom.c
+++ b/sys/dev/ic/aic7xxx_seeprom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic7xxx_seeprom.c,v 1.3 2000/06/06 17:29:40 soren Exp $	*/
+/*	$NetBSD: aic7xxx_seeprom.c,v 1.4 2000/09/24 12:37:03 jdolecek Exp $	*/
 
 /*       
  * Product specific probe and attach routines for: 
@@ -45,6 +45,7 @@ $
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/device.h>
+#include <sys/reboot.h>		/* for AB_* needed by bootverbose */
 
 #include <machine/bus.h>
 #include <machine/intr.h>
@@ -57,12 +58,6 @@ $
 #include <dev/ic/aic7xxxvar.h>
 #include <dev/ic/smc93cx6var.h>
 
-#ifdef DEBUG
-#define bootverbose 1
-#else
-#define bootverbose 0
-#endif
-
 static void configure_termination(struct ahc_softc *,
 				  struct seeprom_descriptor *, u_int, u_int *);
 
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index 3ca08c8fe114..e3d418d2e26c 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_pci.c,v 1.26 2000/09/04 20:21:30 soren Exp $	*/
+/*	$NetBSD: ahc_pci.c,v 1.27 2000/09/24 12:37:03 jdolecek Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -41,6 +41,7 @@
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/device.h>
+#include <sys/reboot.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
@@ -65,12 +66,6 @@
 
 #include <dev/microcode/aic7xxx/aic7xxx_reg.h>
 
-#ifdef DEBUG
-#define bootverbose 1
-#else
-#define bootverbose 1
-#endif
-
 struct ahc_pci_busdata {
 	pci_chipset_tag_t pc;
 	pcitag_t tag;
diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h
index 9229cfed3682..34d07f86f95f 100644
--- a/sys/dev/pci/bktr/bktr_reg.h
+++ b/sys/dev/pci/bktr/bktr_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bktr_reg.h,v 1.6 2000/09/03 02:01:32 wiz Exp $	*/
+/*	$NetBSD: bktr_reg.h,v 1.7 2000/09/24 12:37:04 jdolecek Exp $	*/
 
 /*
  * FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.38 2000/06/26 09:41:32 roger Exp
@@ -51,11 +51,7 @@
 #include <machine/bus.h>		/* struct device */
 #include <sys/device.h>
 #include <sys/select.h>			/* struct selinfo */
-# ifdef DEBUG
-#  define	bootverbose 1
-# else
-#  define	bootverbose 0
-# endif
+#include <sys/reboot.h>			/* AB_* for bootverbose */
 #endif
 
 /*
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index e1b70a5cc18a..4b8989a0a049 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.8 2000/03/30 12:45:35 augustss Exp $ */
+/* $NetBSD: if_ti.c,v 1.9 2000/09/24 12:37:03 jdolecek Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -93,6 +93,7 @@
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/device.h>
+#include <sys/reboot.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -128,8 +129,6 @@
 /*#define TI_CSUM_OFFLOAD*/
 #endif
 
-#define bootverbose 1
-
 /*
  * Various supported device vendors/types and their names.
  */
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 083b139c8c86..48e6be992982 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr.c,v 1.103 2000/06/28 16:08:47 mrg Exp $	*/
+/*	$NetBSD: ncr.c,v 1.104 2000/09/24 12:37:03 jdolecek Exp $	*/
 
 /**************************************************************************
 **
@@ -214,7 +214,7 @@
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #ifdef __NetBSD__
-#define bootverbose	1
+#include <sys/reboot.h>
 #endif
 #ifndef __NetBSD__
 #include <sys/sysctl.h>
@@ -1538,7 +1538,7 @@ static	int	read_tekram_eeprom
 
 #if 0
 static char ident[] =
-	"\n$NetBSD: ncr.c,v 1.103 2000/06/28 16:08:47 mrg Exp $\n";
+	"\n$NetBSD: ncr.c,v 1.104 2000/09/24 12:37:03 jdolecek Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -5449,7 +5449,7 @@ void ncr_init (ncb_p np, char * msg, u_long code)
 	OUTB (nc_stest3, TE     );	/*  TolerANT enable		     */
 	OUTB (nc_stime0, 0x0b	);	/*  HTH = disabled, STO = 0.1 sec.   */
 
-	if (bootverbose >= 2) {
+	if (bootverbose) {
 		printf ("\tACTUAL values:SCNTL3:%02x DMODE:%02x  DCNTL:%02x\n",
 			np->rv_scntl3, np->rv_dmode, np->rv_dcntl);
 		printf ("\t              CTEST3:%02x CTEST4:%02x CTEST5:%02x\n",