diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index b0e812161cf1..47af14d82c79 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fputc.c,v 1.4 1995/02/02 02:09:30 jtc Exp $	*/
+/*	$NetBSD: fputc.c,v 1.5 1996/03/29 23:29:06 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,11 +40,12 @@
 #if 0
 static char sccsid[] = "@(#)fputc.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: fputc.c,v 1.4 1995/02/02 02:09:30 jtc Exp $";
+static char rcsid[] = "$NetBSD: fputc.c,v 1.5 1996/03/29 23:29:06 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 
+int
 fputc(c, fp)
 	int c;
 	register FILE *fp;
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index 642a98f125fe..1900f5e087aa 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fputs.c,v 1.4 1995/02/02 02:09:32 jtc Exp $	*/
+/*	$NetBSD: fputs.c,v 1.5 1996/03/29 23:29:07 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)fputs.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: fputs.c,v 1.4 1995/02/02 02:09:32 jtc Exp $";
+static char rcsid[] = "$NetBSD: fputs.c,v 1.5 1996/03/29 23:29:07 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: fputs.c,v 1.4 1995/02/02 02:09:32 jtc Exp $";
 /*
  * Write the given string to the given file.
  */
+int
 fputs(s, fp)
 	const char *s;
 	FILE *fp;
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index 92750097863a..8a92889f4107 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fscanf.c,v 1.4 1995/02/02 02:09:37 jtc Exp $	*/
+/*	$NetBSD: fscanf.c,v 1.5 1996/03/29 23:29:08 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)fscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: fscanf.c,v 1.4 1995/02/02 02:09:37 jtc Exp $";
+static char rcsid[] = "$NetBSD: fscanf.c,v 1.5 1996/03/29 23:29:08 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: fscanf.c,v 1.4 1995/02/02 02:09:37 jtc Exp $";
 #include <varargs.h>
 #endif
 
+int
 #if __STDC__
 fscanf(FILE *fp, char const *fmt, ...) {
 	int ret;
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index 7ae1a3a4c210..67fbcc96c566 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fvwrite.c,v 1.4 1995/02/02 02:09:45 jtc Exp $	*/
+/*	$NetBSD: fvwrite.c,v 1.5 1996/03/29 23:29:09 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: fvwrite.c,v 1.4 1995/02/02 02:09:45 jtc Exp $";
+static char rcsid[] = "$NetBSD: fvwrite.c,v 1.5 1996/03/29 23:29:09 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -54,6 +54,7 @@ static char rcsid[] = "$NetBSD: fvwrite.c,v 1.4 1995/02/02 02:09:45 jtc Exp $";
  * This routine is large and unsightly, but most of the ugliness due
  * to the three different kinds of output buffering is handled here.
  */
+int
 __sfvwrite(fp, uio)
 	register FILE *fp;
 	register struct __suio *uio;
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index f4c1877f3469..c6eec1dc1f57 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fwalk.c,v 1.4 1995/02/02 02:09:49 jtc Exp $	*/
+/*	$NetBSD: fwalk.c,v 1.5 1996/03/29 23:29:12 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)fwalk.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: fwalk.c,v 1.4 1995/02/02 02:09:49 jtc Exp $";
+static char rcsid[] = "$NetBSD: fwalk.c,v 1.5 1996/03/29 23:29:12 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
@@ -48,6 +48,7 @@ static char rcsid[] = "$NetBSD: fwalk.c,v 1.4 1995/02/02 02:09:49 jtc Exp $";
 #include "local.h"
 #include "glue.h"
 
+int
 _fwalk(function)
 	register int (*function)();
 {
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
index e09580f3928c..cb5df92c32b1 100644
--- a/lib/libc/stdio/getchar.c
+++ b/lib/libc/stdio/getchar.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getchar.c,v 1.4 1995/02/02 02:09:54 jtc Exp $	*/
+/*	$NetBSD: getchar.c,v 1.5 1996/03/29 23:29:13 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: getchar.c,v 1.4 1995/02/02 02:09:54 jtc Exp $";
+static char rcsid[] = "$NetBSD: getchar.c,v 1.5 1996/03/29 23:29:13 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: getchar.c,v 1.4 1995/02/02 02:09:54 jtc Exp $";
 
 #undef getchar
 
+int
 getchar()
 {
 	return (getc(stdin));
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index 8e9cc05de57d..0cc68f647289 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: putc.c,v 1.4 1995/02/02 02:10:14 jtc Exp $	*/
+/*	$NetBSD: putc.c,v 1.5 1996/03/29 23:29:14 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: putc.c,v 1.4 1995/02/02 02:10:14 jtc Exp $";
+static char rcsid[] = "$NetBSD: putc.c,v 1.5 1996/03/29 23:29:14 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: putc.c,v 1.4 1995/02/02 02:10:14 jtc Exp $";
  */
 #undef putc
 
