diff --git a/lkm/cd9660/Makefile b/lkm/cd9660/Makefile
index aa4d456e9caa..7431a0c96c95 100644
--- a/lkm/cd9660/Makefile
+++ b/lkm/cd9660/Makefile
@@ -1,11 +1,15 @@
-#	$Id$
+#	$Id: Makefile,v 1.3 1997/02/22 12:47:43 peter Exp $
 
 .PATH:	${.CURDIR}/../../sys/isofs/cd9660
 KMOD=	cd9660_mod
 SRCS=	cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
-	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
+	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c opt_diagnostic.h
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DCD9660
+CLEANFILES+=opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 .include <bsd.kmod.mk>
diff --git a/lkm/ibcs2/Makefile b/lkm/ibcs2/Makefile
index b8b58bee2fad..70415fdaca69 100644
--- a/lkm/ibcs2/Makefile
+++ b/lkm/ibcs2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1998/02/01 18:12:13 bde Exp $
+#	$Id: Makefile,v 1.15 1998/02/04 04:07:43 eivind Exp $
 
 .PATH:	${.CURDIR}/../../sys/i386/ibcs2
 KMOD=	ibcs2_mod
@@ -7,13 +7,16 @@ SRCS=	ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
 	ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \
 	ibcs2_isc.c ibcs2_isc_sysent.c \
 	ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c \
-	vnode_if.h opt_spx_hack.h
+	vnode_if.h opt_diagnostic.h opt_spx_hack.h
 MAN8=	ibcs2.8
 
 CFLAGS+= -DLKM -DCOMPAT_IBCS2
-CLEANFILES+= vnode_if.h vnode_if.c opt_spx_hack.h
+CLEANFILES+= vnode_if.h vnode_if.c opt_diagnostic.h opt_spx_hack.h
 EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
 
+opt_diagnostic.h:
+	touch	opt_diagnostic.h
+
 opt_spx_hack.h:
 	touch	opt_spx_hack.h
 
diff --git a/lkm/linux/Makefile b/lkm/linux/Makefile
index e5f786fb04dc..6d03439c8c84 100644
--- a/lkm/linux/Makefile
+++ b/lkm/linux/Makefile
@@ -1,18 +1,18 @@
-#	$Id: Makefile,v 1.12 1997/12/16 18:45:50 eivind Exp $
+#	$Id: Makefile,v 1.13 1998/02/01 17:53:55 bde Exp $
 
 .PATH:	${.CURDIR}/../../sys/i386/linux
 KMOD=	linux_mod
 SRCS=	linux.c linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
 	linux_ipc.c linux_socket.c linux_stats.c \
 	linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
-	imgact_linux.c opt_compat.h vnode_if.h
+	imgact_linux.c opt_compat.h opt_diagnostic.h vnode_if.h
 OBJS=	linux_locore.o
 MAN8=	linux.8
 
 CFLAGS+= -DLKM -DCOMPAT_LINUX #-DDEBUG
 EXPORT_SYMS=_linux_mod
 CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym \
-	linux_assym.h opt_compat.h
+	linux_assym.h opt_compat.h opt_diagnostic.h
 
 linux_assym.h:	linux_genassym
 	./linux_genassym > linux_assym.h
