diff --git a/sys/lib/libsa/cd9660.c b/sys/lib/libsa/cd9660.c
index 57dfb854b336..391a41b6a479 100644
--- a/sys/lib/libsa/cd9660.c
+++ b/sys/lib/libsa/cd9660.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.c,v 1.6 1999/02/11 09:10:44 pk Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.7 1999/03/26 15:41:38 dbj Exp $	*/
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -199,22 +199,22 @@ cd9660_open(path, f)
 	
 	rc = ENOENT;
 	while (*path) {
-		if ((void *)pp >= buf + psize)
+		if ((caddr_t)pp >= (caddr_t)buf + psize)
 			break;
 		if (isonum_722(pp->parent) != parent)
 			break;
 		if (!pnmatch(path, pp)) {
-			pp = (struct ptable_ent *)((void *)pp + PTSIZE(pp));
+			pp = (struct ptable_ent *)((caddr_t)pp + PTSIZE(pp));
 			ent++;
 			continue;
 		}
 		path += isonum_711(pp->namlen) + 1;
 		parent = ent;
 		bno = isonum_732(pp->block) + isonum_711(pp->extlen);
-		while ((void *)pp < buf + psize) {
+		while ((caddr_t)pp < (caddr_t)buf + psize) {
 			if (isonum_722(pp->parent) == parent)
 				break;
-			pp = (struct ptable_ent *)((void *)pp + PTSIZE(pp));
+			pp = (struct ptable_ent *)((caddr_t)pp + PTSIZE(pp));
 			ent++;
 		}
 	}
@@ -250,7 +250,7 @@ cd9660_open(path, f)
 		if (dirmatch(path, dp))
 			break;
 		psize += isonum_711(dp->length);
-		dp = (struct iso_directory_record *)((void *)dp + isonum_711(dp->length));
+		dp = (struct iso_directory_record *)((caddr_t)dp + isonum_711(dp->length));
 	}
 
 	if (psize >= dsize) {
@@ -326,11 +326,11 @@ cd9660_read(f, start, size, resid)
 				read = off + size;
 			read -= off;
 			bcopy(buf + off, start, read);
-			start += read;
+			start = (caddr_t)start + read;
 			fp->off += read;
 			size -= read;
 		} else {
-			start += ISO_DEFAULT_BLOCK_SIZE;
+			start = (caddr_t)start + ISO_DEFAULT_BLOCK_SIZE;
 			fp->off += ISO_DEFAULT_BLOCK_SIZE;
 			size -= ISO_DEFAULT_BLOCK_SIZE;
 		}
diff --git a/sys/lib/libsa/dev_net.c b/sys/lib/libsa/dev_net.c
index d5f86037e2fc..b7aa35df23d2 100644
--- a/sys/lib/libsa/dev_net.c
+++ b/sys/lib/libsa/dev_net.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dev_net.c,v 1.14 1998/06/29 20:25:59 gwr Exp $	*/
+/*	$NetBSD: dev_net.c,v 1.15 1999/03/26 15:41:38 dbj Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -164,13 +164,22 @@ net_close(f)
 }
 
 int
-net_ioctl()
+net_ioctl(f, cmd, data)
+	struct open_file *f;
+	u_long cmd;
+	void *data;
 {
 	return EIO;
 }
 
 int
-net_strategy()
+net_strategy(devdata, rw, blk, size, buf, rsize)
+	void *devdata;
+	int rw;
+	daddr_t blk;
+	size_t size;
+	void *buf;
+	size_t *rsize;
 {
 	return EIO;
 }
diff --git a/sys/lib/libsa/dev_net.h b/sys/lib/libsa/dev_net.h
index 9ae76908de33..a49aabf4e5b0 100644
--- a/sys/lib/libsa/dev_net.h
+++ b/sys/lib/libsa/dev_net.h
@@ -1,7 +1,6 @@
-/*	$NetBSD: dev_net.h,v 1.3 1997/03/15 18:12:14 is Exp $	*/
+/*	$NetBSD: dev_net.h,v 1.4 1999/03/26 15:41:38 dbj Exp $	*/
 
 int	net_open __P((struct open_file *, ...));
 int	net_close __P((struct open_file *));
-int	net_ioctl();
-int	net_strategy();
-
+int	net_ioctl __P((struct open_file *, u_long, void *));
+int	net_strategy __P((void *, int , daddr_t , size_t, void *, size_t *));
diff --git a/sys/lib/libsa/tftp.c b/sys/lib/libsa/tftp.c
index 8f83c96ab657..dbb56b8416a1 100644
--- a/sys/lib/libsa/tftp.c
+++ b/sys/lib/libsa/tftp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tftp.c,v 1.4 1999/02/28 00:57:07 kim Exp $	 */
+/*	$NetBSD: tftp.c,v 1.5 1999/03/26 15:41:38 dbj Exp $	 */
 
 /*
  * Copyright (c) 1996
@@ -345,7 +345,7 @@ tftp_read(f, addr, size, resid)
 			bcopy(tftpfile->lastdata.t.th_data + offinblock,
 			    addr, count);
 
-			addr += count;
+			addr = (caddr_t)addr + count;
 			tftpfile->off += count;
 			size -= count;
 
diff --git a/sys/lib/libsa/ustarfs.c b/sys/lib/libsa/ustarfs.c
index 92db8c46798c..ffcb115a2470 100644
--- a/sys/lib/libsa/ustarfs.c
+++ b/sys/lib/libsa/ustarfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ustarfs.c,v 1.6 1998/12/19 19:24:32 he Exp $	*/
+/*	$NetBSD: ustarfs.c,v 1.7 1999/03/26 15:41:38 dbj Exp $	*/
 
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -468,7 +468,7 @@ ustarfs_read(f, start, size, resid)
 			seg = infile;
 		memcpy(start, space512 + bufferoffset, seg);
 		ustf->uas_fseek += seg;
-		start += seg;
+		start = (caddr_t)start + seg;
 		size  -= seg;
 	}
 	if (resid)