diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 90f230f5e87..4b2b6dc83e5 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.49 1999/01/16 11:40:02 kato Exp $
+ *	$Id: fd.c,v 1.50 1999/01/19 00:21:50 peter Exp $
  *
  */
 
@@ -805,9 +805,15 @@ fdattach(struct isa_device *dev)
 	fdcu_t	fdcu = dev->id_unit;
 	fdc_p	fdc = fdc_data + fdcu;
 	fd_p	fd;
+#ifdef PC98
+	int	fdsu;
+#else
 	int	fdsu, st0, st3, i;
+#endif
 	struct isa_device *fdup;
+#ifndef PC98
 	int ic_type = 0;
+#endif
 #ifdef DEVFS
 	int	mynor;
 	int	typemynor;
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index 076f9e77488..1bbc8d4aca9 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: pc98gdc.c,v 1.3 1999/01/18 14:55:38 kato Exp $
  */
 
 #include "gdc.h"
@@ -68,7 +68,6 @@
 
 static int		gdcprobe(struct isa_device *dev);
 static int		gdc_attach(struct isa_device *dev);
-static void		gdc_drvinit(void *unused);
 
 struct isa_driver gdcdriver = {
 	gdcprobe,
@@ -857,8 +856,9 @@ gdc_mmap(video_adapter_t *adp, vm_offset_t offset)
 static int
 gdc_diag(video_adapter_t *adp, int level)
 {
-    video_info_t info;
+#if FB_DEBUG > 1
     int i;
+#endif
 
     if (!init_done)
 	return 1;
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 1bef2cf54c6..f2712394ef1 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.76 1999/01/19 00:21:53 peter Exp $
+ *	$Id: sio.c,v 1.77 1999/01/27 08:26:16 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1781,8 +1781,8 @@ sioattach(isdp)
 	outb(iobase + (com_fifo << port_shift), 0);
 #else
 	outb(iobase + com_fifo, 0);
-#endif
 determined_type: ;
+#endif
 
 #ifdef COM_MULTIPORT
 	if (COM_ISMULTIPORT(isdp)) {
@@ -3122,8 +3122,6 @@ comparam(tp, t)
 	int		s;
 	int		unit;
 #ifdef PC98
-	Port_t		tmp_port;
-	int		tmp_flg;
 	int		port_shift = 0;
 	u_char		param = 0;
 #endif
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 90f230f5e87..4b2b6dc83e5 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.49 1999/01/16 11:40:02 kato Exp $
+ *	$Id: fd.c,v 1.50 1999/01/19 00:21:50 peter Exp $
  *
  */
 
@@ -805,9 +805,15 @@ fdattach(struct isa_device *dev)
 	fdcu_t	fdcu = dev->id_unit;
 	fdc_p	fdc = fdc_data + fdcu;
 	fd_p	fd;
+#ifdef PC98
+	int	fdsu;
+#else
 	int	fdsu, st0, st3, i;
+#endif
 	struct isa_device *fdup;
+#ifndef PC98
 	int ic_type = 0;
+#endif
 #ifdef DEVFS
 	int	mynor;
 	int	typemynor;
diff --git a/sys/pc98/pc98/lpt.c b/sys/pc98/pc98/lpt.c
index 856974f65f8..7c23d743311 100644
--- a/sys/pc98/pc98/lpt.c
+++ b/sys/pc98/pc98/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.23 1998/10/22 05:58:45 bde Exp $
+ *	$Id: lpt.c,v 1.24 1998/12/11 08:48:21 kato Exp $
  */
 
 /*
@@ -289,7 +289,9 @@ static u_char *ctxmith;
 
 /* Functions for the lp# interface */
 static void lpattach(struct lpt_softc *,int);
+#ifndef PC98
 static int lpinittables(void);
+#endif
 static int lpioctl(struct ifnet *, u_long, caddr_t);
 static int lpoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
 	struct rtentry *);
@@ -311,7 +313,7 @@ static struct cdevsw lpt_cdevsw =
 	  lptioctl,	nullstop,	nullreset,	nodevtotty,/* lpt */
 	  seltrue,	nommap,		nostrat,	"lpt",	NULL,	-1 };
 
-
+#ifndef PC98
 /*
  * Internal routine to lptprobe to do port tests of one byte value
  */
@@ -332,6 +334,7 @@ lpt_port_test (int port, u_char data, u_char mask)
 		port, data, temp, timeout));
 	return (temp == data);
 }