@@ -27,6 +27,9 @@ linux_genassym.o:	linux_genassym.c linux.h
 linux_genassym:	linux_genassym.o
 	${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
 
+opt_diagnostic.h:
+	touch opt_diagnostic.h
+
 opt_compat.h:
 	echo "#define COMPAT_43 1" > opt_compat.h
 
diff --git a/lkm/msdos/Makefile b/lkm/msdos/Makefile
index 7bc833a0da4c..5c9c42899c0a 100644
--- a/lkm/msdos/Makefile
+++ b/lkm/msdos/Makefile
@@ -1,11 +1,15 @@
-#	$Id$
+#	$Id: Makefile,v 1.4 1997/02/22 12:48:38 peter Exp $
 
 .PATH:	${.CURDIR}/../../sys/msdosfs
 KMOD=	msdos_mod
 SRCS=	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
-	msdosfs_vfsops.c msdosfs_vnops.c
+	msdosfs_vfsops.c msdosfs_vnops.c opt_diagnostic.h
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DMSDOSFS
+CLEANFILES+=opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 .include <bsd.kmod.mk>
diff --git a/lkm/nfs/Makefile b/lkm/nfs/Makefile
index 69939ca7c282..7eebf8303aad 100644
--- a/lkm/nfs/Makefile
+++ b/lkm/nfs/Makefile
@@ -1,16 +1,19 @@
-#       $Id: Makefile,v 1.3 1997/02/22 12:48:40 peter Exp $
+#       $Id: Makefile,v 1.4 1998/01/09 01:01:21 eivind Exp $
 
 .PATH:  ${.CURDIR}/../../sys/nfs
 KMOD=   nfs_mod
 SRCS=   nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
         nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
-	nfs_vnops.c opt_inet.h
+	nfs_vnops.c opt_diagnostic.h opt_inet.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
 VFS_LKM=
 
 CFLAGS+= -DNFS
-CLEANFILES+=	opt_inet.h
+CLEANFILES+=opt_diagnostic.h opt_inet.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 opt_inet.h:
 	touch opt_inet.h
diff --git a/lkm/nullfs/Makefile b/lkm/nullfs/Makefile
index dae6d79ba5ee..7f597ce03b03 100644
--- a/lkm/nullfs/Makefile
+++ b/lkm/nullfs/Makefile
@@ -1,12 +1,16 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:43 peter Exp $
+#	$Id: Makefile,v 1.4 1998/02/01 17:34:11 bde Exp $
 
 .PATH:	${.CURDIR}/../../sys/miscfs/nullfs
 KMOD=	null_mod
-SRCS=	null_subr.c null_vfsops.c null_vnops.c opt_debug_nullfs.h
+SRCS=	null_subr.c null_vfsops.c null_vnops.c \
+	opt_debug_nullfs.h opt_diagnostic.h 
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DNULLFS
-CLEANFILES=	opt_debug_nullfs.h
+CLEANFILES+=opt_debug_nullfs.h opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 opt_debug_nullfs.h:
 		touch ${.TARGET}
diff --git a/lkm/procfs/Makefile b/lkm/procfs/Makefile
index 75eecf37fe41..f76fa7e346ed 100644
--- a/lkm/procfs/Makefile
+++ b/lkm/procfs/Makefile
@@ -1,11 +1,15 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:48:49 peter Exp $
 
 .PATH:	${.CURDIR}/../../sys/miscfs/procfs
 KMOD=	procfs_mod
 SRCS=   procfs_ctl.c procfs_map.c procfs_note.c procfs_status.c procfs_subr.c \
-	procfs_type.c procfs_vfsops.c procfs_vnops.c
+	procfs_type.c procfs_vfsops.c procfs_vnops.c opt_diagnostic.h
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DPROCFS
+CLEANFILES+=opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index aa4d456e9caa..7431a0c96c95 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -1,11 +1,15 @@
-#	$Id$
+#	$Id: Makefile,v 1.3 1997/02/22 12:47:43 peter Exp $
 
 .PATH:	${.CURDIR}/../../sys/isofs/cd9660
 KMOD=	cd9660_mod
 SRCS=	cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
-	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
+	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c opt_diagnostic.h
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DCD9660
+CLEANFILES+=opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index b8b58bee2fad..70415fdaca69 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1998/02/01 18:12:13 bde Exp $
+#	$Id: Makefile,v 1.15 1998/02/04 04:07:43 eivind Exp $
 
 .PATH:	${.CURDIR}/../../sys/i386/ibcs2
 KMOD=	ibcs2_mod
@@ -7,13 +7,16 @@ SRCS=	ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
 	ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \
 	ibcs2_isc.c ibcs2_isc_sysent.c \
 	ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c \
-	vnode_if.h opt_spx_hack.h
+	vnode_if.h opt_diagnostic.h opt_spx_hack.h
 MAN8=	ibcs2.8
 
 CFLAGS+= -DLKM -DCOMPAT_IBCS2
-CLEANFILES+= vnode_if.h vnode_if.c opt_spx_hack.h
+CLEANFILES+= vnode_if.h vnode_if.c opt_diagnostic.h opt_spx_hack.h
 EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
 
+opt_diagnostic.h:
+	touch	opt_diagnostic.h
+
 opt_spx_hack.h:
 	touch	opt_spx_hack.h
 
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index e5f786fb04dc..6d03439c8c84 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,18 +1,18 @@
-#	$Id: Makefile,v 1.12 1997/12/16 18:45:50 eivind Exp $
+#	$Id: Makefile,v 1.13 1998/02/01 17:53:55 bde Exp $
 
 .PATH:	${.CURDIR}/../../sys/i386/linux
 KMOD=	linux_mod
 SRCS=	linux.c linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
 	linux_ipc.c linux_socket.c linux_stats.c \
 	linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
-	imgact_linux.c opt_compat.h vnode_if.h
+	imgact_linux.c opt_compat.h opt_diagnostic.h vnode_if.h
 OBJS=	linux_locore.o
 MAN8=	linux.8
 
 CFLAGS+= -DLKM -DCOMPAT_LINUX #-DDEBUG
 EXPORT_SYMS=_linux_mod
 CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym \
-	linux_assym.h opt_compat.h
+	linux_assym.h opt_compat.h opt_diagnostic.h
 
 linux_assym.h:	linux_genassym
 	./linux_genassym > linux_assym.h
@@ -27,6 +27,9 @@ linux_genassym.o:	linux_genassym.c linux.h
 linux_genassym:	linux_genassym.o
 	${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
 
+opt_diagnostic.h:
+	touch opt_diagnostic.h
+
 opt_compat.h:
 	echo "#define COMPAT_43 1" > opt_compat.h
 
diff --git a/sys/modules/msdos/Makefile b/sys/modules/msdos/Makefile
index 7bc833a0da4c..5c9c42899c0a 100644
--- a/sys/modules/msdos/Makefile
+++ b/sys/modules/msdos/Makefile
@@ -1,11 +1,15 @@
-#	$Id$
+#	$Id: Makefile,v 1.4 1997/02/22 12:48:38 peter Exp $
 
 .PATH:	${.CURDIR}/../../sys/msdosfs
 KMOD=	msdos_mod
 SRCS=	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
-	msdosfs_vfsops.c msdosfs_vnops.c
+	msdosfs_vfsops.c msdosfs_vnops.c opt_diagnostic.h
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DMSDOSFS
+CLEANFILES+=opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index 7bc833a0da4c..5c9c42899c0a 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -1,11 +1,15 @@
-#	$Id$
+#	$Id: Makefile,v 1.4 1997/02/22 12:48:38 peter Exp $
 
 .PATH:	${.CURDIR}/../../sys/msdosfs
 KMOD=	msdos_mod
 SRCS=	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
-	msdosfs_vfsops.c msdosfs_vnops.c
+	msdosfs_vfsops.c msdosfs_vnops.c opt_diagnostic.h
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DMSDOSFS
+CLEANFILES+=opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile
index 69939ca7c282..7eebf8303aad 100644
--- a/sys/modules/nfs/Makefile
+++ b/sys/modules/nfs/Makefile
@@ -1,16 +1,19 @@
-#       $Id: Makefile,v 1.3 1997/02/22 12:48:40 peter Exp $
+#       $Id: Makefile,v 1.4 1998/01/09 01:01:21 eivind Exp $
 
 .PATH:  ${.CURDIR}/../../sys/nfs
 KMOD=   nfs_mod
 SRCS=   nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
         nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
-	nfs_vnops.c opt_inet.h
+	nfs_vnops.c opt_diagnostic.h opt_inet.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
 VFS_LKM=
 
 CFLAGS+= -DNFS
-CLEANFILES+=	opt_inet.h
+CLEANFILES+=opt_diagnostic.h opt_inet.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 opt_inet.h:
 	touch opt_inet.h
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 69939ca7c282..7eebf8303aad 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -1,16 +1,19 @@
-#       $Id: Makefile,v 1.3 1997/02/22 12:48:40 peter Exp $
+#       $Id: Makefile,v 1.4 1998/01/09 01:01:21 eivind Exp $
 
 .PATH:  ${.CURDIR}/../../sys/nfs
 KMOD=   nfs_mod
 SRCS=   nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
         nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
-	nfs_vnops.c opt_inet.h
+	nfs_vnops.c opt_diagnostic.h opt_inet.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
 VFS_LKM=
 
 CFLAGS+= -DNFS
-CLEANFILES+=	opt_inet.h
+CLEANFILES+=opt_diagnostic.h opt_inet.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 opt_inet.h:
 	touch opt_inet.h
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index 69939ca7c282..7eebf8303aad 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -1,16 +1,19 @@
-#       $Id: Makefile,v 1.3 1997/02/22 12:48:40 peter Exp $
+#       $Id: Makefile,v 1.4 1998/01/09 01:01:21 eivind Exp $
 
 .PATH:  ${.CURDIR}/../../sys/nfs
 KMOD=   nfs_mod
 SRCS=   nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
         nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
-	nfs_vnops.c opt_inet.h
+	nfs_vnops.c opt_diagnostic.h opt_inet.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
 VFS_LKM=
 
 CFLAGS+= -DNFS
-CLEANFILES+=	opt_inet.h
+CLEANFILES+=opt_diagnostic.h opt_inet.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 opt_inet.h:
 	touch opt_inet.h
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index dae6d79ba5ee..7f597ce03b03 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,12 +1,16 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:43 peter Exp $
+#	$Id: Makefile,v 1.4 1998/02/01 17:34:11 bde Exp $
 
 .PATH:	${.CURDIR}/../../sys/miscfs/nullfs
 KMOD=	null_mod
-SRCS=	null_subr.c null_vfsops.c null_vnops.c opt_debug_nullfs.h
+SRCS=	null_subr.c null_vfsops.c null_vnops.c \
+	opt_debug_nullfs.h opt_diagnostic.h 
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DNULLFS
-CLEANFILES=	opt_debug_nullfs.h
+CLEANFILES+=opt_debug_nullfs.h opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 opt_debug_nullfs.h:
 		touch ${.TARGET}
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 75eecf37fe41..f76fa7e346ed 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,11 +1,15 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 12:48:49 peter Exp $
 
 .PATH:	${.CURDIR}/../../sys/miscfs/procfs
 KMOD=	procfs_mod
 SRCS=   procfs_ctl.c procfs_map.c procfs_note.c procfs_status.c procfs_subr.c \
-	procfs_type.c procfs_vfsops.c procfs_vnops.c
+	procfs_type.c procfs_vfsops.c procfs_vnops.c opt_diagnostic.h
 NOMAN=
 VFS_LKM=
 CFLAGS+= -DPROCFS
+CLEANFILES+=opt_diagnostic.h
+
+opt_diagnostic.h:
+	touch opt_diagnostic.h
 
 .include <bsd.kmod.mk>