Turn DIAGNOSTIC into a new-style option.

155 files changed, 391 insertions, 132 deletions

diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index cba303ae3e65..c051291d4686 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -25,9 +25,11 @@
  * (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_sysvec.c,v 1.20 1997/11/06 19:29:04 phk Exp $
+ *  $Id: linux_sysvec.c,v 1.21 1997/12/16 17:40:12 eivind Exp $
  */
 
+#include "opt_diagnostic.h"
+
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
 
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index 5f66ab929e1a..d085d317d19d 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -23,9 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $Id: busdma_machdep.c,v 1.1 1998/01/15 07:32:20 gibbs Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 552aac8b2861..eb859e8f6f9f 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,10 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.65 1997/12/14 02:11:13 dyson Exp $
+ *	$Id: swtch.s,v 1.66 1997/12/15 02:18:24 tegge Exp $
  */
 
 #include "npx.h"
+#include "opt_diagnostic.h"
 #include "opt_user_ldt.h"
 #include "opt_vm86.h"
 
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index fd39500f4035..abb61edc80c5 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.285 1998/01/30 10:26:20 dyson Exp $
+ *	$Id: machdep.c,v 1.286 1998/02/03 21:27:46 bde Exp $
  */
 
 #include "apm.h"
@@ -43,6 +43,7 @@
 #include "opt_bounce.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
+#include "opt_diagnostic.h"
 #include "opt_maxmem.h"
 #include "opt_perfmon.h"
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 777812fa45c2..c12a276fac7e 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.179 1998/01/31 11:55:41 dyson Exp $
+ *	$Id: pmap.c,v 1.180 1998/02/03 22:09:01 bde Exp $
  */
 
 /*
@@ -68,6 +68,7 @@
  *	and to when physical maps must be made correct.
  */
 
+#include "opt_diagnostic.h"
 #include "opt_disable_pse.h"
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 552aac8b2861..eb859e8f6f9f 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,10 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.65 1997/12/14 02:11:13 dyson Exp $
+ *	$Id: swtch.s,v 1.66 1997/12/15 02:18:24 tegge Exp $
  */
 
 #include "npx.h"
+#include "opt_diagnostic.h"
 #include "opt_user_ldt.h"
 #include "opt_vm86.h"
 
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index a51c7ee8f19c..8d7bd9efe1f2 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.119 1997/12/06 04:11:01 sef Exp $
+ *	$Id: trap.c,v 1.120 1998/01/31 05:00:15 eivind Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 
 #include "opt_cpu.h"
 #include "opt_ddb.h"
+#include "opt_diagnostic.h"
 #include "opt_ktrace.h"
 #include "opt_trap.h"
 #include "opt_vm86.h"
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 5f0d7b3adc03..be470d697846 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,11 +38,12 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.96 1998/01/22 17:29:32 dyson Exp $
+ *	$Id: vm_machdep.c,v 1.97 1998/01/30 10:26:26 dyson Exp $
  */
 
 #include "npx.h"
 #include "opt_bounce.h"
+#include "opt_diagnostic.h"
 #include "opt_user_ldt.h"
 #include "opt_vm86.h"
 
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 3f9440de1a6d..f9a63bf21e29 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.108 1997/11/30 09:44:28 jmg Exp $
+ *	$Id: isa.c,v 1.109 1998/01/31 03:29:00 eivind Exp $
  */
 
 /*
@@ -47,6 +47,8 @@
  * isa_dmastart()
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/conf/options b/sys/conf/options
index 0b15401a08a5..6cc3ffa57290 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.56 1998/02/04 04:12:27 eivind Exp $
+#	$Id: options,v 1.57 1998/02/04 04:41:34 eivind Exp $
 
 # Format:
 # Option name	filename
@@ -13,6 +13,7 @@ DDB_UNATTENDED	opt_ddb.h
 GDB_REMOTE_CHAT	opt_ddb.h
 DEVFS
 DEVFS_ROOT	opt_devfs.h
+DIAGNOSTIC
 FAILSAFE
 KTRACE
 MD5
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 7f9e8385066d..35857e6cd8c1 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -218,6 +218,7 @@
 
 #ifdef __FreeBSD__
 #include "bktr.h"
+#include "opt_diagnostic.h"
 #include "pci.h"
 #endif /* __FreeBSD__ */
 
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index a822ea4946c2..c9dbc182c51a 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $	*/
-/*	$Id: if_de.c,v 1.76 1997/12/15 20:31:25 eivind Exp $ */
+/*	$Id: if_de.c,v 1.77 1998/01/08 23:42:24 eivind Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -39,6 +39,7 @@
  */
 #define	TULIP_HDR_DATA
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 3f72f969226f..ad23ffd02db7 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.129 1997/11/20 15:48:27 nate Exp $
+ *	$Id: if_ed.c,v 1.130 1998/01/08 23:40:45 eivind Exp $
  */
 
 /*
@@ -39,6 +39,7 @@
 
 #include "ed.h"
 #include "bpfilter.h"
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index b4945e0375fa..81d5a606eaf2 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.69 1997/12/15 20:30:43 eivind Exp $
+ *  $Id: if_ep.c,v 1.70 1998/01/08 23:40:50 eivind Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -60,6 +60,7 @@
 #if NEP > 0
 
 #include "bpfilter.h"
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 71d9934a3bbf..4c3e1c8c17f1 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -65,6 +65,7 @@
 #if NLNC > 0
 
 #include "bpfilter.h"
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 /* Some defines that should really be in generic locations */
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 7bfb635ce5ba..40aa418cf678 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -19,6 +19,7 @@
 
 #include "opt_compat.h"
 #include "opt_devfs.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 8464191a847e..5391eb6c5c7b 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.21 1997/10/16 10:47:36 phk Exp $
+ * $Id: cd9660_node.c,v 1.22 1997/11/18 14:40:30 phk Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 358e540598c9..63686e79eff2 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.40 1997/12/13 13:49:59 bde Exp $
+ * $Id: fifo_vnops.c,v 1.41 1997/12/19 18:58:14 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/unistd.h>
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index fc2d3dba2ab3..cddd89563516 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.27 1997/10/11 18:31:30 phk Exp $ */
+/*	$Id: msdosfs_denode.c,v 1.28 1997/10/12 20:24:59 phk Exp $ */
 /*	$NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $	*/
 
 /*-
@@ -48,6 +48,8 @@
  * October 1992
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 9a3f5d73b79a..5a06a3817ada 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.12 1997/02/22 09:40:47 peter Exp $ */
+/*	$Id: msdosfs_fat.c,v 1.13 1997/09/02 20:06:16 bde Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $	*/
 
 /*-
@@ -49,6 +49,11 @@
  */
 
 /*
+ * Option include files
+ */
+#include "opt_diagnostic.h"
+
+/*
  * kernel include files.
  */
 #include <sys/param.h>
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 78aa73034068..d63cbab0cfba 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.52 1997/10/27 13:33:43 bde Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.53 1997/12/27 02:56:31 bde Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -48,6 +48,8 @@
  * October 1992
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 64ed7e6eb2d8..99320997c47b 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -35,10 +35,11 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $Id: null_subr.c,v 1.13 1997/08/28 00:44:43 kato Exp $
+ * $Id: null_subr.c,v 1.14 1998/01/31 07:23:12 eivind Exp $
  */
 
 #include "opt_debug_nullfs.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 7ffb40dadbbf..bfb97d66c762 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.21 1998/01/01 08:28:05 bde Exp $
+ * $Id: null_vfsops.c,v 1.22 1998/01/31 07:23:12 eivind Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
  * (See null_vnops.c for a description of what this does.)
  */
 
+#include "opt_diagnostic.h"
 #include "opt_debug_nullfs.h"
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 7033e1cea7ba..55d003a9ba6f 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -36,9 +36,11 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id: procfs_map.c,v 1.13 1997/11/14 22:57:46 tegge Exp $
+ *	$Id: procfs_map.c,v 1.14 1998/01/06 05:19:54 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index c5ad55aa964d..009476d96e61 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- *	$Id: procfs_mem.c,v 1.27 1997/08/12 04:34:28 sef Exp $
+ *	$Id: procfs_mem.c,v 1.28 1998/01/22 17:30:01 dyson Exp $
  */
 
 /*
@@ -45,6 +45,8 @@
  * of sef's pread/pwrite functions
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 00cca893ed16..85fd031e3da0 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,13 +36,15 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.51 1998/01/06 01:37:12 sef Exp $
+ *	$Id: procfs_vnops.c,v 1.52 1998/01/06 05:19:58 dyson Exp $
  */
 
 /*
  * procfs vnode interface
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 3bad030f8a51..9d27a4cc96b2 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.52 1997/12/29 00:23:16 dyson Exp $
+ * $Id: spec_vnops.c,v 1.53 1998/01/06 05:21:23 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 35932ceeb01d..cddfcaa17d0e 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,9 +35,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.24 1998/01/20 10:02:52 kato Exp $
+ * $Id: union_subr.c,v 1.25 1998/01/25 09:44:33 kato Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 90da301e8a7b..e4094dd87223 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,13 +35,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.22 1997/11/18 15:07:35 phk Exp $
+ * $Id: union_vfsops.c,v 1.23 1998/01/18 07:56:41 kato Exp $
  */
 
 /*
  * Union Layer
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index f0c4a8eef612..b3441ef5c91e 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,9 +35,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.49 1998/01/20 10:02:54 kato Exp $
+ * $Id: union_vnops.c,v 1.50 1998/01/22 02:14:59 kato Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index cfd4ac93927f..541aa2d334db 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -39,6 +39,7 @@
  *	@(#)ext2_alloc.c	8.8 (Berkeley) 2/21/94
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_balloc.c b/sys/gnu/ext2fs/ext2_balloc.c
index 3d871239956c..f7ea491efe87 100644
--- a/sys/gnu/ext2fs/ext2_balloc.c
+++ b/sys/gnu/ext2fs/ext2_balloc.c
@@ -39,6 +39,8 @@
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 4cab09998210..b4af4bf5ed5f 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.17 1997/11/24 16:33:03 bde Exp $
+ * $Id: ufs_bmap.c,v 1.18 1998/01/24 02:01:41 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index 644f47a9dfc1..8729f62a75d6 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.12 1997/10/15 07:32:45 bde Exp $
+ * $Id: ufs_ihash.c,v 1.13 1997/12/05 19:55:51 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index 5231fececfad..07f81b0f4213 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -39,6 +39,7 @@
  *	@(#)ext2_inode.c	8.5 (Berkeley) 12/30/93
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index dc70c76a10c9..e4d9fef375ef 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -44,6 +44,8 @@
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index a70e445b0ee4..462f72795d1b 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -39,6 +39,8 @@
  *	@(#)ext2_subr.c	8.2 (Berkeley) 9/21/93
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 #include <gnu/ext2fs/fs.h>
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index 91a89c903885..3c746844cb44 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -45,6 +45,7 @@
  *	@(#)ext2_vnops.c	8.7 (Berkeley) 2/3/94
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 #include "opt_suiddir.h"
 
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index cfd4ac93927f..541aa2d334db 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -39,6 +39,7 @@
  *	@(#)ext2_alloc.c	8.8 (Berkeley) 2/21/94
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_balloc.c b/sys/gnu/fs/ext2fs/ext2_balloc.c
index 3d871239956c..f7ea491efe87 100644
--- a/sys/gnu/fs/ext2fs/ext2_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_balloc.c
@@ -39,6 +39,8 @@
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 4cab09998210..b4af4bf5ed5f 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.17 1997/11/24 16:33:03 bde Exp $
+ * $Id: ufs_bmap.c,v 1.18 1998/01/24 02:01:41 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 5231fececfad..07f81b0f4213 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -39,6 +39,7 @@
  *	@(#)ext2_inode.c	8.5 (Berkeley) 12/30/93
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index dc70c76a10c9..e4d9fef375ef 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -44,6 +44,8 @@
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index a70e445b0ee4..462f72795d1b 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -39,6 +39,8 @@
  *	@(#)ext2_subr.c	8.2 (Berkeley) 9/21/93
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 #include <gnu/ext2fs/fs.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 91a89c903885..3c746844cb44 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -45,6 +45,7 @@
  *	@(#)ext2_vnops.c	8.7 (Berkeley) 2/3/94
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 #include "opt_suiddir.h"
 
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 5f66ab929e1a..d085d317d19d 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -23,9 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $Id: busdma_machdep.c,v 1.1 1998/01/15 07:32:20 gibbs Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index fd39500f4035..abb61edc80c5 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.285 1998/01/30 10:26:20 dyson Exp $
+ *	$Id: machdep.c,v 1.286 1998/02/03 21:27:46 bde Exp $
  */
 
 #include "apm.h"
@@ -43,6 +43,7 @@
 #include "opt_bounce.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
+#include "opt_diagnostic.h"
 #include "opt_maxmem.h"
 #include "opt_perfmon.h"
 #include "opt_smp.h"
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 777812fa45c2..c12a276fac7e 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.179 1998/01/31 11:55:41 dyson Exp $
+ *	$Id: pmap.c,v 1.180 1998/02/03 22:09:01 bde Exp $
  */
 
 /*
@@ -68,6 +68,7 @@
  *	and to when physical maps must be made correct.
  */
 
+#include "opt_diagnostic.h"
 #include "opt_disable_pse.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 552aac8b2861..eb859e8f6f9f 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,10 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.65 1997/12/14 02:11:13 dyson Exp $
+ *	$Id: swtch.s,v 1.66 1997/12/15 02:18:24 tegge Exp $
  */
 
 #include "npx.h"
+#include "opt_diagnostic.h"
 #include "opt_user_ldt.h"
 #include "opt_vm86.h"
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index a51c7ee8f19c..8d7bd9efe1f2 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.119 1997/12/06 04:11:01 sef Exp $
+ *	$Id: trap.c,v 1.120 1998/01/31 05:00:15 eivind Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 
 #include "opt_cpu.h"
 #include "opt_ddb.h"
+#include "opt_diagnostic.h"
 #include "opt_ktrace.h"
 #include "opt_trap.h"
 #include "opt_vm86.h"
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index dc844389d586..3698c5698727 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -23,9 +23,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86.c,v 1.5 1997/11/20 18:43:46 bde Exp $
+ *	$Id: vm86.c,v 1.6 1998/02/03 21:27:47 bde Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_vm86.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 5f0d7b3adc03..be470d697846 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,11 +38,12 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.96 1998/01/22 17:29:32 dyson Exp $
+ *	$Id: vm_machdep.c,v 1.97 1998/01/30 10:26:26 dyson Exp $
  */
 
 #include "npx.h"
 #include "opt_bounce.h"
+#include "opt_diagnostic.h"
 #include "opt_user_ldt.h"
 #include "opt_vm86.h"
 
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index ba9c12f24c06..5af6f1c60889 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.c
@@ -29,6 +29,8 @@
  *	ibcs2_sysi86.c,v 1.1 1994/10/14 08:53:11 sos Exp
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 5c9b64bf97bd..f818aad6e03d 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.71 1997/09/21 21:40:49 gibbs Exp $
+ *      $Id: aha1542.c,v 1.72 1997/11/18 10:56:41 bde Exp $
  */
 
 /*
@@ -20,6 +20,7 @@
  */
 
 #include "aha.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/buf.h>
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 3f72f969226f..ad23ffd02db7 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.129 1997/11/20 15:48:27 nate Exp $
+ *	$Id: if_ed.c,v 1.130 1998/01/08 23:40:45 eivind Exp $
  */
 
 /*
@@ -39,6 +39,7 @@
 
 #include "ed.h"
 #include "bpfilter.h"
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index b4945e0375fa..81d5a606eaf2 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.69 1997/12/15 20:30:43 eivind Exp $
+ *  $Id: if_ep.c,v 1.70 1998/01/08 23:40:50 eivind Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -60,6 +60,7 @@
 #if NEP > 0
 
 #include "bpfilter.h"
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 71d9934a3bbf..4c3e1c8c17f1 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -65,6 +65,7 @@
 #if NLNC > 0
 
 #include "bpfilter.h"
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 /* Some defines that should really be in generic locations */
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 3f9440de1a6d..f9a63bf21e29 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.108 1997/11/30 09:44:28 jmg Exp $
+ *	$Id: isa.c,v 1.109 1998/01/31 03:29:00 eivind Exp $
  */
 
 /*
@@ -47,6 +47,8 @@
  * isa_dmastart()
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index d34c01bf5721..5a551cf8e95f 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -64,6 +64,8 @@
 #include "vt.h"
 #if NVT > 0
 
+#include "opt_diagnostic.h"
+
 #include <i386/isa/pcvt/pcvt_hdr.h>	/* global include */
 
 static void vid_cursor ( struct cursorshape *data );
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index cba303ae3e65..c051291d4686 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,9 +25,11 @@
  * (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_sysvec.c,v 1.20 1997/11/06 19:29:04 phk Exp $
+ *  $Id: linux_sysvec.c,v 1.21 1997/12/16 17:40:12 eivind Exp $
  */
 
+#include "opt_diagnostic.h"
+
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
 
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 8464191a847e..5391eb6c5c7b 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.21 1997/10/16 10:47:36 phk Exp $
+ * $Id: cd9660_node.c,v 1.22 1997/11/18 14:40:30 phk Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 7cdb77ac71d5..db6df3a12eea 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,10 +39,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.80 1998/01/22 17:29:44 dyson Exp $
+ * $Id: init_main.c,v 1.81 1998/01/30 11:32:52 phk Exp $
  */
 
 #include "opt_devfs.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 4d482e8235d4..f33268d99592 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.52 1998/01/11 19:07:58 phk Exp $
+ * $Id: kern_clock.c,v 1.53 1998/01/14 20:48:15 phk Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/dkstat.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 40b021b8cd95..aaeee7223a3a 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.47 1997/12/16 17:40:14 eivind Exp $
+ * $Id: kern_descrip.c,v 1.48 1998/01/24 02:54:34 eivind Exp $
  */
 
 #include "opt_compat.h"
+#include "opt_diagnostic.h"
 #include "opt_devfs.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 76cbb934bf8d..cc62bc375ec5 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,9 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.73 1998/01/06 05:15:34 dyson Exp $
+ *	$Id: kern_exec.c,v 1.74 1998/01/11 21:35:38 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index c14cc93f138d..8db4a6b0a21a 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -38,9 +38,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_lock.c	8.18 (Berkeley) 5/21/95
- * $Id: kern_lock.c,v 1.13 1997/10/28 15:58:19 bde Exp $
+ * $Id: kern_lock.c,v 1.14 1997/11/07 08:52:55 phk Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 02be8ceb2143..cf23124c828b 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.38 1997/12/05 05:36:36 dyson Exp $
+ * $Id: kern_malloc.c,v 1.39 1998/01/22 17:29:47 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 40b99be039a9..fb6373b8b27d 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.31 1998/01/22 17:29:48 dyson Exp $
+ * $Id: kern_proc.c,v 1.32 1998/02/02 05:14:03 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index f76f1c530dc6..1b6e09354925 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.36 1997/12/06 04:11:10 sef Exp $
+ * $Id: kern_sig.c,v 1.37 1997/12/16 17:40:17 eivind Exp $
  */
 
 #include "opt_compat.h"
+#include "opt_diagnostic.h"
 #include "opt_ktrace.h"
 
 #define	SIGPROP		/* include signal properties table */
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index de1bf7d327c9..d762ac43285b 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_subr.c,v 1.15 1998/01/06 05:15:41 dyson Exp $
+ * $Id: kern_subr.c,v 1.16 1998/01/22 17:29:49 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 3f203eb65e8f..5ac7276d6ba6 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,9 +36,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
- * $Id: kern_synch.c,v 1.43 1997/12/29 00:22:26 dyson Exp $
+ * $Id: kern_synch.c,v 1.44 1997/12/29 08:54:52 bde Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 4d482e8235d4..f33268d99592 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.52 1998/01/11 19:07:58 phk Exp $
+ * $Id: kern_clock.c,v 1.53 1998/01/14 20:48:15 phk Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/dkstat.h>
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index 3a61debcadac..e7011a5a07d8 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,9 +54,11 @@
  * functioning of this software, nor does the author assume any responsibility
  * for damages incurred with its use.
  *
- *	$Id: subr_rlist.c,v 1.22 1997/09/02 20:05:51 bde Exp $
+ *	$Id: subr_rlist.c,v 1.23 1997/09/16 11:43:31 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/rlist.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index a51c7ee8f19c..8d7bd9efe1f2 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.119 1997/12/06 04:11:01 sef Exp $
+ *	$Id: trap.c,v 1.120 1998/01/31 05:00:15 eivind Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 
 #include "opt_cpu.h"
 #include "opt_ddb.h"
+#include "opt_diagnostic.h"
 #include "opt_ktrace.h"
 #include "opt_trap.h"
 #include "opt_vm86.h"
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index aaae9b36d598..b868ba5f1272 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.35 1997/11/06 19:29:21 phk Exp $
+ * $Id: sys_pipe.c,v 1.36 1997/11/07 08:53:00 phk Exp $
  */
 
 /*
@@ -49,6 +49,8 @@
  * amount of kernel virtual memory.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index ac779bcaefbe..b1ee84d98b58 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,9 +28,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sys_process.c,v 1.33 1997/12/06 04:11:10 sef Exp $
+ *	$Id: sys_process.c,v 1.34 1998/01/22 17:29:49 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 7bfb635ce5ba..40aa418cf678 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -19,6 +19,7 @@
 
 #include "opt_compat.h"
 #include "opt_devfs.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index b418677eab1c..4289d0ecd9f3 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- *	$Id: uipc_socket.c,v 1.33 1997/10/12 20:24:12 phk Exp $
+ *	$Id: uipc_socket.c,v 1.34 1997/11/09 05:07:40 jkh Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 3787119f552d..8d2f92881f24 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.29 1997/11/07 08:53:02 phk Exp $
+ *	$Id: uipc_usrreq.c,v 1.30 1997/11/23 10:43:49 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index e0e769e912ef..36570edb005b 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,13 +13,15 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.19 1997/12/08 02:18:25 dyson Exp $
+ * $Id: vfs_aio.c,v 1.20 1997/12/10 04:14:23 dyson Exp $
  */
 
 /*
  * This file contains support for the POSIX.4 AIO/LIO facility.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 953dfae0f150..426c3ba417db 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *		John S. Dyson.
  *
- * $Id: vfs_bio.c,v 1.146 1998/01/25 06:24:01 dyson Exp $
+ * $Id: vfs_bio.c,v 1.147 1998/01/31 11:55:59 dyson Exp $
  */
 
 /*
@@ -26,6 +26,7 @@
  */
 
 #include "opt_bounce.h"
+#include "opt_diagnostic.h"
 
 #define VMIO
 #include <sys/param.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 880ca1f0dbdc..02d76102acfd 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,10 +33,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.52 1998/01/31 07:23:11 eivind Exp $
+ * $Id: vfs_cluster.c,v 1.53 1998/01/31 11:56:01 dyson Exp $
  */
 
 #include "opt_debug_cluster.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index a28662eecd2a..958bd71cdc84 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.126 1998/01/24 02:01:22 dyson Exp $
+ * $Id: vfs_subr.c,v 1.127 1998/01/31 01:17:58 tegge Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
  */
 #include "opt_ddb.h"
 #include "opt_devfs.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index b7be81ea4178..d59a3353a96a 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,12 +36,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.88 1997/12/29 00:22:50 dyson Exp $
+ * $Id: vfs_syscalls.c,v 1.89 1998/01/06 05:16:26 dyson Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
 #include "opt_compat.h"
 
+/* For diagnostic support */
+#include "opt_diagnostic.h"
+
 /*
  * XXX - The following is required because of some magic done 
  * in getdirentries() below which is only done if the translucent
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 31754fd24c12..a1b06162caca 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,9 +36,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.22 1997/12/29 00:22:38 dyson Exp $
+ * $Id: vfs_lookup.c,v 1.23 1998/01/06 05:16:09 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index a28662eecd2a..958bd71cdc84 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.126 1998/01/24 02:01:22 dyson Exp $
+ * $Id: vfs_subr.c,v 1.127 1998/01/31 01:17:58 tegge Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
  */
 #include "opt_ddb.h"
 #include "opt_devfs.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index b7be81ea4178..d59a3353a96a 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,12 +36,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.88 1997/12/29 00:22:50 dyson Exp $
+ * $Id: vfs_syscalls.c,v 1.89 1998/01/06 05:16:26 dyson Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
 #include "opt_compat.h"
 
+/* For diagnostic support */
+#include "opt_diagnostic.h"
+
 /*
  * XXX - The following is required because of some magic done 
  * in getdirentries() below which is only done if the translucent
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index f47de68f76a9..3a4a51437209 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.46 1998/01/06 05:16:32 dyson Exp $
+ * $Id: vfs_vnops.c,v 1.47 1998/01/12 01:46:33 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 358e540598c9..63686e79eff2 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.40 1997/12/13 13:49:59 bde Exp $
+ * $Id: fifo_vnops.c,v 1.41 1997/12/19 18:58:14 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/unistd.h>
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index 64ed7e6eb2d8..99320997c47b 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,10 +35,11 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $Id: null_subr.c,v 1.13 1997/08/28 00:44:43 kato Exp $
+ * $Id: null_subr.c,v 1.14 1998/01/31 07:23:12 eivind Exp $
  */
 
 #include "opt_debug_nullfs.h"
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 7ffb40dadbbf..bfb97d66c762 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.21 1998/01/01 08:28:05 bde Exp $
+ * $Id: null_vfsops.c,v 1.22 1998/01/31 07:23:12 eivind Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
  * (See null_vnops.c for a description of what this does.)
  */
 
+#include "opt_diagnostic.h"
 #include "opt_debug_nullfs.h"
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c
index 7033e1cea7ba..55d003a9ba6f 100644
--- a/sys/miscfs/procfs/procfs_map.c
+++ b/sys/miscfs/procfs/procfs_map.c
@@ -36,9 +36,11 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id: procfs_map.c,v 1.13 1997/11/14 22:57:46 tegge Exp $
+ *	$Id: procfs_map.c,v 1.14 1998/01/06 05:19:54 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index c5ad55aa964d..009476d96e61 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- *	$Id: procfs_mem.c,v 1.27 1997/08/12 04:34:28 sef Exp $
+ *	$Id: procfs_mem.c,v 1.28 1998/01/22 17:30:01 dyson Exp $
  */
 
 /*
@@ -45,6 +45,8 @@
  * of sef's pread/pwrite functions
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 00cca893ed16..85fd031e3da0 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,13 +36,15 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.51 1998/01/06 01:37:12 sef Exp $
+ *	$Id: procfs_vnops.c,v 1.52 1998/01/06 05:19:58 dyson Exp $
  */
 
 /*
  * procfs vnode interface
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 3bad030f8a51..9d27a4cc96b2 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.52 1997/12/29 00:23:16 dyson Exp $
+ * $Id: spec_vnops.c,v 1.53 1998/01/06 05:21:23 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 35932ceeb01d..cddfcaa17d0e 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,9 +35,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.24 1998/01/20 10:02:52 kato Exp $
+ * $Id: union_subr.c,v 1.25 1998/01/25 09:44:33 kato Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 90da301e8a7b..e4094dd87223 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,13 +35,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.22 1997/11/18 15:07:35 phk Exp $
+ * $Id: union_vfsops.c,v 1.23 1998/01/18 07:56:41 kato Exp $
  */
 
 /*
  * Union Layer
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index f0c4a8eef612..b3441ef5c91e 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,9 +35,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.49 1998/01/20 10:02:54 kato Exp $
+ * $Id: union_vnops.c,v 1.50 1998/01/22 02:14:59 kato Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index fc2d3dba2ab3..cddd89563516 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.27 1997/10/11 18:31:30 phk Exp $ */
+/*	$Id: msdosfs_denode.c,v 1.28 1997/10/12 20:24:59 phk Exp $ */
 /*	$NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $	*/
 
 /*-
@@ -48,6 +48,8 @@
  * October 1992
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index 9a3f5d73b79a..5a06a3817ada 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.12 1997/02/22 09:40:47 peter Exp $ */
+/*	$Id: msdosfs_fat.c,v 1.13 1997/09/02 20:06:16 bde Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $	*/
 
 /*-
@@ -49,6 +49,11 @@
  */
 
 /*
+ * Option include files
+ */
+#include "opt_diagnostic.h"
+
+/*
  * kernel include files.
  */
 #include <sys/param.h>
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 78aa73034068..d63cbab0cfba 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.52 1997/10/27 13:33:43 bde Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.53 1997/12/27 02:56:31 bde Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -48,6 +48,8 @@
  * October 1992
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/net/hostcache.c b/sys/net/hostcache.c
index 1c9cee853559..b516b144debe 100644
--- a/sys/net/hostcache.c
+++ b/sys/net/hostcache.c
@@ -26,9 +26,11 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hostcache.c,v 1.2 1997/10/12 20:25:06 phk Exp $
+ *	$Id: hostcache.c,v 1.3 1997/11/07 08:53:17 phk Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index b867188c9028..6990aacbfe0d 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $	*/
-/*	$Id: if_media.c,v 1.2 1997/05/03 20:58:10 peter Exp $ */
+/*	$Id: if_media.c,v 1.3 1997/08/02 14:32:38 bde Exp $ */
 
 /*
  * Copyright (c) 1997
@@ -46,6 +46,8 @@
  * to implement this interface.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index f24b5001ffd1..1bc6bdd1da08 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,9 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.45 1997/10/28 15:58:35 bde Exp $
+ *	$Id: route.c,v 1.46 1998/01/08 23:41:35 eivind Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_mrouting.h"
 
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index 1c60ef02d7f9..1db865a696a2 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -36,6 +36,7 @@
  * IP <=> ATM address resolution.
  */
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_natm.h"
 
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 2d9c9daf0d5f..231581c08b59 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: in_rmx.c,v 1.29 1997/02/14 18:15:45 wollman Exp $
+ *	$Id: in_rmx.c,v 1.30 1997/08/02 14:32:50 bde Exp $
  */
 
 /*
@@ -42,6 +42,8 @@
  *     indefinitely.  See in_rtqtimo() below for the exact mechanism.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 66ef08b774e4..6828b3f93ffe 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,9 +30,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ip_divert.c,v 1.17 1998/01/08 23:41:50 eivind Exp $
+ *	$Id: ip_divert.c,v 1.18 1998/01/27 09:15:06 davidg Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 #ifndef INET
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index a2295a8cbb92..6525e78baed6 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.72 1998/01/08 03:03:53 alex Exp $
+ *	$Id: ip_fw.c,v 1.73 1998/01/08 23:41:52 eivind Exp $
  */
 
 /*
@@ -20,6 +20,7 @@
  */
 
 #ifndef IPFIREWALL_MODULE
+#include "opt_diagnostic.h"
 #include "opt_ipfw.h"
 #include "opt_ipdivert.h"
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 504e86b88a57..456d7befcb16 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.72 1997/11/13 22:57:57 julian Exp $
+ * $Id: ip_input.c,v 1.73 1998/01/09 03:21:04 eivind Exp $
  *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
  */
 
 #define	_IP_VHL
 
 #include "opt_bootp.h"
+#include "opt_diagnostic.h"
 #include "opt_ipfw.h"
 #include "opt_ipdivert.h"
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index fa6809efd77f..0885dc25759d 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,9 +9,10 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.41 1997/09/21 22:01:38 gibbs Exp $
+ * $Id: ip_mroute.c,v 1.42 1997/10/28 15:58:50 bde Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 5a52887c922a..317b4d19c522 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,11 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.61 1997/11/05 20:17:23 joerg Exp $
+ *	$Id: ip_output.c,v 1.62 1997/11/07 09:20:45 phk Exp $
  */
 
 #define _IP_VHL
 
+#include "opt_diagnostic.h"
 #include "opt_ipdivert.h"
 
 #include <sys/param.h>
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index 877ed62415ba..8dffe9e04f0e 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -36,6 +36,8 @@
  * natm.c: native mode ATM access (both aal0 and aal5).
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index 16e3a34ca894..f37f2f070679 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -37,6 +37,8 @@
  * from trying to use each other's VCs.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index a9c5c43df9ae..add9da4054c8 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,9 +34,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.47 1998/01/25 06:24:09 dyson Exp $
+ * $Id: nfs_bio.c,v 1.48 1998/01/31 01:27:18 tegge Exp $
  */
 
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 159f7e0b335d..6e62e8fab806 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.48 1997/12/20 00:25:01 bde Exp $
+ * $Id: nfs_subs.c,v 1.49 1997/12/27 02:56:35 bde Exp $
  */
 
 /*
@@ -42,6 +42,9 @@
  * the nfs op functions. They do things like create the rpc header and
  * copy data between mbuf chains and uio lists.
  */
+
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 4bcca7dd5039..8f8b06cb928d 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.54 1997/12/29 00:23:34 dyson Exp $
+ * $Id: nfs_serv.c,v 1.55 1998/01/31 11:56:14 dyson Exp $
  */
 
 /*
@@ -57,6 +57,8 @@
  *	most version 3 rpcs return more than the status for error cases.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 159f7e0b335d..6e62e8fab806 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.48 1997/12/20 00:25:01 bde Exp $
+ * $Id: nfs_subs.c,v 1.49 1997/12/27 02:56:35 bde Exp $
  */
 
 /*
@@ -42,6 +42,9 @@
  * the nfs op functions. They do things like create the rpc header and
  * copy data between mbuf chains and uio lists.
  */
+
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 1624b6343259..9f5ba2ab388d 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,9 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.32 1997/11/07 08:53:25 phk Exp $
+ * $Id: nfs_syscalls.c,v 1.33 1997/11/24 14:18:00 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 51cd281a138b..4a3fad7a7d51 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.75 1998/01/08 23:42:03 eivind Exp $
+ * $Id: nfs_vnops.c,v 1.76 1998/01/25 06:14:26 dyson Exp $
  */
 
 
@@ -42,6 +42,7 @@
  * vnode op calls for Sun NFS version 2 and 3
  */
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index a9c5c43df9ae..add9da4054c8 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,9 +34,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.47 1998/01/25 06:24:09 dyson Exp $
+ * $Id: nfs_bio.c,v 1.48 1998/01/31 01:27:18 tegge Exp $
  */
 
+#include "opt_diagnostic.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 1624b6343259..9f5ba2ab388d 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,9 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.32 1997/11/07 08:53:25 phk Exp $
+ * $Id: nfs_syscalls.c,v 1.33 1997/11/24 14:18:00 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 159f7e0b335d..6e62e8fab806 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.48 1997/12/20 00:25:01 bde Exp $
+ * $Id: nfs_subs.c,v 1.49 1997/12/27 02:56:35 bde Exp $
  */
 
 /*
@@ -42,6 +42,9 @@
  * the nfs op functions. They do things like create the rpc header and
  * copy data between mbuf chains and uio lists.
  */
+
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 51cd281a138b..4a3fad7a7d51 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.75 1998/01/08 23:42:03 eivind Exp $
+ * $Id: nfs_vnops.c,v 1.76 1998/01/25 06:14:26 dyson Exp $
  */
 
 
@@ -42,6 +42,7 @@
  * vnode op calls for Sun NFS version 2 and 3
  */
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 4bcca7dd5039..8f8b06cb928d 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.54 1997/12/29 00:23:34 dyson Exp $
+ * $Id: nfs_serv.c,v 1.55 1998/01/31 11:56:14 dyson Exp $
  */
 
 /*
@@ -57,6 +57,8 @@
  *	most version 3 rpcs return more than the status for error cases.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 159f7e0b335d..6e62e8fab806 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.48 1997/12/20 00:25:01 bde Exp $
+ * $Id: nfs_subs.c,v 1.49 1997/12/27 02:56:35 bde Exp $
  */
 
 /*
@@ -42,6 +42,9 @@
  * the nfs op functions. They do things like create the rpc header and
  * copy data between mbuf chains and uio lists.
  */
+
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 1624b6343259..9f5ba2ab388d 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,9 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.32 1997/11/07 08:53:25 phk Exp $
+ * $Id: nfs_syscalls.c,v 1.33 1997/11/24 14:18:00 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 7f9e8385066d..35857e6cd8c1 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -218,6 +218,7 @@
 
 #ifdef __FreeBSD__
 #include "bktr.h"
+#include "opt_diagnostic.h"
 #include "pci.h"
 #endif /* __FreeBSD__ */
 
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index 92003e221bd3..dfea12458eed 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ide_pci.c,v 1.6 1997/12/19 02:25:51 dyson Exp $
+ *	$Id: ide_pci.c,v 1.7 1998/01/14 08:13:32 kato Exp $
  */
 
 #include "pci.h"
@@ -36,6 +36,8 @@
 
 #if NWDC > 0
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index a822ea4946c2..c9dbc182c51a 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $	*/
-/*	$Id: if_de.c,v 1.76 1997/12/15 20:31:25 eivind Exp $ */
+/*	$Id: if_de.c,v 1.77 1998/01/08 23:42:24 eivind Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -39,6 +39,7 @@
  */
 #define	TULIP_HDR_DATA
 
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index c0092de97b8b..f326982c79d1 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,9 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.18 (Berkeley) 5/26/95
- * $Id: ffs_alloc.c,v 1.44 1997/11/22 08:35:45 bde Exp $
+ * $Id: ffs_alloc.c,v 1.45 1997/12/02 11:21:16 bde Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index c4edbd372615..317456c500a3 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.8 (Berkeley) 6/16/95
- * $Id: ffs_balloc.c,v 1.16 1997/12/05 19:55:49 bde Exp $
+ * $Id: ffs_balloc.c,v 1.17 1998/01/06 05:23:33 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index d0631222531d..7675b6a8eaa6 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,9 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.13 (Berkeley) 4/21/95
- * $Id: ffs_inode.c,v 1.31 1998/02/01 01:59:11 dyson Exp $
+ * $Id: ffs_inode.c,v 1.32 1998/02/01 08:23:55 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 42ae75681880..7d40fd8eb1a3 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.5 (Berkeley) 3/21/95
- * $Id: ffs_subr.c,v 1.15 1997/11/22 08:35:46 bde Exp $
+ * $Id: ffs_subr.c,v 1.16 1997/12/05 19:55:50 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <ufs/ffs/fs.h>
 
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 4b9507df12bb..65a10d0a3d64 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,9 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.67 1998/02/01 01:59:12 dyson Exp $
+ * $Id: ffs_vfsops.c,v 1.68 1998/02/01 08:23:58 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 0fee8d05e182..e078862251df 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.39 1998/02/01 01:59:12 dyson Exp $
+ * $Id: ffs_vnops.c,v 1.40 1998/02/01 08:24:00 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 4cab09998210..b4af4bf5ed5f 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.17 1997/11/24 16:33:03 bde Exp $
+ * $Id: ufs_bmap.c,v 1.18 1998/01/24 02:01:41 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index 644f47a9dfc1..8729f62a75d6 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.12 1997/10/15 07:32:45 bde Exp $
+ * $Id: ufs_ihash.c,v 1.13 1997/12/05 19:55:51 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 0c738a094890..74423c0a83e5 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.15 (Berkeley) 6/16/95
- * $Id: ufs_lookup.c,v 1.18 1997/10/16 10:50:17 phk Exp $
+ * $Id: ufs_lookup.c,v 1.19 1998/01/22 17:30:21 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index ddebfe313f0d..d318a024908d 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,9 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
- * $Id: ufs_quota.c,v 1.15 1997/10/11 18:31:38 phk Exp $
+ * $Id: ufs_quota.c,v 1.16 1997/10/12 20:26:22 phk Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 16f34fa8723c..bb804b3a5856 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,9 +36,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.74 1997/12/27 02:56:39 bde Exp $
+ * $Id: ufs_vnops.c,v 1.75 1998/01/31 19:28:28 julian Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_quota.h"
 #include "opt_suiddir.h"
 
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index ad54aabf55a3..4a1c4df7154c 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -28,9 +28,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: default_pager.c,v 1.12 1997/08/25 22:15:06 bde Exp $
+ *	$Id: default_pager.c,v 1.13 1997/09/01 03:17:08 bde Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index e274095ea0f8..8878b870278f 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.27 1997/09/01 03:17:12 bde Exp $
+ * $Id: device_pager.c,v 1.28 1998/01/31 11:56:25 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 6f4d3fbf5a41..de978bda7c53 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.84 1998/02/01 02:00:20 dyson Exp $
+ * $Id: swap_pager.c,v 1.85 1998/02/03 00:50:36 dyson Exp $
  */
 
 /*
@@ -49,6 +49,8 @@
  *	Deal with async writes in a better fashion
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index d00e23274547..1ab4797e297a 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,13 +66,15 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_fault.c,v 1.76 1998/01/22 17:30:33 dyson Exp $
+ * $Id: vm_fault.c,v 1.77 1998/01/31 11:56:32 dyson Exp $
  */
 
 /*
  *	Page fault handling module.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 1c0c05ac8a4a..9abb81b4c6ee 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,9 +59,10 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.69 1997/12/11 02:10:55 dyson Exp $
+ * $Id: vm_glue.c,v 1.70 1998/01/22 17:30:34 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
 #include "opt_rlimit.h"
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index b3fc58396aa9..a572cb0145de 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,13 +61,15 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_init.c,v 1.15 1997/02/22 09:48:20 peter Exp $
+ * $Id: vm_init.c,v 1.16 1997/08/02 14:33:26 bde Exp $
  */
 
 /*
  *	Initialize the Virtual Memory subsystem.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 0077ca274c5e..120a24593966 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,13 +61,15 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.40 1998/01/22 17:30:35 dyson Exp $
+ * $Id: vm_kern.c,v 1.41 1998/01/31 11:56:35 dyson Exp $
  */
 
 /*
  *	Kernel memory management.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 5fd8d30d5d8b..6109761a7dc6 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,13 +61,15 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.108 1998/01/22 17:30:37 dyson Exp $
+ * $Id: vm_map.c,v 1.109 1998/01/31 11:56:38 dyson Exp $
  */
 
 /*
  *	Virtual memory mapping module.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 3b5b2bd8419f..ad61a3f67aeb 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.70 1997/12/16 17:40:42 eivind Exp $
+ * $Id: vm_mmap.c,v 1.71 1997/12/31 02:35:29 alex Exp $
  */
 
 /*
@@ -46,6 +46,7 @@
  */
 
 #include "opt_compat.h"
+#include "opt_diagnostic.h"
 #include "opt_rlimit.h"
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index cd7dc0f05f76..dd3f27c2edad 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,13 +61,15 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.108 1998/01/22 17:30:39 dyson Exp $
+ * $Id: vm_object.c,v 1.109 1998/01/31 11:56:41 dyson Exp $
  */
 
 /*
  *	Virtual memory object module.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>		/* for curproc, pageproc */
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index dea6b04f2680..23be21813efd 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- *	$Id: vm_page.c,v 1.88 1998/01/31 11:56:47 dyson Exp $
+ *	$Id: vm_page.c,v 1.89 1998/01/31 20:30:18 dyson Exp $
  */
 
 /*
@@ -68,6 +68,8 @@
  *	Resident memory management module.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 0ae68eaa8195..66e29889433c 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,13 +65,15 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.109 1998/01/22 17:30:42 dyson Exp $
+ * $Id: vm_pageout.c,v 1.110 1998/01/31 11:56:49 dyson Exp $
  */
 
 /*
  *	The proverbial page-out daemon.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 35f491ba84a4..ff50b11a7ed1 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.31 1997/12/29 00:25:06 dyson Exp $
+ * $Id: vm_pager.c,v 1.32 1998/01/24 02:01:46 dyson Exp $
  */
 
 /*
@@ -69,6 +69,8 @@
  *	for builtin pagers.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 0a79e69983a0..4245976ae944 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -11,9 +11,11 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $Id: vm_zone.c,v 1.14 1997/12/22 11:48:13 dyson Exp $
+ * $Id: vm_zone.c,v 1.15 1998/01/22 17:30:44 dyson Exp $
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 2c2ec01debc0..8f473c1ee175 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.80 1998/01/17 09:17:02 dyson Exp $
+ *	$Id: vnode_pager.c,v 1.81 1998/01/31 11:56:53 dyson Exp $
  */
 
 /*
@@ -51,6 +51,8 @@
  *	greatly re-simplify the vnode_pager.
  */
 
+#include "opt_diagnostic.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>