diff --git a/sys/arch/hp300/stand/common/device.h b/sys/arch/hp300/stand/common/device.h
index 399d46f9c225..827d88be973d 100644
--- a/sys/arch/hp300/stand/common/device.h
+++ b/sys/arch/hp300/stand/common/device.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: device.h,v 1.3 2005/12/11 12:17:19 christos Exp $	*/
+/*	$NetBSD: device.h,v 1.4 2006/06/25 17:34:30 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -72,3 +72,5 @@ struct hp_hw {
 #define HW_ISHPIB(hw)	(((hw)->hw_type & C_MASK) == C_HPIB)
 #define HW_ISSCSI(hw)	(((hw)->hw_type & C_MASK) == C_SCSI)
 #define HW_ISDEV(hw,d)	(((hw)->hw_type & D_MASK) == (d))
+
+extern struct hp_hw sc_table[];
diff --git a/sys/arch/hp300/stand/common/samachdep.h b/sys/arch/hp300/stand/common/samachdep.h
index f1654d32a806..be5203f481f1 100644
--- a/sys/arch/hp300/stand/common/samachdep.h
+++ b/sys/arch/hp300/stand/common/samachdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: samachdep.h,v 1.11 2006/04/01 18:02:04 oster Exp $	*/
+/*	$NetBSD: samachdep.h,v 1.12 2006/06/25 17:34:30 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -34,6 +34,7 @@
 #include <sys/param.h>
 #include <machine/hp300spu.h>
 #include <m68k/frame.h>
+#include <lib/libsa/stand.h>
 
 #define	NHPIB		4
 #define	NSCSI		2
@@ -58,7 +59,6 @@
 #define MHZ_50		6
 
 /* autoconf.c */
-extern struct hp_hw sc_table[];
 extern int cpuspeed;
 #ifdef PRINTROMINFO
 void printrominvo(void);
@@ -122,12 +122,6 @@ struct punitsw {
 extern	struct punitsw punitsw[];
 extern	int npunit;
 
-extern	struct devsw devsw_net[];
-extern	int ndevs_net;
-
-extern	struct devsw devsw_general[];
-extern	int ndevs_general;
-
 extern	struct fs_ops file_system_rawfs[];
 extern	struct fs_ops file_system_ufs[];
 extern	struct fs_ops file_system_nfs[];