diff --git a/sys/arch/sparc/dev/dev_conf.h b/sys/arch/sparc/dev/dev_conf.h
deleted file mode 100644
index c9b8cbd414c7..000000000000
--- a/sys/arch/sparc/dev/dev_conf.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: dev_conf.h,v 1.1 1996/03/14 19:44:48 christos Exp $	*/
-
-/*
- * Copyright (c) 1995 Christos Zoulas.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/conf.h>
-
-cdev_decl(cn);
-
-#include "zs.h"
-cdev_decl(zs);
-
-#include "fd.h"
-bdev_decl(fd);
-cdev_decl(fd);
-
-cdev_decl(fb);
-
-/* open, close, read, write, ioctl, select */
-#define	cdev_gen_init(c,n) { \
-	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
-	dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
-	0, dev_init(c,n,select), (dev_type_mmap((*))) enodev }
-
-cdev_decl(ms);
-
-cdev_decl(kbd);
-
-#include "bwtwo.h"
-cdev_decl(bwtwo);
-
-#include "cgthree.h"
-cdev_decl(cgthree);
-
-#include "cgfour.h"
-cdev_decl(cgfour);
-
-#include "cgsix.h"
-cdev_decl(cgsix);
-
-#include "cgeight.h"
-cdev_decl(cgeight);
-
-#include "xd.h"
-bdev_decl(xd);
-cdev_decl(xd);
-
-#include "xy.h"
-bdev_decl(xy);
-cdev_decl(xy);
-
-bdev_decl(sw);
-cdev_decl(sw);
diff --git a/sys/arch/sparc/dev/kbd.c b/sys/arch/sparc/dev/kbd.c
index 353508884188..f65228f08484 100644
--- a/sys/arch/sparc/dev/kbd.c
+++ b/sys/arch/sparc/dev/kbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd.c,v 1.22 1996/03/14 19:45:08 christos Exp $ */
+/*	$NetBSD: kbd.c,v 1.23 1996/04/01 17:34:34 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -59,12 +59,13 @@
 #include <sys/systm.h>
 #include <sys/tty.h>
 #include <sys/signalvar.h>
+#include <sys/conf.h>
 
 #include <machine/autoconf.h>
+#include <machine/conf.h>
 
 #include <machine/vuid_event.h>
 #include <sparc/dev/event_var.h>
-#include <sparc/dev/dev_conf.h>
 #include <machine/kbd.h>
 #include <machine/kbio.h>