diff --git a/sys/kern/kern_conf.h b/sys/kern/kern_conf.h
index 5aaa8e39d5b1..3d1d9995c34a 100644
--- a/sys/kern/kern_conf.h
+++ b/sys/kern/kern_conf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_conf.h,v 1.1 1996/02/04 02:19:27 christos Exp $	*/
+/*	$NetBSD: kern_conf.h,v 1.2 1996/03/14 19:01:08 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Christos Zoulas.  All rights reserved.
@@ -31,7 +31,7 @@
 
 #include <sys/conf.h>
 
-cdev_decl(fdesc);
+cdev_decl(filedesc);
 
 cdev_decl(log);
 
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index c03af7737051..508e708cb018 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_descrip.c,v 1.39 1996/02/09 18:59:26 christos Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.40 1996/03/14 19:01:10 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -818,7 +818,7 @@ sys_flock(p, v, retval)
  */
 /* ARGSUSED */
 int
-fdopen(dev, mode, type, p)
+filedescopen(dev, mode, type, p)
 	dev_t dev;
 	int mode, type;
 	struct proc *p;
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index d7a9745fb6d2..2ecc5400ca92 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_prf.c,v 1.21 1996/02/09 19:00:01 christos Exp $	*/
+/*	$NetBSD: subr_prf.c,v 1.22 1996/03/14 19:01:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 1986, 1988, 1991, 1993
@@ -66,6 +66,9 @@
 #ifdef KADB
 #include <machine/kdbparam.h>
 #endif
+#ifdef KGDB
+#include <machine/cpu.h>
+#endif
 
 #define TOCONS	0x01
 #define TOTTY	0x02