diff --git a/sys/arch/hpcarm/dev/ipaq_gpioreg.h b/sys/arch/hpcarm/dev/ipaq_gpioreg.h
index 4b50eef64f56..5b8bb56a88f2 100644
--- a/sys/arch/hpcarm/dev/ipaq_gpioreg.h
+++ b/sys/arch/hpcarm/dev/ipaq_gpioreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipaq_gpioreg.h,v 1.1 2001/07/10 14:58:28 ichiro Exp $	*/
+/*	$NetBSD: ipaq_gpioreg.h,v 1.2 2001/07/13 06:54:35 ichiro Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.  All rights reserved.
@@ -35,8 +35,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define GPIO(x)		(0x00000001 << (x))
-
 /*
  * iPAQ H3600 specific parameter
  */
diff --git a/sys/arch/hpcarm/dev/ipaq_saip.c b/sys/arch/hpcarm/dev/ipaq_saip.c
index 66f8f1aae2f4..674e03b91638 100644
--- a/sys/arch/hpcarm/dev/ipaq_saip.c
+++ b/sys/arch/hpcarm/dev/ipaq_saip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipaq_saip.c,v 1.3 2001/07/11 00:10:04 ichiro Exp $	*/
+/*	$NetBSD: ipaq_saip.c,v 1.4 2001/07/13 06:54:35 ichiro Exp $	*/
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -38,18 +38,7 @@
 #include <hpcarm/sa11x0/sa11x0_dmacreg.h>
 #include <hpcarm/sa11x0/sa11x0_ppcreg.h>
 #include <hpcarm/sa11x0/sa11x0_gpioreg.h>
-
-/* ipaq softc */
-struct ipaq_softc {
-	struct device sc_dev;
-	bus_space_tag_t sc_iot;
-	bus_space_handle_t sc_ioh;
-	bus_space_handle_t sc_gpioh;
-	bus_space_handle_t sc_egpioh;
-	bus_space_handle_t sc_ppch;
-	bus_space_handle_t sc_dmach;
-	u_int32_t sc_intrmask;
-};
+#include <hpcarm/dev/ipaq_saipvar.h>
 
 /* prototypes */
 static int	ipaq_match(struct device *, struct cfdata *, void *);