diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index 230b1a2ed365..35e1bb8d58f2 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)setmode.c	5.6 (Berkeley) 5/27/91";*/
-static char *rcsid = "$Id: setmode.c,v 1.3 1993/08/26 00:45:02 jtc Exp $";
+static char *rcsid = "$Id: setmode.c,v 1.4 1993/12/23 23:14:43 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -216,7 +216,7 @@ setmode(p)
 	mode_t mask;
 	struct bitcmd *set, *saveset, *endset;
 	int permXbits, setlen;
-	static int compress_mode();
+	static void compress_mode();
 
 	/*
 	 * Get a copy of the mask for the permissions that are mask relative.
@@ -390,7 +390,7 @@ dumpmode(set)
  * 'g' and 'o' commands continue to be separate.  They could probably be 
  * compacted, but it's not worth the effort.
  */
-static
+static void
 compress_mode(set)
 	register struct bitcmd *set;
 {
diff --git a/lib/libc/gen/tolower_.c b/lib/libc/gen/tolower_.c
index d19a51d5380e..ec27268d3e43 100644
--- a/lib/libc/gen/tolower_.c
+++ b/lib/libc/gen/tolower_.c
@@ -27,11 +27,11 @@
  * (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: tolower_.c,v 1.3 1993/09/05 22:29:50 mycroft Exp $
+ *	$Id: tolower_.c,v 1.4 1993/12/23 23:14:49 jtc Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static char *rcsid = "$Id: tolower_.c,v 1.3 1993/09/05 22:29:50 mycroft Exp $";
+static char *rcsid = "$Id: tolower_.c,v 1.4 1993/12/23 23:14:49 jtc Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <stdio.h>
@@ -80,6 +80,7 @@ const short _C_tolower_[1 + 256] = {
 const short *_tolower_tab_ = _C_tolower_;
 
 #undef tolower
+int
 tolower(c)
 	int c;
 {
diff --git a/lib/libc/gen/toupper_.c b/lib/libc/gen/toupper_.c
index 310e9b2e4845..924da888b52e 100644
--- a/lib/libc/gen/toupper_.c
+++ b/lib/libc/gen/toupper_.c
@@ -27,11 +27,11 @@
  * (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: toupper_.c,v 1.3 1993/09/05 22:29:50 mycroft Exp $
+ *	$Id: toupper_.c,v 1.4 1993/12/23 23:14:51 jtc Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static char *rcsid = "$Id: toupper_.c,v 1.3 1993/09/05 22:29:50 mycroft Exp $";
+static char *rcsid = "$Id: toupper_.c,v 1.4 1993/12/23 23:14:51 jtc Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <stdio.h>
@@ -80,6 +80,7 @@ const short _C_toupper_[1 + 256] = {
 const short *_toupper_tab_ = _C_toupper_;
 
 #undef toupper
+int
 toupper(c)
 	int c;
 {