+int
 putc(c, fp)
 	int c;
 	register FILE *fp;
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index 2e0ceb274700..a8fcf362e0af 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: putchar.c,v 1.4 1995/02/02 02:10:16 jtc Exp $	*/
+/*	$NetBSD: putchar.c,v 1.5 1996/03/29 23:29:15 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: putchar.c,v 1.4 1995/02/02 02:10:16 jtc Exp $";
+static char rcsid[] = "$NetBSD: putchar.c,v 1.5 1996/03/29 23:29:15 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: putchar.c,v 1.4 1995/02/02 02:10:16 jtc Exp $";
 /*
  * A subroutine version of the macro putchar
  */
+int
 putchar(c)
 	int c;
 {
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 07ae7a9ab06b..511936799191 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: puts.c,v 1.4 1995/02/02 02:10:18 jtc Exp $	*/
+/*	$NetBSD: puts.c,v 1.5 1996/03/29 23:29:16 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)puts.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: puts.c,v 1.4 1995/02/02 02:10:18 jtc Exp $";
+static char rcsid[] = "$NetBSD: puts.c,v 1.5 1996/03/29 23:29:16 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: puts.c,v 1.4 1995/02/02 02:10:18 jtc Exp $";
 /*
  * Write the given string to stdout, appending a newline.
  */
+int
 puts(s)
 	char const *s;
 {
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index 90744938d919..0f34f28159db 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: putw.c,v 1.4 1995/02/02 02:10:19 jtc Exp $	*/
+/*	$NetBSD: putw.c,v 1.5 1996/03/29 23:29:17 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,12 +40,13 @@
 #if 0
 static char sccsid[] = "@(#)putw.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: putw.c,v 1.4 1995/02/02 02:10:19 jtc Exp $";
+static char rcsid[] = "$NetBSD: putw.c,v 1.5 1996/03/29 23:29:17 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #include "fvwrite.h"
 
+int
 putw(w, fp)
 	int w;
 	FILE *fp;
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index f4eceeeb8488..08171d78cc4f 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: refill.c,v 1.4 1995/02/02 02:10:21 jtc Exp $	*/
+/*	$NetBSD: refill.c,v 1.5 1996/03/29 23:29:18 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)refill.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: refill.c,v 1.4 1995/02/02 02:10:21 jtc Exp $";
+static char rcsid[] = "$NetBSD: refill.c,v 1.5 1996/03/29 23:29:18 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
@@ -48,7 +48,7 @@ static char rcsid[] = "$NetBSD: refill.c,v 1.4 1995/02/02 02:10:21 jtc Exp $";
 #include <stdlib.h>
 #include "local.h"
 
-static
+static int
 lflush(fp)
 	FILE *fp;
 {
@@ -62,6 +62,7 @@ lflush(fp)
  * Refill a stdio buffer.
  * Return EOF on eof or error, 0 otherwise.
  */
+int
 __srefill(fp)
 	register FILE *fp;
 {
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index 7f771ea92f5c..60102797c1cc 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: remove.c,v 1.4 1995/02/02 02:10:23 jtc Exp $	*/
+/*	$NetBSD: remove.c,v 1.5 1996/03/29 23:29:19 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,12 +40,13 @@
 #if 0
 static char sccsid[] = "@(#)remove.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: remove.c,v 1.4 1995/02/02 02:10:23 jtc Exp $";
+static char rcsid[] = "$NetBSD: remove.c,v 1.5 1996/03/29 23:29:19 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
 #include <stdio.h>
 
+int
 remove(file)
 	const char *file;
 {
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
index fe5217b2eea2..7bf07b840252 100644
--- a/lib/libc/stdio/rget.c
+++ b/lib/libc/stdio/rget.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rget.c,v 1.4 1995/02/02 02:10:27 jtc Exp $	*/
+/*	$NetBSD: rget.c,v 1.5 1996/03/29 23:29:20 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)rget.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: rget.c,v 1.4 1995/02/02 02:10:27 jtc Exp $";
+static char rcsid[] = "$NetBSD: rget.c,v 1.5 1996/03/29 23:29:20 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: rget.c,v 1.4 1995/02/02 02:10:27 jtc Exp $";
  * Refill, then return the first character
  * in the newly-filled buffer.
  */
+int
 __srget(fp)
 	register FILE *fp;
 {
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index cc64c5366116..f458de227b03 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scanf.c,v 1.4 1995/02/02 02:10:29 jtc Exp $	*/
+/*	$NetBSD: scanf.c,v 1.5 1996/03/29 23:29:21 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)scanf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: scanf.c,v 1.4 1995/02/02 02:10:29 jtc Exp $";
+static char rcsid[] = "$NetBSD: scanf.c,v 1.5 1996/03/29 23:29:21 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: scanf.c,v 1.4 1995/02/02 02:10:29 jtc Exp $";
 #include <varargs.h>
 #endif
 
+int
 #if __STDC__
 scanf(char const *fmt, ...)
 #else
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index 4d763ccdd678..45ee56833215 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setvbuf.c,v 1.7 1995/02/02 02:10:34 jtc Exp $	*/
+/*	$NetBSD: setvbuf.c,v 1.8 1996/03/29 23:29:22 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)setvbuf.c	8.2 (Berkeley) 11/16/93";
 #endif
-static char rcsid[] = "$NetBSD: setvbuf.c,v 1.7 1995/02/02 02:10:34 jtc Exp $";
+static char rcsid[] = "$NetBSD: setvbuf.c,v 1.8 1996/03/29 23:29:22 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -51,6 +51,7 @@ static char rcsid[] = "$NetBSD: setvbuf.c,v 1.7 1995/02/02 02:10:34 jtc Exp $";
  * Set one of the three kinds of buffering, optionally including
  * a buffer.
  */
+int
 setvbuf(fp, buf, mode, size)
 	register FILE *fp;
 	char *buf;
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index 0e54ba755743..c13cd31a72ad 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: snprintf.c,v 1.4 1995/02/02 02:10:35 jtc Exp $	*/
+/*	$NetBSD: snprintf.c,v 1.5 1996/03/29 23:29:24 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: snprintf.c,v 1.4 1995/02/02 02:10:35 jtc Exp $";
+static char rcsid[] = "$NetBSD: snprintf.c,v 1.5 1996/03/29 23:29:24 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@ static char rcsid[] = "$NetBSD: snprintf.c,v 1.4 1995/02/02 02:10:35 jtc Exp $";
 #include <varargs.h>
 #endif
 
+int
 #if __STDC__
 snprintf(char *str, size_t n, char const *fmt, ...)
 #else
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index d8fd9efe370f..1841db9aebdc 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sscanf.c,v 1.6 1995/02/02 02:10:38 jtc Exp $	*/
+/*	$NetBSD: sscanf.c,v 1.7 1996/03/29 23:29:25 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)sscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: sscanf.c,v 1.6 1995/02/02 02:10:38 jtc Exp $";
+static char rcsid[] = "$NetBSD: sscanf.c,v 1.7 1996/03/29 23:29:25 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -63,6 +63,7 @@ eofread(cookie, buf, len)
 	return (0);
 }
 
+int
 #if __STDC__
 sscanf(const char *str, char const *fmt, ...)
 #else
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index 9ad026fcb058..6cef3682aee8 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.c,v 1.4 1995/02/02 02:10:40 jtc Exp $	*/
+/*	$NetBSD: stdio.c,v 1.5 1996/03/29 23:29:25 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: stdio.c,v 1.4 1995/02/02 02:10:40 jtc Exp $";
+static char rcsid[] = "$NetBSD: stdio.c,v 1.5 1996/03/29 23:29:25 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <fcntl.h>
@@ -52,6 +52,7 @@ static char rcsid[] = "$NetBSD: stdio.c,v 1.4 1995/02/02 02:10:40 jtc Exp $";
  * Small standard I/O/seek/close functions.
  * These maintain the `known seek offset' for seek optimisation.
  */
+int
 __sread(cookie, buf, n)
 	void *cookie;
 	char *buf;
@@ -69,6 +70,7 @@ __sread(cookie, buf, n)
 	return (ret);
 }
 
+int
 __swrite(cookie, buf, n)
 	void *cookie;
 	char const *buf;
@@ -101,6 +103,7 @@ __sseek(cookie, offset, whence)
 	return (ret);
 }
 
+int
 __sclose(cookie)
 	void *cookie;
 {
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index 6d4609f95152..6fdf3849dd70 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ungetc.c,v 1.4 1995/02/02 02:10:47 jtc Exp $	*/
+/*	$NetBSD: ungetc.c,v 1.5 1996/03/29 23:29:27 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)ungetc.c	8.2 (Berkeley) 11/3/93";
 #endif
-static char rcsid[] = "$NetBSD: ungetc.c,v 1.4 1995/02/02 02:10:47 jtc Exp $";
+static char rcsid[] = "$NetBSD: ungetc.c,v 1.5 1996/03/29 23:29:27 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -54,7 +54,7 @@ static char rcsid[] = "$NetBSD: ungetc.c,v 1.4 1995/02/02 02:10:47 jtc Exp $";
  * and move the bytes in the buffer around as necessary so that they
  * are all at the end (stack-style).
  */
-static
+static int
 __submore(fp)
 	register FILE *fp;
 {
@@ -87,6 +87,7 @@ __submore(fp)
 	return (0);
 }
 
+int
 ungetc(c, fp)
 	int c;
 	register FILE *fp;
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 5e4947916cf3..9f944a4fd438 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfscanf.c,v 1.14 1995/03/22 00:57:02 jtc Exp $	*/
+/*	$NetBSD: vfscanf.c,v 1.15 1996/03/29 23:29:28 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: vfscanf.c,v 1.14 1995/03/22 00:57:02 jtc Exp $";
+static char rcsid[] = "$NetBSD: vfscanf.c,v 1.15 1996/03/29 23:29:28 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -101,6 +101,7 @@ static u_char *__sccl();
 /*
  * vfscanf
  */
+int
 __svfscanf(fp, fmt0, ap)
 	register FILE *fp;
 	char const *fmt0;
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 021fcac06902..e7b8b881f567 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vprintf.c,v 1.5 1995/02/02 02:10:51 jtc Exp $	*/
+/*	$NetBSD: vprintf.c,v 1.6 1996/03/29 23:29:29 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,11 +40,12 @@
 #if 0
 static char sccsid[] = "@(#)vprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: vprintf.c,v 1.5 1995/02/02 02:10:51 jtc Exp $";
+static char rcsid[] = "$NetBSD: vprintf.c,v 1.6 1996/03/29 23:29:29 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 
+int
 vprintf(fmt, ap)
 	char const *fmt;
 	_BSD_VA_LIST_ ap;
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index 7bc04aae4aee..02292e467960 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vscanf.c,v 1.5 1995/02/02 02:10:52 jtc Exp $	*/
+/*	$NetBSD: vscanf.c,v 1.6 1996/03/29 23:29:30 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,15 +40,15 @@
 #if 0
 static char sccsid[] = "@(#)vscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: vscanf.c,v 1.5 1995/02/02 02:10:52 jtc Exp $";
+static char rcsid[] = "$NetBSD: vscanf.c,v 1.6 1996/03/29 23:29:30 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 
+int
 vscanf(fmt, ap)
 	const char *fmt;
 	_BSD_VA_LIST_ ap;
 {
-
 	return (__svfscanf(stdin, fmt, ap));
 }
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index e95feb9c6c66..e587c2f52ff4 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsnprintf.c,v 1.5 1995/02/02 02:10:54 jtc Exp $	*/
+/*	$NetBSD: vsnprintf.c,v 1.6 1996/03/29 23:29:31 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,11 +40,12 @@
 #if 0
 static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: vsnprintf.c,v 1.5 1995/02/02 02:10:54 jtc Exp $";
+static char rcsid[] = "$NetBSD: vsnprintf.c,v 1.6 1996/03/29 23:29:31 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 
+int
 vsnprintf(str, n, fmt, ap)
 	char *str;
 	size_t n;
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index c468d7bb3274..7cf9d02e9f4f 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsprintf.c,v 1.5 1995/02/02 02:10:56 jtc Exp $	*/
+/*	$NetBSD: vsprintf.c,v 1.6 1996/03/29 23:29:32 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,12 +40,13 @@
 #if 0
 static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: vsprintf.c,v 1.5 1995/02/02 02:10:56 jtc Exp $";
+static char rcsid[] = "$NetBSD: vsprintf.c,v 1.6 1996/03/29 23:29:32 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #include <limits.h>
 
+int
 vsprintf(str, fmt, ap)
 	char *str;
 	const char *fmt;
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index cd1a3e1e8bf7..8b0ccf88a74c 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsscanf.c,v 1.5 1995/02/02 02:10:57 jtc Exp $	*/
+/*	$NetBSD: vsscanf.c,v 1.6 1996/03/29 23:29:33 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: vsscanf.c,v 1.5 1995/02/02 02:10:57 jtc Exp $";
+static char rcsid[] = "$NetBSD: vsscanf.c,v 1.6 1996/03/29 23:29:33 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -53,10 +53,10 @@ eofread(cookie, buf, len)
 	char *buf;
 	int len;
 {
-
 	return (0);
 }
 
+int
 vsscanf(str, fmt, ap)
 	const char *str;
 	const char *fmt;
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index be2a36d09168..aa3b65600e62 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wbuf.c,v 1.4 1995/02/02 02:10:58 jtc Exp $	*/
+/*	$NetBSD: wbuf.c,v 1.5 1996/03/29 23:29:34 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: wbuf.c,v 1.4 1995/02/02 02:10:58 jtc Exp $";
+static char rcsid[] = "$NetBSD: wbuf.c,v 1.5 1996/03/29 23:29:34 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -51,6 +51,7 @@ static char rcsid[] = "$NetBSD: wbuf.c,v 1.4 1995/02/02 02:10:58 jtc Exp $";
  * the given file.  Flush the buffer out if it is or becomes full,
  * or if c=='\n' and the file is line buffered.
  */
+int
 __swbuf(c, fp)
 	register int c;
 	register FILE *fp;
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index 28a245606c57..700ae1b71694 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wsetup.c,v 1.4 1995/02/02 02:10:59 jtc Exp $	*/
+/*	$NetBSD: wsetup.c,v 1.5 1996/03/29 23:29:35 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)wsetup.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$NetBSD: wsetup.c,v 1.4 1995/02/02 02:10:59 jtc Exp $";
+static char rcsid[] = "$NetBSD: wsetup.c,v 1.5 1996/03/29 23:29:35 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -52,6 +52,7 @@ static char rcsid[] = "$NetBSD: wsetup.c,v 1.4 1995/02/02 02:10:59 jtc Exp $";
  * because either _flags does not include __SWR, or _buf is NULL.
  * _wsetup returns 0 if OK to write, nonzero otherwise.
  */
+int
 __swsetup(fp)
 	register FILE *fp;
 {