+#endif /* PC98 */
 
 /*
  * New lpt port probe Geoff Rehmet - Rhodes University - 14/2/94
@@ -493,7 +496,11 @@ lptopen (dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct lpt_softc *sc;
 	int s;
+#ifdef PC98
+	int port;
+#else
 	int trys, port;
+#endif
 	u_int unit = LPTUNIT(minor(dev));
 
 	sc = lpt_sc + unit;
@@ -633,7 +640,9 @@ static	int
 lptclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct lpt_softc *sc = lpt_sc + LPTUNIT(minor(dev));
+#ifndef PC98
 	int port = sc->sc_port;
+#endif
 
 	if(sc->sc_flags & LP_BYPASS)
 		goto end_close;
@@ -792,8 +801,10 @@ static void
 lptintr(int unit)
 {
 	struct lpt_softc *sc = lpt_sc + unit;
+#ifndef PC98
 	int port = sc->sc_port, sts;
 	int i;
+#endif
 
 #ifdef INET
 	if(sc->sc_if.if_flags & IFF_UP) {
@@ -915,6 +926,8 @@ lpattach (struct lpt_softc *sc, int unit)
 	bpfattach(ifp, DLT_NULL, LPIPHDRLEN);
 #endif
 }
+
+#ifndef PC98
 /*
  * Build the translation tables for the LPIP (BSD unix) protocol.
  * We don't want to calculate these nasties in our tight loop, so we
@@ -953,6 +966,7 @@ lpinittables (void)
 
     return 0;
 }
+#endif /* PC98 */
 
 /*
  * Process an ioctl request.
@@ -1240,7 +1254,9 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
 {
     register int lpt_data_port = lpt_sc[ifp->if_unit].sc_port + lpt_data;
     register int lpt_stat_port = lpt_sc[ifp->if_unit].sc_port + lpt_status;
+#ifndef PC98
 	     int lpt_ctrl_port = lpt_sc[ifp->if_unit].sc_port + lpt_control;
+#endif
 
     int s, err;
     struct mbuf *mm;
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index 076f9e77488..1bbc8d4aca9 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: pc98gdc.c,v 1.3 1999/01/18 14:55:38 kato Exp $
  */
 
 #include "gdc.h"
@@ -68,7 +68,6 @@
 
 static int		gdcprobe(struct isa_device *dev);
 static int		gdc_attach(struct isa_device *dev);
-static void		gdc_drvinit(void *unused);
 
 struct isa_driver gdcdriver = {
 	gdcprobe,
@@ -857,8 +856,9 @@ gdc_mmap(video_adapter_t *adp, vm_offset_t offset)
 static int
 gdc_diag(video_adapter_t *adp, int level)
 {
-    video_info_t info;
+#if FB_DEBUG > 1
     int i;
+#endif
 
     if (!init_done)
 	return 1;
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 1bef2cf54c6..f2712394ef1 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.76 1999/01/19 00:21:53 peter Exp $
+ *	$Id: sio.c,v 1.77 1999/01/27 08:26:16 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1781,8 +1781,8 @@ sioattach(isdp)
 	outb(iobase + (com_fifo << port_shift), 0);
 #else
 	outb(iobase + com_fifo, 0);
-#endif
 determined_type: ;
+#endif
 
 #ifdef COM_MULTIPORT
 	if (COM_ISMULTIPORT(isdp)) {
@@ -3122,8 +3122,6 @@ comparam(tp, t)
 	int		s;
 	int		unit;
 #ifdef PC98
-	Port_t		tmp_port;
-	int		tmp_flg;
 	int		port_shift = 0;
 	u_char		param = 0;
 #endif