diff --git a/sys/arch/pmax/dev/bt478.c b/sys/arch/pmax/dev/bt478.c
index aa8a8485a3b7..15d6fb31d453 100644
--- a/sys/arch/pmax/dev/bt478.c
+++ b/sys/arch/pmax/dev/bt478.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt478.c,v 1.4 1996/04/08 00:57:43 jonathan Exp $	*/
+/*	$NetBSD: bt478.c,v 1.5 1996/09/21 03:22:25 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -69,6 +69,7 @@
 #include <machine/fbvar.h>
 
 #include <pmax/dev/bt478.h>
+#include <pmax/dev/bt478var.h>
 #include <pmax/pmax/kn01.h>
 
 /*
@@ -76,23 +77,10 @@
  */
 
 
-int bt478init __P((struct fbinfo *fi));
 
-void bt478RestoreCursorColor __P((struct fbinfo *fi));
-/* qvss ioctl interface uses this */
+/* XXX qvss ioctl interface uses this */
 void bt478CursorColor __P((struct fbinfo *fi, unsigned int color[]));
 
-void bt478BlankCursor __P((struct fbinfo *fi));
-/*static*/ void bt478InitColorMap __P((struct fbinfo *fi));
-int bt478GetColorMap __P((struct fbinfo *fi, caddr_t bits,
-				   int index, int count));
-int bt478LoadColorMap __P((struct fbinfo *fi, caddr_t bits,
-				   int index, int count));
-
-
-
-extern int pmax_boardtype;
-extern u_short defCursor[32];
 
 static u_char	bg_RGB[3];	/* background color for the cursor */
 static u_char	fg_RGB[3];	/* foreground color for the cursor */
diff --git a/sys/arch/pmax/dev/bt478var.h b/sys/arch/pmax/dev/bt478var.h
index 480d6a5be11c..77288e4aff35 100644
--- a/sys/arch/pmax/dev/bt478var.h
+++ b/sys/arch/pmax/dev/bt478var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt478var.h,v 1.1 1996/09/21 03:02:10 jonathan Exp $	*/
+/*	$NetBSD: bt478var.h,v 1.2 1996/09/21 03:22:24 jonathan Exp $	*/
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -22,5 +22,7 @@ int bt478init __P((struct fbinfo *fi));
 void bt478BlankCursor __P((struct fbinfo *fi));
 void bt478RestoreCursorColor __P((struct fbinfo *fi));
 void bt478InitColorMap __P((struct fbinfo *fi));
-int bt478LoadColorMap __P ((struct fbinfo *, caddr_t, int, int));
-int bt478GetColorMap __P ((struct fbinfo *, caddr_t, int, int));
+int bt478LoadColorMap __P ((struct fbinfo *fi, caddr_t bits,
+			    int index, int count));
+int bt478GetColorMap __P ((struct fbinfo *fi, caddr_t bits,
+			   int index, int count));