From: Nick Downing <downing.nick@gmail.com>
Date: Wed, 18 Jan 2017 04:25:39 +0000 (+1100)
Subject: Get mini dependency check working just for generated files (syscall stubs, etc)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=609aa607bde59d1c1bf3a3820b8e893f9aa9f276;p=43bsd.git

Get mini dependency check working just for generated files (syscall stubs, etc)
---

diff --git a/lib/libstdc/compat-4.1/ftime.c b/lib/libstdc/compat-4.1/ftime.c
index 243902d..5237976 100644
--- a/lib/libstdc/compat-4.1/ftime.c
+++ b/lib/libstdc/compat-4.1/ftime.c
@@ -24,8 +24,7 @@ struct timeb {
 };
 
 ftime(tp)
-	register struct timeb *tp;
-{
+	register struct timeb *tp; {
 	struct timeval t;
 	struct timezone tz;
 
diff --git a/lib/libstdc/compat-4.1/getpw.c b/lib/libstdc/compat-4.1/getpw.c
index b80ec3e..27f0028 100644
--- a/lib/libstdc/compat-4.1/getpw.c
+++ b/lib/libstdc/compat-4.1/getpw.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -13,8 +12,7 @@ static char sccsid[] = "@(#)getpw.c	5.2 (Berkeley) 3/9/86";
 
 getpw(uid, buf)
 int uid;
-char buf[];
-{
+char buf[]; {
 	static FILE *pwf;
 	register n, c;
 	register char *bp;
diff --git a/lib/libstdc/compat-4.1/gtty.c b/lib/libstdc/compat-4.1/gtty.c
index 0122bab..9de9bff 100644
--- a/lib/libstdc/compat-4.1/gtty.c
+++ b/lib/libstdc/compat-4.1/gtty.c
@@ -1,4 +1,3 @@
-#include <sys/ioctl.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -16,8 +15,7 @@ static char sccsid[] = "@(#)gtty.c	5.2 (Berkeley) 3/9/86";
 #include <sgtty.h>
 
 gtty(fd, ap)
-	struct sgttyb *ap;
-{
+	struct sgttyb *ap; {
 
 	return(ioctl(fd, TIOCGETP, ap));
 }
diff --git a/lib/libstdc/compat-4.1/nice.c b/lib/libstdc/compat-4.1/nice.c
index 9a2fa22..b681f4b 100644
--- a/lib/libstdc/compat-4.1/nice.c
+++ b/lib/libstdc/compat-4.1/nice.c
@@ -15,8 +15,7 @@ static char sccsid[] = "@(#)nice.c	5.2 (Berkeley) 3/9/86";
  * Backwards compatible nice.
  */
 nice(incr)
-	int incr;
-{
+	int incr; {
 	int prio;
 	extern int errno;
 
diff --git a/lib/libstdc/compat-4.1/pause.c b/lib/libstdc/compat-4.1/pause.c
index 24d80cf..1260fb9 100644
--- a/lib/libstdc/compat-4.1/pause.c
+++ b/lib/libstdc/compat-4.1/pause.c
@@ -11,8 +11,7 @@ static char sccsid[] = "@(#)pause.c	5.2 (Berkeley) 3/9/86";
 /*
  * Backwards compatible pause.
  */
-pause()
-{
+pause() {
 
 	sigpause(sigblock(0));
 }
diff --git a/lib/libstdc/compat-4.1/rand.c b/lib/libstdc/compat-4.1/rand.c
index 009914c..3614e2d 100644
--- a/lib/libstdc/compat-4.1/rand.c
+++ b/lib/libstdc/compat-4.1/rand.c
@@ -11,12 +11,10 @@ static char sccsid[] = "@(#)rand.c	5.2 (Berkeley) 3/9/86";
 static	long	randx = 1;
 
 srand(x)
-unsigned x;
-{
+unsigned x; {
 	randx = x;
 }
 
-rand()
-{
+rand() {
 	return((randx = randx * 1103515245 + 12345) & 0x7fffffff);
 }
diff --git a/lib/libstdc/compat-4.1/stty.c b/lib/libstdc/compat-4.1/stty.c
index f429cc6..d14e44e 100644
--- a/lib/libstdc/compat-4.1/stty.c
+++ b/lib/libstdc/compat-4.1/stty.c
@@ -1,4 +1,3 @@
-#include <sys/ioctl.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -16,8 +15,7 @@ static char sccsid[] = "@(#)stty.c	5.2 (Berkeley) 3/9/86";
 #include <sgtty.h>
 
 stty(fd, ap)
-	struct sgttyb *ap;
-{
+	struct sgttyb *ap; {
 
 	return(ioctl(fd, TIOCSETP, ap));
 }
diff --git a/lib/libstdc/compat-4.1/tell.c b/lib/libstdc/compat-4.1/tell.c
index 68a4ba1..72f5270 100644
--- a/lib/libstdc/compat-4.1/tell.c
+++ b/lib/libstdc/compat-4.1/tell.c
@@ -14,7 +14,6 @@ static char sccsid[] = "@(#)tell.c	5.2 (Berkeley) 3/9/86";
 
 long	lseek();
 
-long tell(f)
-{
+long tell(f) {
 	return(lseek(f, 0L, 1));
 }
diff --git a/lib/libstdc/compat-4.1/times.c b/lib/libstdc/compat-4.1/times.c
index df9e088..c398d00 100644
--- a/lib/libstdc/compat-4.1/times.c
+++ b/lib/libstdc/compat-4.1/times.c
@@ -1,4 +1,3 @@
-#include <sys/times.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -23,8 +22,7 @@ struct tms {
 };
 
 times(tmsp)
-	register struct tms *tmsp;
-{
+	register struct tms *tmsp; {
 	struct rusage ru;
 
 	if (getrusage(RUSAGE_SELF, &ru) < 0)
@@ -40,8 +38,7 @@ times(tmsp)
 
 static
 scale60(tvp)
-	register struct timeval *tvp;
-{
+	register struct timeval *tvp; {
 
 	return (tvp->tv_sec * 60 + tvp->tv_usec / 16667);
 }
diff --git a/lib/libstdc/compat-4.1/utime.c b/lib/libstdc/compat-4.1/utime.c
index 3e0b150..931ea3e 100644
--- a/lib/libstdc/compat-4.1/utime.c
+++ b/lib/libstdc/compat-4.1/utime.c
@@ -15,8 +15,7 @@ static char sccsid[] = "@(#)utime.c	5.2 (Berkeley) 3/9/86";
 
 utime(name, otv)
 	char *name;
-	int otv[];
-{
+	int otv[]; {
 	struct timeval tv[2];
 
 	tv[0].tv_sec = otv[0]; tv[0].tv_usec = 0;
diff --git a/lib/libstdc/compat-4.1/vlimit.c b/lib/libstdc/compat-4.1/vlimit.c
index ea853cc..163ddc4 100644
--- a/lib/libstdc/compat-4.1/vlimit.c
+++ b/lib/libstdc/compat-4.1/vlimit.c
@@ -1,5 +1,3 @@
-#include <sys/errno.h>
-#include <sys/vlimit.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -29,8 +27,7 @@ static char sccsid[] = "@(#)vlimit.c	5.2 (Berkeley) 3/9/86";
 #define	NLIMITS		6
 
 vlimit(limit, value)
-	int limit, value;
-{
+	int limit, value; {
 	struct rlimit rlim;
 
 	if (limit <= 0 || limit > NLIMITS)
diff --git a/lib/libstdc/compat-4.1/vtimes.c b/lib/libstdc/compat-4.1/vtimes.c
index 5c0c536..3f32416 100644
--- a/lib/libstdc/compat-4.1/vtimes.c
+++ b/lib/libstdc/compat-4.1/vtimes.c
@@ -1,4 +1,3 @@
-#include <sys/vtimes.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -30,8 +29,7 @@ struct vtimes {
 };
 
 vtimes(par, chi)
-	register struct vtimes *par, *chi;
-{
+	register struct vtimes *par, *chi; {
 	struct rusage ru;
 
 	if (par) {
@@ -50,8 +48,7 @@ vtimes(par, chi)
 static
 getvtimes(aru, avt)
 	register struct rusage *aru;
-	register struct vtimes *avt;
-{
+	register struct vtimes *avt; {
 
 	avt->vm_utime = scale60(&aru->ru_utime);
 	avt->vm_stime = scale60(&aru->ru_stime);
@@ -67,8 +64,7 @@ getvtimes(aru, avt)
 
 static
 scale60(tvp)
-	register struct timeval *tvp;
-{
+	register struct timeval *tvp; {
 
 	return (tvp->tv_sec * 60 + tvp->tv_usec / 16667);
 }
diff --git a/lib/libstdc/compat-sys5/getopt.c b/lib/libstdc/compat-sys5/getopt.c
index 6905a61..e0049f5 100644
--- a/lib/libstdc/compat-sys5/getopt.c
+++ b/lib/libstdc/compat-sys5/getopt.c
@@ -26,8 +26,7 @@ char	*optarg;		/* argument associated with option */
 getopt(nargc,nargv,ostr)
 int	nargc;
 char	**nargv,
-	*ostr;
-{
+	*ostr; {
 	static char	*place = EMSG;	/* option letter processing */
 	register char	*oli;		/* option letter list index */
 	char	*index();
diff --git a/lib/libstdc/compat-sys5/memccpy.c b/lib/libstdc/compat-sys5/memccpy.c
index 381a24f..de22b87 100644
--- a/lib/libstdc/compat-sys5/memccpy.c
+++ b/lib/libstdc/compat-sys5/memccpy.c
@@ -15,8 +15,7 @@ static char sccsid[] = "@(#)memccpy.c	5.2 (Berkeley) 86/03/09";
 char *
 memccpy(t, f, c, n)
 	register char *t, *f;
-	register c, n;
-{
+	register c, n; {
 	while (--n >= 0)
 		if ((*t++ = *f++) == c)
 			return (t);
diff --git a/lib/libstdc/compat-sys5/memchr.c b/lib/libstdc/compat-sys5/memchr.c
index 3093347..e40c2ff 100644
--- a/lib/libstdc/compat-sys5/memchr.c
+++ b/lib/libstdc/compat-sys5/memchr.c
@@ -15,8 +15,7 @@ static char sccsid[] = "@(#)memchr.c	5.2 (Berkeley) 86/03/09";
 char *
 memchr(s, c, n)
 	register char *s;
-	register c, n;
-{
+	register c, n; {
 	while (--n >= 0)
 		if (*s++ == c)
 			return (--s);
diff --git a/lib/libstdc/compat-sys5/memcmp.c b/lib/libstdc/compat-sys5/memcmp.c
index e6b2a50..66b364c 100644
--- a/lib/libstdc/compat-sys5/memcmp.c
+++ b/lib/libstdc/compat-sys5/memcmp.c
@@ -14,8 +14,7 @@ static char sccsid[] = "@(#)memcmp.c	5.2 (Berkeley) 86/03/09";
 
 memcmp(s1, s2, n)
 	register char *s1, *s2;
-	register n;
-{
+	register n; {
 	while (--n >= 0)
 		if (*s1++ != *s2++)
 			return (*--s1 - *--s2);
diff --git a/lib/libstdc/compat-sys5/memcpy.c b/lib/libstdc/compat-sys5/memcpy.c
index 487fd70..94cab58 100644
--- a/lib/libstdc/compat-sys5/memcpy.c
+++ b/lib/libstdc/compat-sys5/memcpy.c
@@ -15,8 +15,7 @@ static char sccsid[] = "@(#)memcpy.c	5.2 (Berkeley) 86/03/09";
 char *
 memcpy(t, f, n)
 	register char *t, *f;
-	register n;
-{
+	register n; {
 	register char *p = t;
 
 	while (--n >= 0)
diff --git a/lib/libstdc/compat-sys5/memset.c b/lib/libstdc/compat-sys5/memset.c
index 2600ed5..b8e8eae 100644
--- a/lib/libstdc/compat-sys5/memset.c
+++ b/lib/libstdc/compat-sys5/memset.c
@@ -15,8 +15,7 @@ static char sccsid[] = "@(#)memset.c	5.2 (Berkeley) 86/03/09";
 char *
 memset(s, c, n)
 	register char *s;
-	register c, n;
-{
+	register c, n; {
 	register char *p = s;
 
 	while (--n >= 0)
diff --git a/lib/libstdc/compat-sys5/strcatn.c b/lib/libstdc/compat-sys5/strcatn.c
index 8db783b..7023789 100644
--- a/lib/libstdc/compat-sys5/strcatn.c
+++ b/lib/libstdc/compat-sys5/strcatn.c
@@ -17,8 +17,7 @@ static char sccsid[] = "@(#)strcatn.c	4.3 (Berkeley) 3/9/86";
 char *
 strcatn(s1, s2, n)
 register char *s1, *s2;
-register n;
-{
+register n; {
 	register char *os1;
 
 	os1 = s1;
diff --git a/lib/libstdc/compat-sys5/strchr.c b/lib/libstdc/compat-sys5/strchr.c
index 24c9b31..8db9dbc 100644
--- a/lib/libstdc/compat-sys5/strchr.c
+++ b/lib/libstdc/compat-sys5/strchr.c
@@ -13,8 +13,7 @@ static char sccsid[] = "@(#)strchr.c	5.2 (Berkeley) 86/03/09";
 
 char *
 strchr(sp, c)
-register char *sp, c;
-{
+register char *sp, c; {
 	do {
 		if (*sp == c)
 			return(sp);
diff --git a/lib/libstdc/compat-sys5/strcmpn.c b/lib/libstdc/compat-sys5/strcmpn.c
index 5e5d4f7..92c43b9 100644
--- a/lib/libstdc/compat-sys5/strcmpn.c
+++ b/lib/libstdc/compat-sys5/strcmpn.c
@@ -14,8 +14,7 @@ static char sccsid[] = "@(#)strcmpn.c	4.3 (Berkeley) 3/9/86";
 
 strcmpn(s1, s2, n)
 register char *s1, *s2;
-register n;
-{
+register n; {
 
 	while (--n >= 0 && *s1 == *s2++)
 		if (*s1++ == '\0')
diff --git a/lib/libstdc/compat-sys5/strcpyn.c b/lib/libstdc/compat-sys5/strcpyn.c
index f791647..87f1fbd 100644
--- a/lib/libstdc/compat-sys5/strcpyn.c
+++ b/lib/libstdc/compat-sys5/strcpyn.c
@@ -15,8 +15,7 @@ static char sccsid[] = "@(#)strcpyn.c	4.3 (Berkeley) 3/9/86";
 
 char *
 strcpyn(s1, s2, n)
-register char *s1, *s2;
-{
+register char *s1, *s2; {
 	register i;
 	register char *os1;
 
diff --git a/lib/libstdc/compat-sys5/strcspn.c b/lib/libstdc/compat-sys5/strcspn.c
index f32fa1a..9aa21a7 100644
--- a/lib/libstdc/compat-sys5/strcspn.c
+++ b/lib/libstdc/compat-sys5/strcspn.c
@@ -13,8 +13,7 @@ static char sccsid[] = "@(#)strcspn.c	5.2 (Berkeley) 86/03/09";
 #endif
 
 strcspn(s, set)
-	register char *s, *set;
-{
+	register char *s, *set; {
 	register n = 0;
 	register char *p;
 	register c;
diff --git a/lib/libstdc/compat-sys5/strpbrk.c b/lib/libstdc/compat-sys5/strpbrk.c
index b1a2727..118e4b2 100644
--- a/lib/libstdc/compat-sys5/strpbrk.c
+++ b/lib/libstdc/compat-sys5/strpbrk.c
@@ -14,8 +14,7 @@ static char sccsid[] = "@(#)strpbrk.c	5.2 (Berkeley) 86/03/09";
 
 char *
 strpbrk(s, brk)
-	register char *s, *brk;
-{
+	register char *s, *brk; {
 	register char *p;
 	register c;
 
diff --git a/lib/libstdc/compat-sys5/strrchr.c b/lib/libstdc/compat-sys5/strrchr.c
index ec71ac6..190429e 100644
--- a/lib/libstdc/compat-sys5/strrchr.c
+++ b/lib/libstdc/compat-sys5/strrchr.c
@@ -13,8 +13,7 @@ static char sccsid[] = "@(#)strrchr.c	5.2 (berkeley) 86/03/09";
 
 char *
 strrchr(sp, c)
-register char *sp, c;
-{
+register char *sp, c; {
 	register char *r;
 
 	r = NULL;
diff --git a/lib/libstdc/compat-sys5/strspn.c b/lib/libstdc/compat-sys5/strspn.c
index 8185083..32d6dba 100644
--- a/lib/libstdc/compat-sys5/strspn.c
+++ b/lib/libstdc/compat-sys5/strspn.c
@@ -13,8 +13,7 @@ static char sccsid[] = "@(#)strspn.c	5.2 (Berkeley) 86/03/09";
 #endif
 
 strspn(s, set)
-	register char *s, *set;
-{
+	register char *s, *set; {
 	register n = 0;
 	register char *p;
 	register c;
diff --git a/lib/libstdc/compat-sys5/strtok.c b/lib/libstdc/compat-sys5/strtok.c
index e378a0a..7255435 100644
--- a/lib/libstdc/compat-sys5/strtok.c
+++ b/lib/libstdc/compat-sys5/strtok.c
@@ -14,8 +14,7 @@ static char sccsid[] = "@(#)strtok.c	5.2 (Berkeley) 86/03/09";
 
 char *
 strtok(s, sep)
-	register char *s, *sep;
-{
+	register char *s, *sep; {
 	register char *p;
 	register c;
 	static char *lasts;
diff --git a/lib/libstdc/compat-sys5/tmpnam.c b/lib/libstdc/compat-sys5/tmpnam.c
index 7b42ba7..7e67016 100644
--- a/lib/libstdc/compat-sys5/tmpnam.c
+++ b/lib/libstdc/compat-sys5/tmpnam.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)tmpnam.c	4.3 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
 
 char *tmpnam(s)
-char *s;
-{
+char *s; {
 	static seed;
 
 	sprintf(s, "temp.%d.%d", getpid(), seed++);
diff --git a/lib/libstdc/csu/crt0.c b/lib/libstdc/csu/crt0.c
index 5e54328..702e33e 100644
--- a/lib/libstdc/csu/crt0.c
+++ b/lib/libstdc/csu/crt0.c
@@ -35,8 +35,7 @@ asm("#define _start start");
 asm("#define _eprol eprol");
 extern	unsigned char	etext;
 extern	unsigned char	eprol;
-start()
-{
+start() {
 	struct kframe {
 		int	kargc;
 		char	*kargv[1];	/* size depends on kargc */
@@ -92,8 +91,7 @@ asm("#undef _eprol");
 #ifdef MCRT0
 /*ARGSUSED*/
 exit(code)
-	register int code;	/* r11 */
-{
+	register int code;	/* r11 */ {
 	monitor(0);
 	_cleanup();
 	asm("	movl r11,r0");
@@ -107,8 +105,7 @@ exit(code)
  * just in case some routine is compiled for profiling
  */
 moncontrol(val)
-	int val;
-{
+	int val; {
 
 }
 asm("	.globl	mcount");
diff --git a/lib/libstdc/csu/gmon.c b/lib/libstdc/csu/gmon.c
index cefa825..0082169 100644
--- a/lib/libstdc/csu/gmon.c
+++ b/lib/libstdc/csu/gmon.c
@@ -35,8 +35,7 @@ static int	s_scale;
 
 monstartup(lowpc, highpc)
     char	*lowpc;
-    char	*highpc;
-{
+    char	*highpc; {
     int			monsize;
     char		*buffer;
     char		*sbrk();
@@ -83,8 +82,7 @@ monstartup(lowpc, highpc)
     monitor( lowpc , highpc , buffer , monsize , tolimit );
 }
 
-_mcleanup()
-{
+_mcleanup() {
     int			fd;
     int			fromindex;
     int			endfrom;
@@ -126,8 +124,7 @@ asm(".text");
 asm(".align 2");
 asm("#the beginning of mcount()");
 asm(".data");
-mcount()
-{
+mcount() {
 	register char			*selfpc;	/* r11 => r5 */
 	register unsigned short		*frompcindex;	/* r10 => r4 */
 	register struct tostruct	*top;		/* r9  => r3 */
@@ -251,8 +248,7 @@ monitor( lowpc , highpc , buf , bufsiz , nfunc )
     char	*highpc;
     char	*buf;	/* declared ``short buffer[]'' in monitor(3) */
     int		bufsiz;
-    int		nfunc;	/* not used, available for compatability only */
-{
+    int		nfunc;	/* not used, available for compatability only */ {
     register o;
 
     if ( lowpc == 0 ) {
@@ -282,8 +278,7 @@ monitor( lowpc , highpc , buf , bufsiz , nfunc )
  *	all the data structures are ready.
  */
 moncontrol(mode)
-    int mode;
-{
+    int mode; {
     if (mode) {
 	/* start */
 	profil(sbuf + sizeof(struct phdr), ssiz - sizeof(struct phdr),
diff --git a/lib/libstdc/csu/mon.c b/lib/libstdc/csu/mon.c
index 60ab793..289ad3a 100644
--- a/lib/libstdc/csu/mon.c
+++ b/lib/libstdc/csu/mon.c
@@ -37,8 +37,7 @@ int numctrs;
 
 monstartup(lowpc, highpc)
 	char *lowpc;
-	char *highpc;
-{
+	char *highpc; {
 	int monsize;
 	char *buffer;
 	int cntsiz;
@@ -67,8 +66,7 @@ monstartup(lowpc, highpc)
 asm(".text");
 asm("#the beginning of mcount()");
 asm(".data");
-mcount()
-{
+mcount() {
 	register int *selfpc;	/* r11 */
 	register long **cntp;   /* r10 */
 
@@ -114,8 +112,7 @@ asm(".data");
 monitor(lowpc, highpc, buf, bufsiz, cntsiz)
 	char *lowpc, *highpc;
 	char *buf;
-	int bufsiz, cntsiz;
-{
+	int bufsiz, cntsiz; {
 	register int o;
 	struct phdr *php;
 	static int ssiz;
@@ -159,8 +156,7 @@ monitor(lowpc, highpc, buf, bufsiz, cntsiz)
  *	all the data structures are ready.
  */
 moncontrol(mode)
-    int mode;
-{
+    int mode; {
     if (mode) {
 	/* start */
 	profil(s_sbuf, s_bufsiz, s_lowpc, s_scale);
diff --git a/lib/libstdc/gen/abort.c b/lib/libstdc/gen/abort.c
index 057f478..7aaab9c 100644
--- a/lib/libstdc/gen/abort.c
+++ b/lib/libstdc/gen/abort.c
@@ -1,5 +1,3 @@
-#include <signal.h>
-#include <sys/signal.h>
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -14,8 +12,7 @@ static char sccsid[] = "@(#)abort.c	5.3 (Berkeley) 3/9/86";
 
 #include "signal.h"
 
-abort()
-{
+abort() {
 	sigblock(~0);
 	signal(SIGILL, SIG_DFL);
 	sigsetmask(~sigmask(SIGILL));
diff --git a/lib/libstdc/gen/alarm.c b/lib/libstdc/gen/alarm.c
index 81ed615..87c439c 100644
--- a/lib/libstdc/gen/alarm.c
+++ b/lib/libstdc/gen/alarm.c
@@ -14,8 +14,7 @@ static char sccsid[] = "@(#)alarm.c	5.2 (Berkeley) 3/9/86";
 #include <sys/time.h>
 
 alarm(secs)
-	int secs;
-{
+	int secs; {
 	struct itimerval it, oitv;
 	register struct itimerval *itp = &it;
 
diff --git a/lib/libstdc/gen/atoi.c b/lib/libstdc/gen/atoi.c
index e6f7be2..d21f781 100644
--- a/lib/libstdc/gen/atoi.c
+++ b/lib/libstdc/gen/atoi.c
@@ -3,8 +3,7 @@ static char sccsid[] = "@(#)atoi.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
 
 atoi(p)
-register char *p;
-{
+register char *p; {
 	register int n;
 	register int f;
 
diff --git a/lib/libstdc/gen/atol.c b/lib/libstdc/gen/atol.c
index bbfab95..b298ad3 100644
--- a/lib/libstdc/gen/atol.c
+++ b/lib/libstdc/gen/atol.c
@@ -4,8 +4,7 @@ static char sccsid[] = "@(#)atol.c	5.2 (Berkeley) 3/9/86";
 
 long
 atol(p)
-register char *p;
-{
+register char *p; {
 	long n;
 	register int f;
 
diff --git a/lib/libstdc/gen/bcmp.c b/lib/libstdc/gen/bcmp.c
index c914da9..2423ce8 100644
--- a/lib/libstdc/gen/bcmp.c
+++ b/lib/libstdc/gen/bcmp.c
@@ -13,8 +13,7 @@ static char sccsid[] = "@(#)bcmp.c	5.1 (Berkeley) 1/27/87";
  */
 bcmp(b1, b2, length)
 	register char *b1, *b2;
-	register int length;
-{
+	register int length; {
 
 	if (length == 0)
 		return (0);
diff --git a/lib/libstdc/gen/bcopy.c b/lib/libstdc/gen/bcopy.c
index 4a974bc..41a0a62 100644
--- a/lib/libstdc/gen/bcopy.c
+++ b/lib/libstdc/gen/bcopy.c
@@ -1,4 +1,3 @@
-#include <sys/types.h>
 /*
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -14,8 +13,7 @@ static char sccsid[] = "@(#)bcopy.c	5.1 (Berkeley) 1/27/87";
  */
 bcopy(src, dst, length)
 	register char *src, *dst;
-	register int length;
-{
+	register int length; {
 	if (length && src != dst)
 		if ((u_int)dst < (u_int)src)
 			if (((int)src | (int)dst | length) & 3)
diff --git a/lib/libstdc/gen/bzero.c b/lib/libstdc/gen/bzero.c
index 748214a..b533fee 100644
--- a/lib/libstdc/gen/bzero.c
+++ b/lib/libstdc/gen/bzero.c
@@ -13,8 +13,7 @@ static char sccsid[] = "@(#)bzero.c	5.1 (Berkeley) 1/27/87";
  */
 bzero(b, length)
 	register char *b;
-	register int length;
-{
+	register int length; {
 
 	if (length)
 		do
diff --git a/lib/libstdc/gen/calloc.c b/lib/libstdc/gen/calloc.c
index 20e5422..06f8a6a 100644
--- a/lib/libstdc/gen/calloc.c
+++ b/lib/libstdc/gen/calloc.c
@@ -7,8 +7,7 @@ static char sccsid[] = "@(#)calloc.c	5.2 (Berkeley) 3/9/86";
  */
 char *
 calloc(num, size)
-	register unsigned num, size;
-{
+	register unsigned num, size; {
 	extern char *malloc();
 	register char *p;
 
@@ -21,7 +20,6 @@ calloc(num, size)
 cfree(p, num, size)
 	char *p;
 	unsigned num;
-	unsigned size;
-{
+	unsigned size; {
 	free(p);
 }
diff --git a/lib/libstdc/gen/closedir.c b/lib/libstdc/gen/closedir.c
index 5b15e4d..19a600f 100644
--- a/lib/libstdc/gen/closedir.c
+++ b/lib/libstdc/gen/closedir.c
@@ -16,8 +16,7 @@ static char sccsid[] = "@(#)closedir.c	5.2 (Berkeley) 3/9/86";
  */
 void
 closedir(dirp)
-	register DIR *dirp;
-{
+	register DIR *dirp; {
 	close(dirp->dd_fd);
 	dirp->dd_fd = -1;
 	dirp->dd_loc = 0;
diff --git a/lib/libstdc/gen/crypt.c b/lib/libstdc/gen/crypt.c
index 6c17b88..5975b68 100644
--- a/lib/libstdc/gen/crypt.c
+++ b/lib/libstdc/gen/crypt.c
@@ -114,8 +114,7 @@ static	char	e[] = {
  */
 
 setkey(key)
-char *key;
-{
+char *key; {
 	register i, j, k;
 	int t;
 
@@ -240,8 +239,7 @@ static	char	preS[48];
  */
 
 encrypt(block, edflag)
-char *block;
-{
+char *block; {
 	int i, ii;
 	register t, j, k;
 
@@ -330,8 +328,7 @@ char *block;
 char *
 crypt(pw,salt)
 char *pw;
-char *salt;
-{
+char *salt; {
 	register i, j, c;
 	int temp;
 	static char block[66], iobuf[16];
diff --git a/lib/libstdc/gen/ctime.c b/lib/libstdc/gen/ctime.c
index a60f7d7..1759c3a 100644
--- a/lib/libstdc/gen/ctime.c
+++ b/lib/libstdc/gen/ctime.c
@@ -1,4 +1,3 @@
-#include <time.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -48,8 +47,7 @@ static char sccsid[] = "@(#)ctime.c	5.5 (Berkeley) 3/9/86";
 #include <sys/timeb.h>
 
 static	char	cbuf[26];
-static	int	dmsize[12] =
-{
+static	int	dmsize[12] = {
 	31,
 	28,
 	31,
@@ -143,15 +141,13 @@ char	*asctime();
 
 char *
 ctime(t)
-time_t *t;
-{
+time_t *t; {
 	return(asctime(localtime(t)));
 }
 
 struct tm *
 localtime(tim)
-time_t *tim;
-{
+time_t *tim; {
 	register int dayno;
 	register struct tm *ct;
 	register dalybeg, daylend;
@@ -215,8 +211,7 @@ time_t *tim;
 static
 sunday(t, d)
 register struct tm *t;
-register int d;
-{
+register int d; {
 	if (d >= 58)
 		d += dysize(t->tm_year) - 365;
 	return(d - (d - t->tm_yday + t->tm_wday + 700) % 7);
@@ -224,8 +219,7 @@ register int d;
 
 struct tm *
 gmtime(tim)
-time_t *tim;
-{
+time_t *tim; {
 	register int d0, d1;
 	long hms, day;
 	register int *tp;
@@ -286,8 +280,7 @@ time_t *tim;
 
 char *
 asctime(t)
-struct tm *t;
-{
+struct tm *t; {
 	register char *cp, *ncp;
 	register int *tp;
 
@@ -317,8 +310,7 @@ struct tm *t;
 	return(cbuf);
 }
 
-dysize(y)
-{
+dysize(y) {
 	if((y%4) == 0)
 		return(366);
 	return(365);
@@ -326,8 +318,7 @@ dysize(y)
 
 static char *
 ct_numb(cp, n)
-register char *cp;
-{
+register char *cp; {
 	cp++;
 	if (n>=10)
 		*cp++ = (n/10)%10 + '0';
diff --git a/lib/libstdc/gen/ctype_.c b/lib/libstdc/gen/ctype_.c
index d0cad2d..c64d586 100644
--- a/lib/libstdc/gen/ctype_.c
+++ b/lib/libstdc/gen/ctype_.c
@@ -1,4 +1,3 @@
-#include <ctype.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ctype_.c	5.4 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
diff --git a/lib/libstdc/gen/disktab.c b/lib/libstdc/gen/disktab.c
index 4546c53..188c9f8 100644
--- a/lib/libstdc/gen/disktab.c
+++ b/lib/libstdc/gen/disktab.c
@@ -15,8 +15,7 @@ static	char *dgetstr();
 
 struct disktab *
 getdiskbyname(name)
-	char *name;
-{
+	char *name; {
 	static struct disktab disk;
 	static char localbuf[100], *cp = localbuf;
 	register struct	disktab *dp = &disk;
@@ -67,8 +66,7 @@ static	char *ddecode();
  */
 static
 dgetent(bp, name)
-	char *bp, *name;
-{
+	char *bp, *name; {
 	register char *cp;
 	register int c;
 	register int i = 0, cnt = 0;
@@ -124,8 +122,7 @@ dgetent(bp, name)
  */
 static
 dnamatch(np)
-	char *np;
-{
+	char *np; {
 	register char *Np, *Bp;
 
 	Bp = tbuf;
@@ -151,8 +148,7 @@ dnamatch(np)
  */
 static char *
 dskip(bp)
-	register char *bp;
-{
+	register char *bp; {
 
 	while (*bp && *bp != ':')
 		bp++;
@@ -171,8 +167,7 @@ dskip(bp)
  */
 static
 dgetnum(id)
-	char *id;
-{
+	char *id; {
 	register int i, base;
 	register char *bp = tbuf;
 
@@ -205,8 +200,7 @@ dgetnum(id)
  */
 static
 dgetflag(id)
-	char *id;
-{
+	char *id; {
 	register char *bp = tbuf;
 
 	for (;;) {
@@ -232,8 +226,7 @@ dgetflag(id)
  */
 static char *
 dgetstr(id, area)
-	char *id, **area;
-{
+	char *id, **area; {
 	register char *bp = tbuf;
 
 	for (;;) {
@@ -258,8 +251,7 @@ dgetstr(id, area)
 static char *
 ddecode(str, area)
 	register char *str;
-	char **area;
-{
+	char **area; {
 	register char *cp;
 	register int c;
 	register char *dp;
diff --git a/lib/libstdc/gen/ecvt.c b/lib/libstdc/gen/ecvt.c
index fd84d3b..be8bd88 100644
--- a/lib/libstdc/gen/ecvt.c
+++ b/lib/libstdc/gen/ecvt.c
@@ -15,24 +15,21 @@ char	*cvt();
 char*
 ecvt(arg, ndigits, decpt, sign)
 double arg;
-int ndigits, *decpt, *sign;
-{
+int ndigits, *decpt, *sign; {
 	return(cvt(arg, ndigits, decpt, sign, 1));
 }
 
 char*
 fcvt(arg, ndigits, decpt, sign)
 double arg;
-int ndigits, *decpt, *sign;
-{
+int ndigits, *decpt, *sign; {
 	return(cvt(arg, ndigits, decpt, sign, 0));
 }
 
 static char*
 cvt(arg, ndigits, decpt, sign, eflag)
 double arg;
-int ndigits, *decpt, *sign;
-{
+int ndigits, *decpt, *sign; {
 	register int r2;
 	double fi, fj;
 	register char *p, *p1;
diff --git a/lib/libstdc/gen/execvp.c b/lib/libstdc/gen/execvp.c
index 7d1e92b..1553520 100644
--- a/lib/libstdc/gen/execvp.c
+++ b/lib/libstdc/gen/execvp.c
@@ -1,4 +1,3 @@
-#include <sys/errno.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)execvp.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -15,14 +14,12 @@ char	*execat(), *getenv();
 extern	errno;
 
 execlp(name, argv)
-char *name, *argv;
-{
+char *name, *argv; {
 	return(execvp(name, &argv));
 }
 
 execvp(name, argv)
-char *name, **argv;
-{
+char *name, **argv; {
 	char *pathstr;
 	register char *cp;
 	char fname[128];
@@ -72,8 +69,7 @@ char *name, **argv;
 static char *
 execat(s1, s2, si)
 register char *s1, *s2;
-char *si;
-{
+char *si; {
 	register char *s;
 
 	s = si;
diff --git a/lib/libstdc/gen/fakcu.c b/lib/libstdc/gen/fakcu.c
index f69e296..8b2ba24 100644
--- a/lib/libstdc/gen/fakcu.c
+++ b/lib/libstdc/gen/fakcu.c
@@ -6,6 +6,5 @@ static char sccsid[] = "@(#)fakcu.c	5.2 (Berkeley) 3/9/86";
  * Null cleanup routine to resolve reference in exit() 
  * if not using stdio.
  */
-_cleanup()
-{
+_cleanup() {
 }
diff --git a/lib/libstdc/gen/ffs.c b/lib/libstdc/gen/ffs.c
index 9cdd64b..63db817 100644
--- a/lib/libstdc/gen/ffs.c
+++ b/lib/libstdc/gen/ffs.c
@@ -23,8 +23,7 @@ static char sccsid[] = "@(#)ffs.c	5.2 (Berkeley) 6/27/88";
  * ffs -- vax ffs instruction
  */
 ffs(mask)
-	register long mask;
-{
+	register long mask; {
 	register int cnt;
 
 	if (mask == 0)
diff --git a/lib/libstdc/gen/frexp.c b/lib/libstdc/gen/frexp.c
index c1c727f..4b16b76 100644
--- a/lib/libstdc/gen/frexp.c
+++ b/lib/libstdc/gen/frexp.c
@@ -15,8 +15,7 @@ static char sccsid[] = "@(#)frexp.c	5.2 (Berkeley) 3/9/86";
 double
 frexp(x,i)
 double x;
-int *i;
-{
+int *i; {
 	int neg;
 	int j;
 	j = 0;
diff --git a/lib/libstdc/gen/fstab.c b/lib/libstdc/gen/fstab.c
index fab4d13..b44ed37 100644
--- a/lib/libstdc/gen/fstab.c
+++ b/lib/libstdc/gen/fstab.c
@@ -18,8 +18,7 @@ static	FILE *fs_file = 0;
 
 static char *
 fsskip(p)
-	register char *p;
-{
+	register char *p; {
 
 	while (*p && *p != ':')
 		++p;
@@ -31,8 +30,7 @@ fsskip(p)
 static char *
 fsdigit(backp, string, end)
 	int *backp;
-	char *string, end;
-{
+	char *string, end; {
 	register int value = 0;
 	register char *cp;
 
@@ -52,8 +50,7 @@ fsdigit(backp, string, end)
 
 static
 fstabscan(fs)
-	struct fstab *fs;
-{
+	struct fstab *fs; {
 	register char *cp;
 
 	cp = fgets(line, 256, fs_file);
@@ -74,8 +71,7 @@ fstabscan(fs)
 	return (5);
 }
 	
-setfsent()
-{
+setfsent() {
 
 	if (fs_file)
 		endfsent();
@@ -86,8 +82,7 @@ setfsent()
 	return (1);
 }
 
-endfsent()
-{
+endfsent() {
 
 	if (fs_file) {
 		fclose(fs_file);
@@ -97,8 +92,7 @@ endfsent()
 }
 
 struct fstab *
-getfsent()
-{
+getfsent() {
 	int nfields;
 
 	if ((fs_file == 0) && (setfsent() == 0))
@@ -111,8 +105,7 @@ getfsent()
 
 struct fstab *
 getfsspec(name)
-	char *name;
-{
+	char *name; {
 	register struct fstab *fsp;
 
 	if (setfsent() == 0)	/* start from the beginning */
@@ -125,8 +118,7 @@ getfsspec(name)
 
 struct fstab *
 getfsfile(name)
-	char *name;
-{
+	char *name; {
 	register struct fstab *fsp;
 
 	if (setfsent() == 0)	/* start from the beginning */
@@ -139,8 +131,7 @@ getfsfile(name)
 
 struct fstab *
 getfstype(type)
-	char *type;
-{
+	char *type; {
 	register struct fstab *fs;
 
 	if (setfsent() == 0)
diff --git a/lib/libstdc/gen/gcvt.c b/lib/libstdc/gen/gcvt.c
index e78925d..98c62c2 100644
--- a/lib/libstdc/gen/gcvt.c
+++ b/lib/libstdc/gen/gcvt.c
@@ -12,8 +12,7 @@ char	*ecvt();
 char *
 gcvt(number, ndigit, buf)
 double number;
-char *buf;
-{
+char *buf; {
 	int sign, decpt;
 	register char *p1, *p2;
 	register i;
diff --git a/lib/libstdc/gen/getenv.c b/lib/libstdc/gen/getenv.c
index 7da3627..4ca9947 100644
--- a/lib/libstdc/gen/getenv.c
+++ b/lib/libstdc/gen/getenv.c
@@ -12,8 +12,7 @@ char	*nvmatch();
 
 char *
 getenv(name)
-register char *name;
-{
+register char *name; {
 	register char **p = environ;
 	register char *v;
 
@@ -32,8 +31,7 @@ register char *name;
 
 static char *
 nvmatch(s1, s2)
-register char *s1, *s2;
-{
+register char *s1, *s2; {
 
 	while (*s1 == *s2++)
 		if (*s1++ == '=')
diff --git a/lib/libstdc/gen/getgrent.c b/lib/libstdc/gen/getgrent.c
index dbd487c..4f93172 100644
--- a/lib/libstdc/gen/getgrent.c
+++ b/lib/libstdc/gen/getgrent.c
@@ -13,16 +13,14 @@ static char line[BUFSIZ+1];
 static struct group group;
 static char *gr_mem[MAXGRP];
 
-setgrent()
-{
+setgrent() {
 	if( !grf )
 		grf = fopen( GROUP, "r" );
 	else
 		rewind( grf );
 }
 
-endgrent()
-{
+endgrent() {
 	if( grf ){
 		fclose( grf );
 		grf = NULL;
@@ -32,16 +30,14 @@ endgrent()
 static char *
 grskip(p,c)
 register char *p;
-register c;
-{
+register c; {
 	while( *p && *p != c ) ++p;
 	if( *p ) *p++ = 0;
 	return( p );
 }
 
 struct group *
-getgrent()
-{
+getgrent() {
 	register char *p, **q;
 
 	if( !grf && !(grf = fopen( GROUP, "r" )) )
diff --git a/lib/libstdc/gen/getgrgid.c b/lib/libstdc/gen/getgrgid.c
index d7c07fe..8a3509d 100644
--- a/lib/libstdc/gen/getgrgid.c
+++ b/lib/libstdc/gen/getgrgid.c
@@ -6,8 +6,7 @@ static char sccsid[] = "@(#)getgrgid.c	5.2 (Berkeley) 3/9/86";
 
 struct group *
 getgrgid(gid)
-register gid;
-{
+register gid; {
 	register struct group *p;
 	struct group *getgrent();
 
diff --git a/lib/libstdc/gen/getgrnam.c b/lib/libstdc/gen/getgrnam.c
index 5e12284..0c1c0a5 100644
--- a/lib/libstdc/gen/getgrnam.c
+++ b/lib/libstdc/gen/getgrnam.c
@@ -6,8 +6,7 @@ static char sccsid[] = "@(#)getgrnam.c	5.2 (Berkeley) 3/9/86";
 
 struct group *
 getgrnam(name)
-register char *name;
-{
+register char *name; {
 	register struct group *p;
 	struct group *getgrent();
 
diff --git a/lib/libstdc/gen/getlogin.c b/lib/libstdc/gen/getlogin.c
index 6988fba..f5b03aa 100644
--- a/lib/libstdc/gen/getlogin.c
+++ b/lib/libstdc/gen/getlogin.c
@@ -8,8 +8,7 @@ static	char UTMP[]	= "/etc/utmp";
 static	struct utmp ubuf;
 
 char *
-getlogin()
-{
+getlogin() {
 	register int me, uf;
 	register char *cp;
 
diff --git a/lib/libstdc/gen/getpass.c b/lib/libstdc/gen/getpass.c
index 7382e71..d1ae6dd 100644
--- a/lib/libstdc/gen/getpass.c
+++ b/lib/libstdc/gen/getpass.c
@@ -1,5 +1,3 @@
-#include <sys/ioctl.h>
-#include <sys/signal.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getpass.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -10,8 +8,7 @@ static char sccsid[] = "@(#)getpass.c	5.2 (Berkeley) 3/9/86";
 
 char *
 getpass(prompt)
-char *prompt;
-{
+char *prompt; {
 	struct sgttyb ttyb;
 	int flags;
 	register char *p;
diff --git a/lib/libstdc/gen/getpwent.c b/lib/libstdc/gen/getpwent.c
index 6ac2c73..5ccbaa5 100644
--- a/lib/libstdc/gen/getpwent.c
+++ b/lib/libstdc/gen/getpwent.c
@@ -24,16 +24,14 @@ char	*_pw_file = "/etc/passwd";
 DBM	*_pw_db;
 int	_pw_stayopen;
 
-setpwent()
-{
+setpwent() {
 	if (pwf == NULL)
 		pwf = fopen(_pw_file, "r");
 	else
 		rewind(pwf);
 }
 
-endpwent()
-{
+endpwent() {
 	if (pwf != NULL) {
 		fclose(pwf);
 		pwf = NULL;
@@ -47,8 +45,7 @@ endpwent()
 
 static char *
 pwskip(p)
-register char *p;
-{
+register char *p; {
 	while (*p && *p != ':' && *p != '\n')
 		++p;
 	if (*p)
@@ -57,8 +54,7 @@ register char *p;
 }
 
 struct passwd *
-getpwent()
-{
+getpwent() {
 	register char *p;
 
 	if (pwf == NULL) {
@@ -90,7 +86,6 @@ getpwent()
 }
 
 setpwfile(file)
-	char *file;
-{
+	char *file; {
 	_pw_file = file;
 }
diff --git a/lib/libstdc/gen/getpwnamuid.c b/lib/libstdc/gen/getpwnamuid.c
index de02299..2091278 100644
--- a/lib/libstdc/gen/getpwnamuid.c
+++ b/lib/libstdc/gen/getpwnamuid.c
@@ -1,4 +1,3 @@
-#include <fcntl.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -27,8 +26,7 @@ int	_pw_stayopen;
 
 static struct passwd *
 fetchpw(key)
-	datum key;
-{
+	datum key; {
         register char *cp, *tp;
 
         if (key.dptr == 0)
@@ -57,8 +55,7 @@ fetchpw(key)
 
 struct passwd *
 getpwnam(nam)
-	char *nam;
-{
+	char *nam; {
         datum key;
 	register struct passwd *pw;
 
@@ -90,8 +87,7 @@ getpwnam(nam)
 
 struct passwd *
 getpwuid(uid)
-	int uid;
-{
+	int uid; {
         datum key;
 	register struct passwd *pw;
 
diff --git a/lib/libstdc/gen/getttyent.c b/lib/libstdc/gen/getttyent.c
index 164c6b3..6de3228 100644
--- a/lib/libstdc/gen/getttyent.c
+++ b/lib/libstdc/gen/getttyent.c
@@ -19,16 +19,14 @@ static FILE *tf = NULL;
 static char line[LINE];
 static struct ttyent tty;
 
-setttyent()
-{
+setttyent() {
 	if (tf == NULL)
 		tf = fopen(TTYFILE, "r");
 	else
 		rewind(tf);
 }
 
-endttyent()
-{
+endttyent() {
 	if (tf != NULL) {
 		(void) fclose(tf);
 		tf = NULL;
@@ -43,8 +41,7 @@ endttyent()
  */
 static char *
 skip(p)
-	register char *p;
-{
+	register char *p; {
 	register char *t = p;
 	register int c;
 	register int q = 0;
@@ -78,8 +75,7 @@ skip(p)
 
 static char *
 value(p)
-	register char *p;
-{
+	register char *p; {
 	if ((p = index(p,'=')) == 0)
 		return(NULL);
 	p++;			/* get past the = sign */
@@ -87,8 +83,7 @@ value(p)
 }
 
 struct ttyent *
-getttyent()
-{
+getttyent() {
 	register char *p;
 	register int c;
 
diff --git a/lib/libstdc/gen/getttynam.c b/lib/libstdc/gen/getttynam.c
index f947abd..ce58f38 100644
--- a/lib/libstdc/gen/getttynam.c
+++ b/lib/libstdc/gen/getttynam.c
@@ -12,8 +12,7 @@ static char sccsid[] = "@(#)getttynam.c	5.2 (Berkeley) 3/9/86";
 
 struct ttyent *
 getttynam(tty)
-	char *tty;
-{
+	char *tty; {
 	register struct ttyent *t;
 
 	setttyent();
diff --git a/lib/libstdc/gen/getusershell.c b/lib/libstdc/gen/getusershell.c
index f9fe9ae..52f0e22 100644
--- a/lib/libstdc/gen/getusershell.c
+++ b/lib/libstdc/gen/getusershell.c
@@ -30,8 +30,7 @@ extern char **initshells();
  * Get a list of shells from SHELLS, if it exists.
  */
 char *
-getusershell()
-{
+getusershell() {
 	char *ret;
 
 	if (curshell == NULL)
@@ -42,8 +41,7 @@ getusershell()
 	return (ret);
 }
 
-endusershell()
-{
+endusershell() {
 	
 	if (shells != NULL)
 		free((char *)shells);
@@ -54,15 +52,13 @@ endusershell()
 	curshell = NULL;
 }
 
-setusershell()
-{
+setusershell() {
 
 	curshell = initshells();
 }
 
 static char **
-initshells()
-{
+initshells() {
 	register char **sp, *cp;
 	register FILE *fp;
 	struct stat statb;
diff --git a/lib/libstdc/gen/getwd.c b/lib/libstdc/gen/getwd.c
index 8fd1680..ba1f95f 100644
--- a/lib/libstdc/gen/getwd.c
+++ b/lib/libstdc/gen/getwd.c
@@ -1,4 +1,3 @@
-#include <sys/types.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -24,8 +23,7 @@ static int pathsize;			/* pathname length */
 
 char *
 getwd(pathname)
-	char *pathname;
-{
+	char *pathname; {
 	char pathbuf[MAXPATHLEN];		/* temporary pathname buffer */
 	char *pnptr = &pathbuf[(sizeof pathbuf)-1]; /* pathname pointer */
 	char curdir[MAXPATHLEN];	/* current directory buffer */
@@ -102,8 +100,7 @@ getwd(pathname)
 static char *
 prepend(dirname, pathname)
 	register char *dirname;
-	register char *pathname;
-{
+	register char *pathname; {
 	register int i;			/* directory name size counter */
 
 	for (i = 0; *dirname != '\0'; i++, dirname++)
diff --git a/lib/libstdc/gen/index.c b/lib/libstdc/gen/index.c
index 6a6871c..66ecef2 100644
--- a/lib/libstdc/gen/index.c
+++ b/lib/libstdc/gen/index.c
@@ -11,8 +11,7 @@ static char sccsid[] = "@(#)index.c	5.2 (Berkeley) 3/9/86";
 
 char *
 index(sp, c)
-register char *sp, c;
-{
+register char *sp, c; {
 	do {
 		if (*sp == c)
 			return(sp);
diff --git a/lib/libstdc/gen/initgroups.c b/lib/libstdc/gen/initgroups.c
index 362e3e6..62d5b84 100644
--- a/lib/libstdc/gen/initgroups.c
+++ b/lib/libstdc/gen/initgroups.c
@@ -19,8 +19,7 @@ struct group *getgrent();
 
 initgroups(uname, agroup)
 	char *uname;
-	int agroup;
-{
+	int agroup; {
 	int groups[NGROUPS], ngroups = 0;
 	register struct group *grp;
 	register int i;
diff --git a/lib/libstdc/gen/insque.c b/lib/libstdc/gen/insque.c
index 1babc64..74c70c4 100644
--- a/lib/libstdc/gen/insque.c
+++ b/lib/libstdc/gen/insque.c
@@ -8,6 +8,8 @@
 static char sccsid[] = "@(#)insque.c	5.1 (Berkeley) 1/27/87";
 #endif LIBC_SCCS and not lint
 
+#include <gen.h>
+
 /*
  * insque -- vax insque instruction
  *
@@ -21,8 +23,7 @@ static char sccsid[] = "@(#)insque.c	5.1 (Berkeley) 1/27/87";
 /*};*/
 
 insque(e, prev)
-	register struct vaxque *e, *prev;
-{
+	register struct vaxque *e, *prev; {
 	e->vq_prev = prev;
 	e->vq_next = prev->vq_next;
 	prev->vq_next->vq_prev = e;
diff --git a/lib/libstdc/gen/isatty.c b/lib/libstdc/gen/isatty.c
index 5d34cf4..d293062 100644
--- a/lib/libstdc/gen/isatty.c
+++ b/lib/libstdc/gen/isatty.c
@@ -1,4 +1,3 @@
-#include <sys/ioctl.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)isatty.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -9,8 +8,7 @@ static char sccsid[] = "@(#)isatty.c	5.2 (Berkeley) 3/9/86";
 
 #include <sgtty.h>
 
-isatty(f)
-{
+isatty(f) {
 	struct sgttyb ttyb;
 
 	if (ioctl(f, TIOCGETP, &ttyb) < 0)
diff --git a/lib/libstdc/gen/malloc.c b/lib/libstdc/gen/malloc.c
index 4d200ed..c63d8cb 100644
--- a/lib/libstdc/gen/malloc.c
+++ b/lib/libstdc/gen/malloc.c
@@ -84,8 +84,7 @@ static	u_int nmalloc[NBUCKETS];
 #include <stdio.h>
 static
 botch(s)
-	char *s;
-{
+	char *s; {
 	fprintf(stderr, "\r\nassertion botched: %s\r\n", s);
  	(void) fflush(stderr);		/* just in case user buffered it */
 	abort();
@@ -96,8 +95,7 @@ botch(s)
 
 char *
 malloc(nbytes)
-	unsigned nbytes;
-{
+	unsigned nbytes; {
   	register union overhead *op;
   	register int bucket;
 	register unsigned amt, n;
@@ -180,8 +178,7 @@ malloc(nbytes)
  * Allocate more memory to the indicated bucket.
  */
 morecore(bucket)
-	int bucket;
-{
+	int bucket; {
   	register union overhead *op;
 	register int sz;		/* size of desired block */
   	int amt;			/* amount to allocate */
@@ -221,8 +218,7 @@ morecore(bucket)
 }
 
 free(cp)
-	char *cp;
-{   
+	char *cp; {
   	register int size;
 	register union overhead *op;
 
@@ -264,8 +260,7 @@ int realloc_srchlen = 4;	/* 4 should be plenty, -1 =>'s whole list */
 char *
 realloc(cp, nbytes)
 	char *cp; 
-	unsigned nbytes;
-{   
+	unsigned nbytes; {
   	register u_int onb, i;
 	union overhead *op;
   	char *res;
@@ -334,8 +329,7 @@ realloc(cp, nbytes)
 static
 findbucket(freep, srchlen)
 	union overhead *freep;
-	int srchlen;
-{
+	int srchlen; {
 	register union overhead *p;
 	register int i, j;
 
@@ -359,8 +353,7 @@ findbucket(freep, srchlen)
  * frees for each size category.
  */
 mstats(s)
-	char *s;
-{
+	char *s; {
   	register int i, j;
   	register union overhead *p;
   	int totfree = 0,
diff --git a/lib/libstdc/gen/mkstemp.c b/lib/libstdc/gen/mkstemp.c
index 31b495a..f0fa5bd 100644
--- a/lib/libstdc/gen/mkstemp.c
+++ b/lib/libstdc/gen/mkstemp.c
@@ -1,4 +1,3 @@
-#include <fcntl.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -12,8 +11,7 @@ static char sccsid[] = "@(#)mkstemp.c	5.2 (Berkeley) 3/9/86";
 #include <sys/file.h>
 
 mkstemp(as)
-	char *as;
-{
+	char *as; {
 	register char *s;
 	register unsigned int pid;
 	register int fd, i;
diff --git a/lib/libstdc/gen/mktemp.c b/lib/libstdc/gen/mktemp.c
index c3e2712..47fbe2e 100644
--- a/lib/libstdc/gen/mktemp.c
+++ b/lib/libstdc/gen/mktemp.c
@@ -4,8 +4,7 @@ static char sccsid[] = "@(#)mktemp.c	5.2 (Berkeley) 3/9/86";
 
 char *
 mktemp(as)
-char *as;
-{
+char *as; {
 	register char *s;
 	register unsigned pid;
 	register i;
diff --git a/lib/libstdc/gen/ndbm.c b/lib/libstdc/gen/ndbm.c
index c698028..f51a60a 100644
--- a/lib/libstdc/gen/ndbm.c
+++ b/lib/libstdc/gen/ndbm.c
@@ -1,6 +1,3 @@
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/param.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -29,8 +26,7 @@ extern  int errno;
 DBM *
 dbm_open(file, flags, mode)
 	char *file;
-	int flags, mode;
-{
+	int flags, mode; {
 	struct stat statb;
 	register DBM *db;
 
@@ -64,8 +60,7 @@ bad:
 
 void
 dbm_close(db)
-	DBM *db;
-{
+	DBM *db; {
 
 	(void) close(db->dbm_dirf);
 	(void) close(db->dbm_pagf);
@@ -75,8 +70,7 @@ dbm_close(db)
 long
 dbm_forder(db, key)
 	register DBM *db;
-	datum key;
-{
+	datum key; {
 	long hash;
 
 	hash = dcalchash(key);
@@ -92,8 +86,7 @@ dbm_forder(db, key)
 datum
 dbm_fetch(db, key)
 	register DBM *db;
-	datum key;
-{
+	datum key; {
 	register i;
 	datum item;
 
@@ -113,8 +106,7 @@ err:
 
 dbm_delete(db, key)
 	register DBM *db;
-	datum key;
-{
+	datum key; {
 	register i;
 	datum item;
 
@@ -142,8 +134,7 @@ dbm_delete(db, key)
 dbm_store(db, key, dat, replace)
 	register DBM *db;
 	datum key, dat;
-	int replace;
-{
+	int replace; {
 	register i;
 	datum item, item1;
 	char ovfbuf[PBLKSIZ];
@@ -218,8 +209,7 @@ split:
 
 datum
 dbm_firstkey(db)
-	DBM *db;
-{
+	DBM *db; {
 
 	db->dbm_blkptr = 0L;
 	db->dbm_keyptr = 0;
@@ -228,8 +218,7 @@ dbm_firstkey(db)
 
 datum
 dbm_nextkey(db)
-	register DBM *db;
-{
+	register DBM *db; {
 	struct stat statb;
 	datum item;
 
@@ -267,8 +256,7 @@ err:
 static
 dbm_access(db, hash)
 	register DBM *db;
-	long hash;
-{
+	long hash; {
 
 	for (db->dbm_hmask=0;; db->dbm_hmask=(db->dbm_hmask<<1)+1) {
 		db->dbm_blkno = hash & db->dbm_hmask;
@@ -290,8 +278,7 @@ dbm_access(db, hash)
 
 static
 getbit(db)
-	register DBM *db;
-{
+	register DBM *db; {
 	long bn;
 	register b, i, n;
 	
@@ -313,8 +300,7 @@ getbit(db)
 
 static
 setbit(db)
-	register DBM *db;
-{
+	register DBM *db; {
 	long bn;
 	register i, n, b;
 
@@ -339,8 +325,7 @@ setbit(db)
 
 static datum
 makdatum(buf, n)
-	char buf[PBLKSIZ];
-{
+	char buf[PBLKSIZ]; {
 	register short *sp;
 	register t;
 	datum item;
@@ -362,8 +347,7 @@ makdatum(buf, n)
 static
 finddatum(buf, item)
 	char buf[PBLKSIZ];
-	datum item;
-{
+	datum item; {
 	register short *sp;
 	register int i, n, j;
 
@@ -380,8 +364,7 @@ finddatum(buf, item)
 }
 
 static  int hitab[16]
-/* ken's
-{
+/* ken's {
 	055,043,036,054,063,014,004,005,
 	010,064,077,000,035,027,025,071,
 };
@@ -412,8 +395,7 @@ static  long hltab[64]
 static long
 hashinc(db, hash)
 	register DBM *db;
-	long hash;
-{
+	long hash; {
 	long bit;
 
 	hash &= db->dbm_hmask;
@@ -430,8 +412,7 @@ hashinc(db, hash)
 
 static long
 dcalchash(item)
-	datum item;
-{
+	datum item; {
 	register int s, c, j;
 	register char *cp;
 	register long hashl;
@@ -455,8 +436,7 @@ dcalchash(item)
  */
 static
 delitem(buf, n)
-	char buf[PBLKSIZ];
-{
+	char buf[PBLKSIZ]; {
 	register short *sp, *sp1;
 	register i1, i2;
 
@@ -488,8 +468,7 @@ delitem(buf, n)
 static
 additem(buf, item, item1)
 	char buf[PBLKSIZ];
-	datum item, item1;
-{
+	datum item, item1; {
 	register short *sp;
 	register i1, i2;
 
@@ -512,8 +491,7 @@ additem(buf, item, item1)
 #ifdef DEBUG
 static
 chkblk(buf)
-	char buf[PBLKSIZ];
-{
+	char buf[PBLKSIZ]; {
 	register short *sp;
 	register t, i;
 
diff --git a/lib/libstdc/gen/nlist.c b/lib/libstdc/gen/nlist.c
index e7d1831..f253b01 100644
--- a/lib/libstdc/gen/nlist.c
+++ b/lib/libstdc/gen/nlist.c
@@ -1,5 +1,3 @@
-#include <nlist.h>
-#include <sys/exec.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -19,8 +17,7 @@ static char sccsid[] = "@(#)nlist.c	5.2 (Berkeley) 3/9/86";
  */
 nlist(name, list)
 	char *name;
-	struct nlist *list;
-{
+	struct nlist *list; {
 	register struct nlist *p, *q;
 	register char *s1, *s2;
 	register n, m;
diff --git a/lib/libstdc/gen/opendir.c b/lib/libstdc/gen/opendir.c
index 6996007..164f5eb 100644
--- a/lib/libstdc/gen/opendir.c
+++ b/lib/libstdc/gen/opendir.c
@@ -16,8 +16,7 @@ static char sccsid[] = "@(#)opendir.c	5.2 (Berkeley) 3/9/86";
  */
 DIR *
 opendir(name)
-	char *name;
-{
+	char *name; {
 	register DIR *dirp;
 	register int fd;
 
diff --git a/lib/libstdc/gen/perror.c b/lib/libstdc/gen/perror.c
index c3bec72..957f2d5 100644
--- a/lib/libstdc/gen/perror.c
+++ b/lib/libstdc/gen/perror.c
@@ -19,8 +19,7 @@ int	errno;
 int	sys_nerr;
 char	*sys_errlist[];
 perror(s)
-	char *s;
-{
+	char *s; {
 	struct iovec iov[4];
 	register struct iovec *v = iov;
 
diff --git a/lib/libstdc/gen/psignal.c b/lib/libstdc/gen/psignal.c
index 845db8c..5221cdf 100644
--- a/lib/libstdc/gen/psignal.c
+++ b/lib/libstdc/gen/psignal.c
@@ -1,4 +1,3 @@
-#include <sys/signal.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -19,8 +18,7 @@ extern	char *sys_siglist[];
 
 psignal(sig, s)
 	unsigned sig;
-	char *s;
-{
+	char *s; {
 	register char *c;
 	register n;
 
diff --git a/lib/libstdc/gen/qsort.c b/lib/libstdc/gen/qsort.c
index 4e85c94..5904068 100644
--- a/lib/libstdc/gen/qsort.c
+++ b/lib/libstdc/gen/qsort.c
@@ -36,8 +36,7 @@ qsort(base, n, size, compar)
 	char	*base;
 	int	n;
 	int	size;
-	int	(*compar)();
-{
+	int	(*compar)(); {
 	register char c, *i, *j, *lo, *hi;
 	char *min, *max;
 
@@ -109,8 +108,7 @@ qsort(base, n, size, compar)
 
 static
 qst(base, max)
-	char *base, *max;
-{
+	char *base, *max; {
 	register char c, *i, *j, *jj;
 	register int ii;
 	char *mid, *tmp;
diff --git a/lib/libstdc/gen/random.c b/lib/libstdc/gen/random.c
index a63cf46..cc68148 100644
--- a/lib/libstdc/gen/random.c
+++ b/lib/libstdc/gen/random.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -174,8 +173,7 @@ static  long		*end_ptr		= &randtbl[ DEG_3 + 1 ];
 
 srandom( x )
 
-    unsigned		x;
-{
+    unsigned		x; {
     	register  int		i, j;
 
 	if(  rand_type  ==  TYPE_0  )  {
@@ -216,8 +214,7 @@ initstate( seed, arg_state, n )
 
     unsigned		seed;			/* seed for R. N. G. */
     char		*arg_state;		/* pointer to state array */
-    int			n;			/* # bytes of state info */
-{
+    int			n;			/* # bytes of state info */ {
 	register  char		*ostate		= (char *)( &state[ -1 ] );
 
 	if(  rand_type  ==  TYPE_0  )  state[ -1 ] = rand_type;
@@ -282,8 +279,7 @@ initstate( seed, arg_state, n )
 char  *
 setstate( arg_state )
 
-    char		*arg_state;
-{
+    char		*arg_state; {
 	register  long		*new_state	= (long *)arg_state;
 	register  int		type		= new_state[0]%MAX_TYPES;
 	register  int		rear		= new_state[0]/MAX_TYPES;
@@ -332,8 +328,7 @@ setstate( arg_state )
  */
 
 long
-random()
-{
+random() {
 	long		i;
 	
 	if(  rand_type  ==  TYPE_0  )  {
diff --git a/lib/libstdc/gen/readdir.c b/lib/libstdc/gen/readdir.c
index 34d43ba..558d743 100644
--- a/lib/libstdc/gen/readdir.c
+++ b/lib/libstdc/gen/readdir.c
@@ -16,8 +16,7 @@ static char sccsid[] = "@(#)readdir.c	5.2 (Berkeley) 3/9/86";
  */
 struct direct *
 readdir(dirp)
-	register DIR *dirp;
-{
+	register DIR *dirp; {
 	register struct direct *dp;
 
 	for (;;) {
diff --git a/lib/libstdc/gen/regex.c b/lib/libstdc/gen/regex.c
index 73c1e0c..b506edf 100644
--- a/lib/libstdc/gen/regex.c
+++ b/lib/libstdc/gen/regex.c
@@ -101,8 +101,7 @@ static	char	circf;
  */
 char *
 re_comp(sp)
-	register char	*sp;
-{
+	register char	*sp; {
 	register int	c;
 	register char	*ep = expbuf;
 	int	cclcnt, numbra = 0;
@@ -225,8 +224,7 @@ re_comp(sp)
  */
 int
 re_exec(p1)
-	register char	*p1;
-{
+	register char	*p1; {
 	register char	*p2 = expbuf;
 	register int	c;
 	int	rv;
@@ -265,8 +263,7 @@ re_exec(p1)
  */
 static	int
 advance(lp, ep)
-	register char	*lp, *ep;
-{
+	register char	*lp, *ep; {
 	register char	*curlp;
 	int	ct, i;
 	int	rv;
@@ -373,8 +370,7 @@ advance(lp, ep)
 
 backref(i, lp)
 	register int	i;
-	register char	*lp;
-{
+	register char	*lp; {
 	register char	*bp;
 
 	bp = braslist[i];
@@ -387,8 +383,7 @@ backref(i, lp)
 int
 cclass(set, c, af)
 	register char	*set, c;
-	int	af;
-{
+	int	af; {
 	register int	n;
 
 	if (c == 0)
diff --git a/lib/libstdc/gen/remque.c b/lib/libstdc/gen/remque.c
index 70bacac..7217469 100644
--- a/lib/libstdc/gen/remque.c
+++ b/lib/libstdc/gen/remque.c
@@ -8,6 +8,8 @@
 static char sccsid[] = "@(#)remque.c	5.1 (Berkeley) 1/27/87";
 #endif LIBC_SCCS and not lint
 
+#include <gen.h>
+
 /*
  * remque -- vax remque instruction
  *
@@ -21,8 +23,7 @@ static char sccsid[] = "@(#)remque.c	5.1 (Berkeley) 1/27/87";
 /*};*/
 
 remque(e)
-	register struct vaxque *e;
-{
+	register struct vaxque *e; {
 	e->vq_prev->vq_next = e->vq_next;
 	e->vq_next->vq_prev = e->vq_prev;
 }
diff --git a/lib/libstdc/gen/rindex.c b/lib/libstdc/gen/rindex.c
index ee93bd3..ee23c69 100644
--- a/lib/libstdc/gen/rindex.c
+++ b/lib/libstdc/gen/rindex.c
@@ -11,8 +11,7 @@ static char sccsid[] = "@(#)rindex.c	5.2 (Berkeley) 3/9/86";
 
 char *
 rindex(sp, c)
-register char *sp, c;
-{
+register char *sp, c; {
 	register char *r;
 
 	r = NULL;
diff --git a/lib/libstdc/gen/scandir.c b/lib/libstdc/gen/scandir.c
index 1964c80..fb76d34 100644
--- a/lib/libstdc/gen/scandir.c
+++ b/lib/libstdc/gen/scandir.c
@@ -22,8 +22,7 @@ static char sccsid[] = "@(#)scandir.c	5.2 (Berkeley) 3/9/86";
 scandir(dirname, namelist, select, dcomp)
 	char *dirname;
 	struct direct *(*namelist[]);
-	int (*select)(), (*dcomp)();
-{
+	int (*select)(), (*dcomp)(); {
 	register struct direct *d, *p, **names;
 	register int nitems;
 	register char *cp1, *cp2;
@@ -85,7 +84,6 @@ scandir(dirname, namelist, select, dcomp)
  * Alphabetic order comparison routine for those who want it.
  */
 alphasort(d1, d2)
-	struct direct **d1, **d2;
-{
+	struct direct **d1, **d2; {
 	return(strcmp((*d1)->d_name, (*d2)->d_name));
 }
diff --git a/lib/libstdc/gen/seekdir.c b/lib/libstdc/gen/seekdir.c
index f1bc890..3d85802 100644
--- a/lib/libstdc/gen/seekdir.c
+++ b/lib/libstdc/gen/seekdir.c
@@ -18,8 +18,7 @@ static char sccsid[] = "@(#)seekdir.c	5.2 (Berkeley) 3/9/86";
 void
 seekdir(dirp, loc)
 	register DIR *dirp;
-	long loc;
-{
+	long loc; {
 	long curloc, base, offset;
 	struct direct *dp;
 	extern long lseek();
diff --git a/lib/libstdc/gen/setegid.c b/lib/libstdc/gen/setegid.c
index cb332d0..d616b47 100644
--- a/lib/libstdc/gen/setegid.c
+++ b/lib/libstdc/gen/setegid.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)setegid.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
 
 setegid(egid)
-	int egid;
-{
+	int egid; {
 
 	return (setregid(-1, egid));
 }
diff --git a/lib/libstdc/gen/seteuid.c b/lib/libstdc/gen/seteuid.c
index 2c6096c..0971619 100644
--- a/lib/libstdc/gen/seteuid.c
+++ b/lib/libstdc/gen/seteuid.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)seteuid.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
 
 seteuid(euid)
-	int euid;
-{
+	int euid; {
 
 	return (setreuid(-1, euid));
 }
diff --git a/lib/libstdc/gen/setgid.c b/lib/libstdc/gen/setgid.c
index bed8d8a..2d8105a 100644
--- a/lib/libstdc/gen/setgid.c
+++ b/lib/libstdc/gen/setgid.c
@@ -12,8 +12,7 @@ static char sccsid[] = "@(#)setgid.c	5.2 (Berkeley) 3/9/86";
  * Backwards compatible setgid.
  */
 setgid(gid)
-	int gid;
-{
+	int gid; {
 
 	return (setregid(gid, gid));
 }
diff --git a/lib/libstdc/gen/setjmperr.c b/lib/libstdc/gen/setjmperr.c
index d46b7a6..17226fe 100644
--- a/lib/libstdc/gen/setjmperr.c
+++ b/lib/libstdc/gen/setjmperr.c
@@ -16,8 +16,7 @@ static char sccsid[] = "@(#)setjmperr.c	5.2 (Berkeley) 3/9/86";
  * write their own versions.
  * If this routine returns, the program is aborted.
  */
-longjmperror()
-{
+longjmperror() {
 
 	write(2, ERRMSG, sizeof(ERRMSG));
 }
diff --git a/lib/libstdc/gen/setrgid.c b/lib/libstdc/gen/setrgid.c
index c5c38cf..baadb80 100644
--- a/lib/libstdc/gen/setrgid.c
+++ b/lib/libstdc/gen/setrgid.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)setrgid.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
 
 setrgid(rgid)
-	int rgid;
-{
+	int rgid; {
 
 	return (setregid(rgid, -1));
 }
diff --git a/lib/libstdc/gen/setruid.c b/lib/libstdc/gen/setruid.c
index 49a4a79..9ec97bd 100644
--- a/lib/libstdc/gen/setruid.c
+++ b/lib/libstdc/gen/setruid.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)setruid.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
 
 setruid(ruid)
-	int ruid;
-{
+	int ruid; {
 
 	return (setreuid(ruid, -1));
 }
diff --git a/lib/libstdc/gen/setuid.c b/lib/libstdc/gen/setuid.c
index 3e33294..f9ab372 100644
--- a/lib/libstdc/gen/setuid.c
+++ b/lib/libstdc/gen/setuid.c
@@ -12,8 +12,7 @@ static char sccsid[] = "@(#)setuid.c	5.2 (Berkeley) 3/9/86";
  * Backwards compatible setuid.
  */
 setuid(uid)
-	int uid;
-{
+	int uid; {
 
 	return (setreuid(uid, uid));
 }
diff --git a/lib/libstdc/gen/siginterrupt.c b/lib/libstdc/gen/siginterrupt.c
index 4cc7405..2616252 100644
--- a/lib/libstdc/gen/siginterrupt.c
+++ b/lib/libstdc/gen/siginterrupt.c
@@ -1,4 +1,3 @@
-#include <sys/signal.h>
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -16,8 +15,7 @@ static char sccsid[] = "@(#)siginterrupt.c	5.2 (Berkeley) 3/9/86";
  * after an instance of the indicated signal.
  */
 siginterrupt(sig, flag)
-	int sig, flag;
-{
+	int sig, flag; {
 	struct sigvec sv;
 	int ret;
 
diff --git a/lib/libstdc/gen/siglist.c b/lib/libstdc/gen/siglist.c
index 45714e0..276e5fc 100644
--- a/lib/libstdc/gen/siglist.c
+++ b/lib/libstdc/gen/siglist.c
@@ -1,4 +1,3 @@
-#include <sys/signal.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
diff --git a/lib/libstdc/gen/signal.c b/lib/libstdc/gen/signal.c
index 26b135b..727f9c0 100644
--- a/lib/libstdc/gen/signal.c
+++ b/lib/libstdc/gen/signal.c
@@ -1,4 +1,3 @@
-#include <sys/signal.h>
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -16,8 +15,7 @@ static char sccsid[] = "@(#)signal.c	5.2 (Berkeley) 3/9/86";
 
 int (*
 signal(s, a))()
-	int s, (*a)();
-{
+	int s, (*a)(); {
 	struct sigvec osv, sv;
 	static int mask[NSIG];
 	static int flags[NSIG];
diff --git a/lib/libstdc/gen/sleep.c b/lib/libstdc/gen/sleep.c
index e53fcfa..38933e8 100644
--- a/lib/libstdc/gen/sleep.c
+++ b/lib/libstdc/gen/sleep.c
@@ -1,4 +1,3 @@
-#include <sys/signal.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -18,8 +17,7 @@ static char sccsid[] = "@(#)sleep.c	5.2 (Berkeley) 3/9/86";
 static int ringring;
 
 sleep(n)
-	unsigned n;
-{
+	unsigned n; {
 	int sleepx(), omask;
 	struct itimerval itv, oitv;
 	register struct itimerval *itp = &itv;
@@ -60,8 +58,7 @@ sleep(n)
 }
 
 static
-sleepx()
-{
+sleepx() {
 
 	ringring = 1;
 }
diff --git a/lib/libstdc/gen/strcat.c b/lib/libstdc/gen/strcat.c
index 6030ccc..0450b8b 100644
--- a/lib/libstdc/gen/strcat.c
+++ b/lib/libstdc/gen/strcat.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)strcat.c	5.2 (Berkeley) 3/9/86";
 
 char *
 strcat(s1, s2)
-register char *s1, *s2;
-{
+register char *s1, *s2; {
 	register char *os1;
 
 	os1 = s1;
diff --git a/lib/libstdc/gen/strcmp.c b/lib/libstdc/gen/strcmp.c
index cd152f2..4502d8c 100644
--- a/lib/libstdc/gen/strcmp.c
+++ b/lib/libstdc/gen/strcmp.c
@@ -7,8 +7,7 @@ static char sccsid[] = "@(#)strcmp.c	5.2 (Berkeley) 3/9/86";
  */
 
 strcmp(s1, s2)
-register char *s1, *s2;
-{
+register char *s1, *s2; {
 
 	while (*s1 == *s2++)
 		if (*s1++=='\0')
diff --git a/lib/libstdc/gen/strcpy.c b/lib/libstdc/gen/strcpy.c
index d5c8172..6f653a5 100644
--- a/lib/libstdc/gen/strcpy.c
+++ b/lib/libstdc/gen/strcpy.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)strcpy.c	5.2 (Berkeley) 3/9/86";
 
 char *
 strcpy(s1, s2)
-register char *s1, *s2;
-{
+register char *s1, *s2; {
 	register char *os1;
 
 	os1 = s1;
diff --git a/lib/libstdc/gen/strlen.c b/lib/libstdc/gen/strlen.c
index 55faed8..38e1e89 100644
--- a/lib/libstdc/gen/strlen.c
+++ b/lib/libstdc/gen/strlen.c
@@ -8,8 +8,7 @@ static char sccsid[] = "@(#)strlen.c	5.2 (Berkeley) 3/9/86";
  */
 
 strlen(s)
-register char *s;
-{
+register char *s; {
 	register n;
 
 	n = 0;
diff --git a/lib/libstdc/gen/strncat.c b/lib/libstdc/gen/strncat.c
index 21d75cb..ffe3c04 100644
--- a/lib/libstdc/gen/strncat.c
+++ b/lib/libstdc/gen/strncat.c
@@ -11,8 +11,7 @@ static char sccsid[] = "@(#)strncat.c	5.2 (Berkeley) 3/9/86";
 char *
 strncat(s1, s2, n)
 register char *s1, *s2;
-register n;
-{
+register n; {
 	register char *os1;
 
 	os1 = s1;
diff --git a/lib/libstdc/gen/strncmp.c b/lib/libstdc/gen/strncmp.c
index 9d035e8..82c1f6e 100644
--- a/lib/libstdc/gen/strncmp.c
+++ b/lib/libstdc/gen/strncmp.c
@@ -8,8 +8,7 @@ static char sccsid[] = "@(#)strncmp.c	5.2 (Berkeley) 3/9/86";
 
 strncmp(s1, s2, n)
 register char *s1, *s2;
-register n;
-{
+register n; {
 
 	while (--n >= 0 && *s1 == *s2++)
 		if (*s1++ == '\0')
diff --git a/lib/libstdc/gen/strncpy.c b/lib/libstdc/gen/strncpy.c
index 40be252..6993c69 100644
--- a/lib/libstdc/gen/strncpy.c
+++ b/lib/libstdc/gen/strncpy.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)strncpy.c	5.2 (Berkeley) 3/9/86";
 
 char *
 strncpy(s1, s2, n)
-register char *s1, *s2;
-{
+register char *s1, *s2; {
 	register i;
 	register char *os1;
 
diff --git a/lib/libstdc/gen/swab.c b/lib/libstdc/gen/swab.c
index 8085998..458a0fc 100644
--- a/lib/libstdc/gen/swab.c
+++ b/lib/libstdc/gen/swab.c
@@ -9,8 +9,7 @@ static char sccsid[] = "@(#)swab.c	5.3 (Berkeley) 3/9/86";
 
 swab(from, to, n)
 	register char *from, *to;
-	register int n;
-{
+	register int n; {
 	register unsigned long temp;
 	
 	n >>= 1; n++;
diff --git a/lib/libstdc/gen/syslog.c b/lib/libstdc/gen/syslog.c
index d422956..5559d36 100644
--- a/lib/libstdc/gen/syslog.c
+++ b/lib/libstdc/gen/syslog.c
@@ -1,6 +1,3 @@
-#include <fcntl.h>
-#include <signal.h>
-#include <syslog.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -59,8 +56,7 @@ extern	char *sys_errlist[];
 
 syslog(pri, fmt, p0, p1, p2, p3, p4)
 	int pri;
-	char *fmt;
-{
+	char *fmt; {
 	char buf[MAXLINE + 1], outline[MAXLINE + 1];
 	register char *b, *f, *o;
 	register int c;
@@ -157,8 +153,7 @@ syslog(pri, fmt, p0, p1, p2, p3, p4)
 
 openlog(ident, logstat, logfac)
 	char *ident;
-	int logstat, logfac;
-{
+	int logstat, logfac; {
 	if (ident != NULL)
 		LogTag = ident;
 	LogStat = logstat;
@@ -178,8 +173,7 @@ openlog(ident, logstat, logfac)
  * CLOSELOG -- close the system log
  */
 
-closelog()
-{
+closelog() {
 
 	(void) close(LogFile);
 	LogFile = -1;
@@ -189,8 +183,7 @@ closelog()
  * SETLOGMASK -- set the log mask level
  */
 setlogmask(pmask)
-	int pmask;
-{
+	int pmask; {
 	int omask;
 
 	omask = LogMask;
diff --git a/lib/libstdc/gen/system.c b/lib/libstdc/gen/system.c
index 4ab8a7b..3222c83 100644
--- a/lib/libstdc/gen/system.c
+++ b/lib/libstdc/gen/system.c
@@ -1,5 +1,3 @@
-#include <signal.h>
-#include <sys/signal.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)system.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -7,8 +5,7 @@ static char sccsid[] = "@(#)system.c	5.2 (Berkeley) 3/9/86";
 #include	<signal.h>
 
 system(s)
-char *s;
-{
+char *s; {
 	int status, pid, w;
 	register int (*istat)(), (*qstat)();
 
diff --git a/lib/libstdc/gen/telldir.c b/lib/libstdc/gen/telldir.c
index 2b7af90..71ac953 100644
--- a/lib/libstdc/gen/telldir.c
+++ b/lib/libstdc/gen/telldir.c
@@ -16,8 +16,7 @@ static char sccsid[] = "@(#)telldir.c	5.2 (Berkeley) 3/9/86";
  */
 long
 telldir(dirp)
-	DIR *dirp;
-{
+	DIR *dirp; {
 	extern long lseek();
 
 	return (lseek(dirp->dd_fd, 0L, 1) - dirp->dd_size + dirp->dd_loc);
diff --git a/lib/libstdc/gen/time.c b/lib/libstdc/gen/time.c
index 49eeb8d..181493d 100644
--- a/lib/libstdc/gen/time.c
+++ b/lib/libstdc/gen/time.c
@@ -16,8 +16,7 @@ static char sccsid[] = "@(#)time.c	5.3 (Berkeley) 3/9/86";
 
 long
 time(t)
-	time_t *t;
-{
+	time_t *t; {
 	struct timeval tt;
 
 	if (gettimeofday(&tt, (struct timezone *)0) < 0)
diff --git a/lib/libstdc/gen/timezone.c b/lib/libstdc/gen/timezone.c
index 644bbd2..f0ef2bb 100644
--- a/lib/libstdc/gen/timezone.c
+++ b/lib/libstdc/gen/timezone.c
@@ -40,8 +40,7 @@ static struct zone {
 	-1
 };
 
-char *timezone(zone, dst)
-{
+char *timezone(zone, dst) {
 	register struct zone *zp;
 	static char czone[10];
 	char *sign;
diff --git a/lib/libstdc/gen/ttyname.c b/lib/libstdc/gen/ttyname.c
index 9fd0c91..6b876dd 100644
--- a/lib/libstdc/gen/ttyname.c
+++ b/lib/libstdc/gen/ttyname.c
@@ -18,8 +18,7 @@ char	*strcpy();
 char	*strcat();
 
 char *
-ttyname(f)
-{
+ttyname(f) {
 	struct stat fsb;
 	struct stat tsb;
 	register struct direct *db;
diff --git a/lib/libstdc/gen/ttyslot.c b/lib/libstdc/gen/ttyslot.c
index e8ba04f..2f74321 100644
--- a/lib/libstdc/gen/ttyslot.c
+++ b/lib/libstdc/gen/ttyslot.c
@@ -20,8 +20,7 @@ char	*rindex();
 
 #define	NULL	0
 
-ttyslot()
-{
+ttyslot() {
 	register struct ttyent *ty;
 	register char *tp, *p;
 	register s;
diff --git a/lib/libstdc/gen/ualarm.c b/lib/libstdc/gen/ualarm.c
index 6f14494..a975719 100644
--- a/lib/libstdc/gen/ualarm.c
+++ b/lib/libstdc/gen/ualarm.c
@@ -20,8 +20,7 @@ static char sccsid[] = "@(#)ualarm.c	5.2 (Berkeley) 3/9/86";
 unsigned
 ualarm(usecs, reload)
 	register unsigned usecs;
-	register unsigned reload;
-{
+	register unsigned reload; {
 	struct itimerval new, old;
 
 	new.it_interval.tv_usec = reload % USPS;
diff --git a/lib/libstdc/gen/usleep.c b/lib/libstdc/gen/usleep.c
index ae6595d..8d05954 100644
--- a/lib/libstdc/gen/usleep.c
+++ b/lib/libstdc/gen/usleep.c
@@ -1,4 +1,3 @@
-#include <sys/signal.h>
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -21,8 +20,7 @@ static char sccsid[] = "@(#)usleep.c	5.2 (Berkeley) 3/9/86";
 static int ringring;
 
 usleep(n)
-	unsigned n;
-{
+	unsigned n; {
 	int sleepx(), omask;
 	struct itimerval itv, oitv;
 	register struct itimerval *itp = &itv;
@@ -63,8 +61,7 @@ usleep(n)
 }
 
 static
-sleepx()
-{
+sleepx() {
 
 	ringring = 1;
 }
diff --git a/lib/libstdc/gen/valloc.c b/lib/libstdc/gen/valloc.c
index 1388d1d..795ef45 100644
--- a/lib/libstdc/gen/valloc.c
+++ b/lib/libstdc/gen/valloc.c
@@ -12,8 +12,7 @@ char	*malloc();
 
 char *
 valloc(i)
-	int i;
-{
+	int i; {
 	int valsiz = getpagesize(), j;
 	char *cp = malloc(i + (valsiz-1));
 
diff --git a/lib/libstdc/generated.txt b/lib/libstdc/generated.txt
new file mode 100644
index 0000000..c05fe25
--- /dev/null
+++ b/lib/libstdc/generated.txt
@@ -0,0 +1,123 @@
+net/htons.c
+net/htonl.c
+net/ntohs.c
+net/ntohl.c
+sys/settimeofday.c
+sys/sigpause.c
+sys/getrlimit.c
+sys/mknod.c
+sys/symlink.c
+sys/acct.c
+sys/setpgrp.c
+sys/exect.c
+sys/gettimeofday.c
+sys/sendto.c
+sys/getpeername.c
+sys/adjtime.c
+sys/sigvec.c
+sys/dup2.c
+sys/reboot.c
+sys/listen.c
+sys/umask.c
+sys/readv.c
+sys/creat.c
+sys/link.c
+sys/chmod.c
+sys/kill.c
+sys/stat.c
+sys/gethostname.c
+sys/getgid.c
+sys/open.c
+sys/getrusage.c
+sys/gethostid.c
+sys/truncate.c
+sys/setpriority.c
+sys/flock.c
+sys/getsockname.c
+sys/fcntl.c
+sys/write.c
+sys/wait3.c
+sys/send.c
+sys/ftruncate.c
+sys/mkdir.c
+sys/rmdir.c
+sys/setgroups.c
+sys/killpg.c
+sys/mount.c
+sys/lseek.c
+sys/getsockopt.c
+sys/ptrace.c
+sys/bind.c
+sys/quota.c
+sys/utimes.c
+sys/fstat.c
+sys/execl.c
+sys/unlink.c
+sys/getpagesize.c
+sys/chroot.c
+sys/getitimer.c
+sys/setsockopt.c
+sys/sigblock.c
+sys/sigstack.c
+sys/getegid.c
+sys/recv.c
+sys/socketpair.c
+sys/sbrk.c
+sys/accept.c
+sys/ioctl.c
+sys/dup.c
+sys/getpid.c
+sys/fork.c
+sys/sendmsg.c
+sys/chdir.c
+sys/setregid.c
+sys/geteuid.c
+sys/getppid.c
+sys/sync.c
+sys/setreuid.c
+sys/getgroups.c
+sys/connect.c
+sys/_exit.c
+sys/recvfrom.c
+sys/fchown.c
+sys/close.c
+sys/read.c
+sys/execv.c
+sys/sigreturn.c
+sys/brk.c
+sys/shutdown.c
+sys/sethostname.c
+sys/fsync.c
+sys/execve.c
+sys/getpriority.c
+sys/umount.c
+sys/lstat.c
+sys/setrlimit.c
+sys/vhangup.c
+sys/getdtablesize.c
+sys/sethostid.c
+sys/execle.c
+sys/wait.c
+sys/sigsetmask.c
+sys/readlink.c
+sys/pipe.c
+sys/writev.c
+sys/access.c
+sys/getpgrp.c
+sys/getuid.c
+sys/setitimer.c
+sys/select.c
+sys/setquota.c
+sys/rename.c
+sys/recvmsg.c
+sys/swapon.c
+sys/chown.c
+sys/fchmod.c
+sys/socket.c
+sys/profil.c
+gen/ldexp.c
+gen/abs.c
+gen/setjmp.c
+gen/atof.c
+gen/_setjmp.c
+gen/modf.c
diff --git a/lib/libstdc/inet/inet_addr.c b/lib/libstdc/inet/inet_addr.c
index 342ff4a..52949aa 100644
--- a/lib/libstdc/inet/inet_addr.c
+++ b/lib/libstdc/inet/inet_addr.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -22,8 +21,7 @@ static char sccsid[] = "@(#)inet_addr.c	5.2 (Berkeley) 3/9/86";
  */
 u_long
 inet_addr(cp)
-	register char *cp;
-{
+	register char *cp; {
 	register u_long val, base, n;
 	register char c;
 	u_long parts[4], *pp = parts;
diff --git a/lib/libstdc/inet/inet_lnaof.c b/lib/libstdc/inet/inet_lnaof.c
index 4c8b0ba..2c76b68 100644
--- a/lib/libstdc/inet/inet_lnaof.c
+++ b/lib/libstdc/inet/inet_lnaof.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -18,8 +17,7 @@ static char sccsid[] = "@(#)inet_lnaof.c	5.2 (Berkeley) 3/9/86";
  * number formats.
  */
 inet_lnaof(in)
-	struct in_addr in;
-{
+	struct in_addr in; {
 	register u_long i = ntohl(in.s_addr);
 
 	if (IN_CLASSA(i))
diff --git a/lib/libstdc/inet/inet_makeaddr.c b/lib/libstdc/inet/inet_makeaddr.c
index 8e62682..70801ae 100644
--- a/lib/libstdc/inet/inet_makeaddr.c
+++ b/lib/libstdc/inet/inet_makeaddr.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -18,8 +17,7 @@ static char sccsid[] = "@(#)inet_makeaddr.c	5.1 (Berkeley) 3/11/86";
  */
 struct in_addr
 inet_makeaddr(net, host)
-	int net, host;
-{
+	int net, host; {
 	u_long addr;
 
 	if (net < 128)
diff --git a/lib/libstdc/inet/inet_netof.c b/lib/libstdc/inet/inet_netof.c
index d752878..a56e690 100644
--- a/lib/libstdc/inet/inet_netof.c
+++ b/lib/libstdc/inet/inet_netof.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -17,8 +16,7 @@ static char sccsid[] = "@(#)inet_netof.c	5.2 (Berkeley) 3/9/86";
  * address; handles class a/b/c network #'s.
  */
 inet_netof(in)
-	struct in_addr in;
-{
+	struct in_addr in; {
 	register u_long i = ntohl(in.s_addr);
 
 	if (IN_CLASSA(i))
diff --git a/lib/libstdc/inet/inet_network.c b/lib/libstdc/inet/inet_network.c
index 57f0b5f..8440d3c 100644
--- a/lib/libstdc/inet/inet_network.c
+++ b/lib/libstdc/inet/inet_network.c
@@ -18,8 +18,7 @@ static char sccsid[] = "@(#)inet_network.c	5.2 (Berkeley) 3/9/86";
  */
 u_long
 inet_network(cp)
-	register char *cp;
-{
+	register char *cp; {
 	register u_long val, base, n;
 	register char c;
 	u_long parts[4], *pp = parts;
diff --git a/lib/libstdc/inet/inet_ntoa.c b/lib/libstdc/inet/inet_ntoa.c
index 98713f4..73ddab9 100644
--- a/lib/libstdc/inet/inet_ntoa.c
+++ b/lib/libstdc/inet/inet_ntoa.c
@@ -17,8 +17,7 @@ static char sccsid[] = "@(#)inet_ntoa.c	5.2 (Berkeley) 3/9/86";
 
 char *
 inet_ntoa(in)
-	struct in_addr in;
-{
+	struct in_addr in; {
 	static char b[18];
 	register char *p;
 
diff --git a/lib/libstdc/libstdc.patch b/lib/libstdc/libstdc.patch
index 04d3d1e..94182bb 100644
--- a/lib/libstdc/libstdc.patch
+++ b/lib/libstdc/libstdc.patch
@@ -1,6 +1,6 @@
 diff --unified --recursive --new-file libstdc.orig/a.out.h libstdc/a.out.h
---- libstdc.orig/a.out.h	2017-01-18 10:16:51.521265224 +1100
-+++ libstdc/a.out.h	2017-01-18 10:16:51.529265233 +1100
+--- libstdc.orig/a.out.h	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/a.out.h	2017-01-18 15:24:06.381633588 +1100
 @@ -39,44 +39,4 @@
  		:4;		/* nothing, yet */
  };
@@ -48,33 +48,41 @@ diff --unified --recursive --new-file libstdc.orig/a.out.h libstdc/a.out.h
 -#define	N_FORMAT	"%08x"
 +#include <nlist.h>
 diff --unified --recursive --new-file libstdc.orig/compat-4.1/gtty.c libstdc/compat-4.1/gtty.c
---- libstdc.orig/compat-4.1/gtty.c	2017-01-18 10:16:51.517265220 +1100
-+++ libstdc/compat-4.1/gtty.c	2017-01-18 10:16:56.825271193 +1100
+--- libstdc.orig/compat-4.1/gtty.c	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/compat-4.1/gtty.c	2017-01-18 15:24:06.381633588 +1100
 @@ -15,7 +15,7 @@
  #include <sgtty.h>
  
  gtty(fd, ap)
--	struct sgtty *ap;
-+	struct sgttyb *ap;
- {
+-	struct sgtty *ap; {
++	struct sgttyb *ap; {
  
  	return(ioctl(fd, TIOCGETP, ap));
+ }
 diff --unified --recursive --new-file libstdc.orig/compat-4.1/stty.c libstdc/compat-4.1/stty.c
---- libstdc.orig/compat-4.1/stty.c	2017-01-18 10:16:51.521265224 +1100
-+++ libstdc/compat-4.1/stty.c	2017-01-18 10:16:56.825271193 +1100
+--- libstdc.orig/compat-4.1/stty.c	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/compat-4.1/stty.c	2017-01-18 15:24:06.381633588 +1100
 @@ -15,7 +15,7 @@
  #include <sgtty.h>
  
  stty(fd, ap)
--	struct sgtty *ap;
-+	struct sgttyb *ap;
- {
+-	struct sgtty *ap; {
++	struct sgttyb *ap; {
  
  	return(ioctl(fd, TIOCSETP, ap));
+ }
 diff --unified --recursive --new-file libstdc.orig/gen/insque.c libstdc/gen/insque.c
---- libstdc.orig/gen/insque.c	2017-01-18 10:16:51.525265228 +1100
-+++ libstdc/gen/insque.c	2017-01-18 11:09:24.774728999 +1100
-@@ -14,10 +14,11 @@
+--- libstdc.orig/gen/insque.c	2017-01-18 15:24:06.381633588 +1100
++++ libstdc/gen/insque.c	2017-01-18 15:24:06.381633588 +1100
+@@ -8,16 +8,19 @@
+ static char sccsid[] = "@(#)insque.c	5.1 (Berkeley) 1/27/87";
+ #endif LIBC_SCCS and not lint
+ 
++#include <gen.h>
++
+ /*
+  * insque -- vax insque instruction
+  *
   * NOTE: this implementation is non-atomic!!
   */
  
@@ -89,11 +97,11 @@ diff --unified --recursive --new-file libstdc.orig/gen/insque.c libstdc/gen/insq
 +/*};*/
  
  insque(e, prev)
- 	register struct vaxque *e, *prev;
+ 	register struct vaxque *e, *prev; {
 diff --unified --recursive --new-file libstdc.orig/gen/popen.c libstdc/gen/popen.c
---- libstdc.orig/gen/popen.c	2017-01-18 10:16:51.525265228 +1100
+--- libstdc.orig/gen/popen.c	2017-01-18 15:24:06.381633588 +1100
 +++ libstdc/gen/popen.c	1970-01-01 10:00:00.000000000 +1000
-@@ -1,79 +0,0 @@
+@@ -1,77 +0,0 @@
 -/*
 - * Copyright (c) 1980 Regents of the University of California.
 - * All rights reserved.  The Berkeley software License Agreement
@@ -119,8 +127,7 @@ diff --unified --recursive --new-file libstdc.orig/gen/popen.c libstdc/gen/popen
 -FILE *
 -popen(cmd,mode)
 -	char *cmd;
--	char *mode;
--{
+-	char *mode; {
 -	int p[2];
 -	int myside, hisside, pid;
 -
@@ -158,8 +165,7 @@ diff --unified --recursive --new-file libstdc.orig/gen/popen.c libstdc/gen/popen
 -}
 -
 -pclose(ptr)
--	FILE *ptr;
--{
+-	FILE *ptr; {
 -	int child, pid, status, omask;
 -
 -	child = popen_pid[fileno(ptr)];
@@ -174,9 +180,17 @@ diff --unified --recursive --new-file libstdc.orig/gen/popen.c libstdc/gen/popen
 -	return (pid == -1 ? -1 : status);
 -}
 diff --unified --recursive --new-file libstdc.orig/gen/remque.c libstdc/gen/remque.c
---- libstdc.orig/gen/remque.c	2017-01-18 10:16:51.525265228 +1100
-+++ libstdc/gen/remque.c	2017-01-18 11:09:47.842769559 +1100
-@@ -14,10 +14,11 @@
+--- libstdc.orig/gen/remque.c	2017-01-18 15:24:06.381633588 +1100
++++ libstdc/gen/remque.c	2017-01-18 15:24:06.381633588 +1100
+@@ -8,16 +8,19 @@
+ static char sccsid[] = "@(#)remque.c	5.1 (Berkeley) 1/27/87";
+ #endif LIBC_SCCS and not lint
+ 
++#include <gen.h>
++
+ /*
+  * remque -- vax remque instruction
+  *
   * NOTE: this implementation is non-atomic!!
   */
  
@@ -191,10 +205,10 @@ diff --unified --recursive --new-file libstdc.orig/gen/remque.c libstdc/gen/remq
 +/*};*/
  
  remque(e)
- 	register struct vaxque *e;
+ 	register struct vaxque *e; {
 diff --unified --recursive --new-file libstdc.orig/gen.h libstdc/gen.h
 --- libstdc.orig/gen.h	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/gen.h	2017-01-18 11:14:09.663327386 +1100
++++ libstdc/gen.h	2017-01-18 15:24:06.381633588 +1100
 @@ -0,0 +1,5 @@
 +/* formerly duplicated in gen/insque.c and gen/remque.c */
 +struct vaxque {		/* queue format expected by VAX queue instructions */
@@ -203,7 +217,7 @@ diff --unified --recursive --new-file libstdc.orig/gen.h libstdc/gen.h
 +};
 diff --unified --recursive --new-file libstdc.orig/net.h libstdc/net.h
 --- libstdc.orig/net.h	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/net.h	2017-01-18 11:13:55.939294422 +1100
++++ libstdc/net.h	2017-01-18 15:24:06.381633588 +1100
 @@ -0,0 +1,15 @@
 +/* formerly duplicated in netinet/in.h and netns/ns.h */
 +#if !defined(vax) && !defined(ntohl) && !defined(lint)
@@ -221,8 +235,8 @@ diff --unified --recursive --new-file libstdc.orig/net.h libstdc/net.h
 +u_long	ntohl(), htonl();
 +#endif
 diff --unified --recursive --new-file libstdc.orig/netinet/in.h libstdc/netinet/in.h
---- libstdc.orig/netinet/in.h	2017-01-18 10:16:51.521265224 +1100
-+++ libstdc/netinet/in.h	2017-01-18 11:08:03.002599308 +1100
+--- libstdc.orig/netinet/in.h	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/netinet/in.h	2017-01-18 15:24:06.381633588 +1100
 @@ -90,20 +90,21 @@
   */
  #define	IP_OPTIONS	1		/* set/get IP per-packet options */
@@ -256,8 +270,8 @@ diff --unified --recursive --new-file libstdc.orig/netinet/in.h libstdc/netinet/
  #ifdef KERNEL
  extern	struct domain inetdomain;
 diff --unified --recursive --new-file libstdc.orig/netinet/ip.h libstdc/netinet/ip.h
---- libstdc.orig/netinet/ip.h	2017-01-18 10:16:51.521265224 +1100
-+++ libstdc/netinet/ip.h	2017-01-18 10:16:51.529265233 +1100
+--- libstdc.orig/netinet/ip.h	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/netinet/ip.h	2017-01-18 15:24:06.381633588 +1100
 @@ -81,7 +81,7 @@
  			struct in_addr ipt_addr;
  			n_long ipt_time;
@@ -268,8 +282,8 @@ diff --unified --recursive --new-file libstdc.orig/netinet/ip.h libstdc/netinet/
  
  /* flag bits for ipt_flg */
 diff --unified --recursive --new-file libstdc.orig/netinet/tcp.h libstdc/netinet/tcp.h
---- libstdc.orig/netinet/tcp.h	2017-01-18 10:16:51.521265224 +1100
-+++ libstdc/netinet/tcp.h	2017-01-18 11:12:57.871158957 +1100
+--- libstdc.orig/netinet/tcp.h	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/netinet/tcp.h	2017-01-18 15:24:06.381633588 +1100
 @@ -44,7 +44,9 @@
  #ifdef	lint
  #define	TCP_MSS	536
@@ -282,8 +296,8 @@ diff --unified --recursive --new-file libstdc.orig/netinet/tcp.h libstdc/netinet
  
  /*
 diff --unified --recursive --new-file libstdc.orig/netns/ns.h libstdc/netns/ns.h
---- libstdc.orig/netns/ns.h	2017-01-18 10:16:51.521265224 +1100
-+++ libstdc/netns/ns.h	2017-01-18 11:08:30.898640954 +1100
+--- libstdc.orig/netns/ns.h	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/netns/ns.h	2017-01-18 15:24:06.381633588 +1100
 @@ -103,20 +103,21 @@
  #define ns_nullhost(x) (((x).x_host.s_host[0]==0) && \
  	((x).x_host.s_host[1]==0) && ((x).x_host.s_host[2]==0))
@@ -317,8 +331,8 @@ diff --unified --recursive --new-file libstdc.orig/netns/ns.h libstdc/netns/ns.h
  #ifdef KERNEL
  extern struct domain nsdomain;
 diff --unified --recursive --new-file libstdc.orig/stdio/doscan.c libstdc/stdio/doscan.c
---- libstdc.orig/stdio/doscan.c	2017-01-18 10:16:51.517265220 +1100
-+++ libstdc/stdio/doscan.c	2017-01-18 10:16:56.829271198 +1100
+--- libstdc.orig/stdio/doscan.c	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/stdio/doscan.c	2017-01-18 15:24:06.381633588 +1100
 @@ -3,7 +3,8 @@
  #endif LIBC_SCCS and not lint
  
@@ -329,7 +343,7 @@ diff --unified --recursive --new-file libstdc.orig/stdio/doscan.c libstdc/stdio/
  
  #define	SPC	01
  #define	STP	02
-@@ -27,14 +28,14 @@
+@@ -27,13 +28,13 @@
  	0,0,0,0,0,0,0,0,
  };
  
@@ -337,9 +351,8 @@ diff --unified --recursive --new-file libstdc.orig/stdio/doscan.c libstdc/stdio/
 +_doscan(iop, fmt, ap)
  FILE *iop;
  register char *fmt;
--register int **argp;
-+register va_list ap;
- {
+-register int **argp; {
++register va_list ap; {
  	register int ch;
  	int nmatch, len, ch1;
 -	int **ptr, fileended, size;
@@ -347,7 +360,7 @@ diff --unified --recursive --new-file libstdc.orig/stdio/doscan.c libstdc/stdio/
  
  	nmatch = 0;
  	fileended = 0;
-@@ -46,7 +47,7 @@
+@@ -45,7 +46,7 @@
  			goto def;
  		ptr = 0;
  		if (ch != '*')
@@ -356,16 +369,16 @@ diff --unified --recursive --new-file libstdc.orig/stdio/doscan.c libstdc/stdio/
  		else
  			ch = *fmt++;
  		len = 0;
-@@ -100,7 +101,7 @@
+@@ -99,7 +100,7 @@
  
  static
  _innum(ptr, type, len, size, iop, eofptr)
 -int **ptr, *eofptr;
 +int *ptr, *eofptr;
- FILE *iop;
- {
+ FILE *iop; {
  	extern double atof();
-@@ -111,7 +112,7 @@
+ 	register char *np;
+@@ -109,7 +110,7 @@
  	long lcval;
  
  	if (type=='c' || type=='s' || type=='[')
@@ -374,7 +387,7 @@ diff --unified --recursive --new-file libstdc.orig/stdio/doscan.c libstdc/stdio/
  	lcval = 0;
  	ndigit = 0;
  	scale = INT;
-@@ -185,23 +186,23 @@
+@@ -183,23 +184,23 @@
  
  	case (FLOAT<<4) | SHORT:
  	case (FLOAT<<4) | REGULAR:
@@ -404,9 +417,9 @@ diff --unified --recursive --new-file libstdc.orig/stdio/doscan.c libstdc/stdio/
  	}
  	return(1);
 diff --unified --recursive --new-file libstdc.orig/stdio/fprintf.c libstdc/stdio/fprintf.c
---- libstdc.orig/stdio/fprintf.c	2017-01-18 10:16:51.517265220 +1100
-+++ libstdc/stdio/fprintf.c	2017-01-18 10:16:56.829271198 +1100
-@@ -1,32 +1,49 @@
+--- libstdc.orig/stdio/fprintf.c	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/stdio/fprintf.c	2017-01-18 15:24:06.381633588 +1100
+@@ -1,31 +1,48 @@
  /*
   * Copyright (c) 1980 Regents of the University of California.
 - * All rights reserved.  The Berkeley software License Agreement
@@ -438,12 +451,11 @@ diff --unified --recursive --new-file libstdc.orig/stdio/fprintf.c libstdc/stdio
  
 -fprintf(iop, fmt, args)
 -register FILE *iop;
--char *fmt;
+-char *fmt; {
 +fprintf(iop, fmt, va_alist)
 +	register FILE *iop;
 +	char *fmt;
-+	va_dcl
- {
++	va_dcl {
 +	va_list ap;
 +	int len;
  	char localbuf[BUFSIZ];
@@ -467,33 +479,10 @@ diff --unified --recursive --new-file libstdc.orig/stdio/fprintf.c libstdc/stdio
 +	va_end(ap);
 +	return(ferror(iop) ? EOF : len);
  }
-diff --unified --recursive --new-file libstdc.orig/stdio/Makefile libstdc/stdio/Makefile
---- libstdc.orig/stdio/Makefile	2017-01-18 10:16:51.517265220 +1100
-+++ libstdc/stdio/Makefile	2017-01-18 10:16:56.825271193 +1100
-@@ -25,15 +25,15 @@
- 	fprintf.c fputc.c fread.c freopen.c fseek.c ftell.c \
- 	fwrite.c getchar.c getw.c printf.c putchar.c \
- 	putw.c rew.c scanf.c setbuf.c setbuffer.c sibuf.c sobuf.c \
--	sprintf.c strout.c ungetc.c
--VAXSRC=	fgets.c fputs.c gets.c puts.c
-+	sprintf.c strout.c ungetc.c vfprintf.c vprintf.c vsprintf.c
-+VAXSRC=	doprnt.c fgets.c fputs.c gets.c puts.c
- STDOBJ=	clrerr.o doscan.o \
- 	exit.o fdopen.o fgetc.o filbuf.o findiop.o flsbuf.o fopen.o \
- 	fprintf.o fputc.o fread.o freopen.o fseek.o ftell.o \
- 	fwrite.o getchar.o getw.o printf.o putchar.o \
- 	putw.o rew.o scanf.o setbuf.o setbuffer.o sibuf.o sobuf.o \
--	sprintf.o strout.o ungetc.o
--VAXOBJ=	fgets.o fputs.o gets.o puts.o
-+	sprintf.o strout.o ungetc.o vfprintf.o vprintf.o vsprintf.o
-+VAXOBJ=	doprnt.o fgets.o fputs.o gets.o puts.o
- TAGSFILE=tags
- 
- .c.o:
 diff --unified --recursive --new-file libstdc.orig/stdio/popen.c libstdc/stdio/popen.c
 --- libstdc.orig/stdio/popen.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/stdio/popen.c	2017-01-18 10:16:50.157263730 +1100
-@@ -0,0 +1,79 @@
++++ libstdc/stdio/popen.c	2017-01-18 15:24:06.381633588 +1100
+@@ -0,0 +1,77 @@
 +/*
 + * Copyright (c) 1980 Regents of the University of California.
 + * All rights reserved.  The Berkeley software License Agreement
@@ -519,8 +508,7 @@ diff --unified --recursive --new-file libstdc.orig/stdio/popen.c libstdc/stdio/p
 +FILE *
 +popen(cmd,mode)
 +	char *cmd;
-+	char *mode;
-+{
++	char *mode; {
 +	int p[2];
 +	int myside, hisside, pid;
 +
@@ -558,8 +546,7 @@ diff --unified --recursive --new-file libstdc.orig/stdio/popen.c libstdc/stdio/p
 +}
 +
 +pclose(ptr)
-+	FILE *ptr;
-+{
++	FILE *ptr; {
 +	int child, pid, status, omask;
 +
 +	child = popen_pid[fileno(ptr)];
@@ -574,9 +561,9 @@ diff --unified --recursive --new-file libstdc.orig/stdio/popen.c libstdc/stdio/p
 +	return (pid == -1 ? -1 : status);
 +}
 diff --unified --recursive --new-file libstdc.orig/stdio/printf.c libstdc/stdio/printf.c
---- libstdc.orig/stdio/printf.c	2017-01-18 10:16:51.517265220 +1100
-+++ libstdc/stdio/printf.c	2017-01-18 10:16:56.829271198 +1100
-@@ -1,12 +1,36 @@
+--- libstdc.orig/stdio/printf.c	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/stdio/printf.c	2017-01-18 15:24:06.381633588 +1100
+@@ -1,11 +1,35 @@
 +/*
 + * Copyright (c) 1987 Regents of the University of California.
 + * All rights reserved.
@@ -599,31 +586,30 @@ diff --unified --recursive --new-file libstdc.orig/stdio/printf.c libstdc/stdio/
 -#endif LIBC_SCCS and not lint
 +static char sccsid[] = "@(#)printf.c	5.4 (Berkeley) 6/27/88";
 +#endif /* LIBC_SCCS and not lint */
- 
--#include	<stdio.h>
++
 +#include <stdio.h>
 +#include <varargs.h>
  
--printf(fmt, args)
--char *fmt;
+-#include	<stdio.h>
 +printf(fmt, va_alist)
 +	char *fmt;
-+	va_dcl
- {
--	_doprnt(fmt, &args, stdout);
--	return(ferror(stdout)? EOF: 0);
++	va_dcl {
 +	va_list ap;
 +	int len;
-+
+ 
+-printf(fmt, args)
+-char *fmt; {
+-	_doprnt(fmt, &args, stdout);
+-	return(ferror(stdout)? EOF: 0);
 +	va_start(ap);
 +	len = _doprnt(fmt, ap, stdout);
 +	va_end(ap);
 +	return(ferror(stdout) ? EOF : len);
  }
 diff --unified --recursive --new-file libstdc.orig/stdio/scanf.c libstdc/stdio/scanf.c
---- libstdc.orig/stdio/scanf.c	2017-01-18 10:16:51.517265220 +1100
-+++ libstdc/stdio/scanf.c	2017-01-18 10:16:56.829271198 +1100
-@@ -2,32 +2,53 @@
+--- libstdc.orig/stdio/scanf.c	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/stdio/scanf.c	2017-01-18 15:24:06.381633588 +1100
+@@ -2,29 +2,50 @@
  static char sccsid[] = "@(#)scanf.c	5.2 (Berkeley) 3/9/86";
  #endif LIBC_SCCS and not lint
  
@@ -632,11 +618,11 @@ diff --unified --recursive --new-file libstdc.orig/stdio/scanf.c libstdc/stdio/s
 +#include <varargs.h>
  
 -scanf(fmt, args)
-+scanf(fmt, va_alist)
- char *fmt;
-+va_dcl
- {
+-char *fmt; {
 -	return(_doscan(stdin, fmt, &args));
++scanf(fmt, va_alist)
++char *fmt;
++va_dcl {
 +	va_list ap;
 +	int len;
 +
@@ -649,10 +635,10 @@ diff --unified --recursive --new-file libstdc.orig/stdio/scanf.c libstdc/stdio/s
 -fscanf(iop, fmt, args)
 +fscanf(iop, fmt, va_alist)
  FILE *iop;
- char *fmt;
-+va_dcl
- {
+-char *fmt; {
 -	return(_doscan(iop, fmt, &args));
++char *fmt;
++va_dcl {
 +	va_list ap;
 +	int len;
 +
@@ -665,9 +651,9 @@ diff --unified --recursive --new-file libstdc.orig/stdio/scanf.c libstdc/stdio/s
 -sscanf(str, fmt, args)
 +sscanf(str, fmt, va_alist)
  register char *str;
- char *fmt;
-+va_dcl
- {
+-char *fmt; {
++char *fmt;
++va_dcl {
  	FILE _strbuf;
 +	va_list ap;
 +	int len;
@@ -685,9 +671,9 @@ diff --unified --recursive --new-file libstdc.orig/stdio/scanf.c libstdc/stdio/s
 +	return len;
  }
 diff --unified --recursive --new-file libstdc.orig/stdio/sprintf.c libstdc/stdio/sprintf.c
---- libstdc.orig/stdio/sprintf.c	2017-01-18 10:16:51.517265220 +1100
-+++ libstdc/stdio/sprintf.c	2017-01-18 10:16:56.829271198 +1100
-@@ -1,18 +1,41 @@
+--- libstdc.orig/stdio/sprintf.c	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/stdio/sprintf.c	2017-01-18 15:24:06.381633588 +1100
+@@ -1,17 +1,40 @@
 +/*
 + * Copyright (c) 1987 Regents of the University of California.
 + * All rights reserved.
@@ -716,11 +702,10 @@ diff --unified --recursive --new-file libstdc.orig/stdio/sprintf.c libstdc/stdio
 +#include <varargs.h>
  
 -char *sprintf(str, fmt, args)
--char *str, *fmt;
+-char *str, *fmt; {
 +sprintf(str, fmt, va_alist)
 +	char *str, *fmt;
-+	va_dcl
- {
++	va_dcl {
 +	va_list ap;
  	FILE _strbuf;
 +	int len;
@@ -739,8 +724,8 @@ diff --unified --recursive --new-file libstdc.orig/stdio/sprintf.c libstdc/stdio
  }
 diff --unified --recursive --new-file libstdc.orig/stdio/vfprintf.c libstdc/stdio/vfprintf.c
 --- libstdc.orig/stdio/vfprintf.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/stdio/vfprintf.c	2017-01-18 10:16:56.829271198 +1100
-@@ -0,0 +1,47 @@
++++ libstdc/stdio/vfprintf.c	2017-01-18 15:24:06.381633588 +1100
+@@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
 + * All rights reserved.
@@ -769,8 +754,7 @@ diff --unified --recursive --new-file libstdc.orig/stdio/vfprintf.c libstdc/stdi
 +vfprintf(iop, fmt, ap)
 +	FILE *iop;
 +	char *fmt;
-+	va_list ap;
-+{
++	va_list ap; {
 +	int len;
 +	char localbuf[BUFSIZ];
 +
@@ -790,8 +774,8 @@ diff --unified --recursive --new-file libstdc.orig/stdio/vfprintf.c libstdc/stdi
 +}
 diff --unified --recursive --new-file libstdc.orig/stdio/vprintf.c libstdc/stdio/vprintf.c
 --- libstdc.orig/stdio/vprintf.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/stdio/vprintf.c	2017-01-18 10:16:56.829271198 +1100
-@@ -0,0 +1,34 @@
++++ libstdc/stdio/vprintf.c	2017-01-18 15:24:06.381633588 +1100
+@@ -0,0 +1,33 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
 + * All rights reserved.
@@ -819,8 +803,7 @@ diff --unified --recursive --new-file libstdc.orig/stdio/vprintf.c libstdc/stdio
 +int
 +vprintf(fmt, ap)
 +	char *fmt;
-+	va_list ap;
-+{
++	va_list ap; {
 +	int len;
 +
 +	len = _doprnt(fmt, ap, stdout);
@@ -828,8 +811,8 @@ diff --unified --recursive --new-file libstdc.orig/stdio/vprintf.c libstdc/stdio
 +}
 diff --unified --recursive --new-file libstdc.orig/stdio/vsprintf.c libstdc/stdio/vsprintf.c
 --- libstdc.orig/stdio/vsprintf.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/stdio/vsprintf.c	2017-01-18 10:16:56.829271198 +1100
-@@ -0,0 +1,39 @@
++++ libstdc/stdio/vsprintf.c	2017-01-18 15:24:06.381633588 +1100
+@@ -0,0 +1,38 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
 + * All rights reserved.
@@ -857,8 +840,7 @@ diff --unified --recursive --new-file libstdc.orig/stdio/vsprintf.c libstdc/stdi
 +int
 +vsprintf(str, fmt, ap)
 +	char *str, *fmt;
-+	va_list ap;
-+{
++	va_list ap; {
 +	FILE f;
 +	int len;
 +
@@ -870,8 +852,8 @@ diff --unified --recursive --new-file libstdc.orig/stdio/vsprintf.c libstdc/stdi
 +	return (len);
 +}
 diff --unified --recursive --new-file libstdc.orig/stdio.h libstdc/stdio.h
---- libstdc.orig/stdio.h	2017-01-18 10:16:51.521265224 +1100
-+++ libstdc/stdio.h	2017-01-18 10:16:51.529265233 +1100
+--- libstdc.orig/stdio.h	2017-01-18 15:24:06.373633566 +1100
++++ libstdc/stdio.h	2017-01-18 15:24:06.381633588 +1100
 @@ -59,7 +59,7 @@
  long	ftell();
  char	*fgets();
@@ -882,8 +864,8 @@ diff --unified --recursive --new-file libstdc.orig/stdio.h libstdc/stdio.h
  #endif
  # endif
 diff --unified --recursive --new-file libstdc.orig/sys/dir.h libstdc/sys/dir.h
---- libstdc.orig/sys/dir.h	2017-01-18 10:16:51.525265228 +1100
-+++ libstdc/sys/dir.h	2017-01-18 10:16:51.529265233 +1100
+--- libstdc.orig/sys/dir.h	2017-01-18 15:24:06.377633578 +1100
++++ libstdc/sys/dir.h	2017-01-18 15:24:06.381633588 +1100
 @@ -32,9 +32,9 @@
   * dp->d_ino set to 0.
   */
@@ -898,8 +880,8 @@ diff --unified --recursive --new-file libstdc.orig/sys/dir.h libstdc/sys/dir.h
  #define	MAXNAMLEN	255
  
 diff --unified --recursive --new-file libstdc.orig/sys/param.h libstdc/sys/param.h
---- libstdc.orig/sys/param.h	2017-01-18 10:16:51.525265228 +1100
-+++ libstdc/sys/param.h	2017-01-18 11:21:27.168516781 +1100
+--- libstdc.orig/sys/param.h	2017-01-18 15:24:06.377633578 +1100
++++ libstdc/sys/param.h	2017-01-18 15:24:06.381633588 +1100
 @@ -174,12 +174,16 @@
  /*
   * Macros for counting and rounding.
@@ -921,7 +903,7 @@ diff --unified --recursive --new-file libstdc.orig/sys/param.h libstdc/sys/param
 +#define	NBBY	8		/* number of bits in a byte */
 diff --unified --recursive --new-file libstdc.orig/sys/select.h libstdc/sys/select.h
 --- libstdc.orig/sys/select.h	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/sys/select.h	2017-01-18 11:18:18.483976173 +1100
++++ libstdc/sys/select.h	2017-01-18 15:24:06.385633600 +1100
 @@ -0,0 +1,28 @@
 +#include <sys/param.h>
 +
@@ -952,8 +934,8 @@ diff --unified --recursive --new-file libstdc.orig/sys/select.h libstdc/sys/sele
 +#define	FD_ISSET(n, p)	((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
 +#define FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
 diff --unified --recursive --new-file libstdc.orig/sys/types.h libstdc/sys/types.h
---- libstdc.orig/sys/types.h	2017-01-18 10:16:51.525265228 +1100
-+++ libstdc/sys/types.h	2017-01-18 11:19:48.332229461 +1100
+--- libstdc.orig/sys/types.h	2017-01-18 15:24:06.377633578 +1100
++++ libstdc/sys/types.h	2017-01-18 15:24:06.385633600 +1100
 @@ -45,30 +45,32 @@
  typedef	u_short	uid_t;
  typedef	u_short	gid_t;
@@ -1004,8 +986,8 @@ diff --unified --recursive --new-file libstdc.orig/sys/types.h libstdc/sys/types
  
  #endif
 diff --unified --recursive --new-file libstdc.orig/sys/vmmac.h libstdc/sys/vmmac.h
---- libstdc.orig/sys/vmmac.h	2017-01-18 10:16:51.525265228 +1100
-+++ libstdc/sys/vmmac.h	2017-01-18 11:11:57.943026557 +1100
+--- libstdc.orig/sys/vmmac.h	2017-01-18 15:24:06.377633578 +1100
++++ libstdc/sys/vmmac.h	2017-01-18 15:24:06.385633600 +1100
 @@ -157,3 +157,10 @@
  	} \
  	c->c_lock = 0; \
@@ -1018,8 +1000,8 @@ diff --unified --recursive --new-file libstdc.orig/sys/vmmac.h libstdc/sys/vmmac
 +#define	mapin(pte, v, pfnum, count, prot) \
 +	(*(int *)(pte) = (pfnum) | (prot), mtpr(TBIS, ptob(v)))
 diff --unified --recursive --new-file libstdc.orig/vax/vmparam.h libstdc/vax/vmparam.h
---- libstdc.orig/vax/vmparam.h	2017-01-18 10:16:51.525265228 +1100
-+++ libstdc/vax/vmparam.h	2017-01-18 11:11:21.434949961 +1100
+--- libstdc.orig/vax/vmparam.h	2017-01-18 15:24:06.377633578 +1100
++++ libstdc/vax/vmparam.h	2017-01-18 15:24:06.385633600 +1100
 @@ -156,5 +156,6 @@
  /*
   * BEWARE THIS DEFINITION WORKS ONLY WITH COUNT OF 1
diff --git a/lib/libstdc/n.sh b/lib/libstdc/n.sh
index 7f4baba..677e1b6 100755
--- a/lib/libstdc/n.sh
+++ b/lib/libstdc/n.sh
@@ -33,6 +33,8 @@ cp ../../usr.bin/lint/llib-lc .
 patch llib-lc <llib-lc.patch
 sed -e 's/[\t ]\+/ /g;s/^ /void /;s/\* /*/g;s/( /(/g;s/ )/)/g' <llib-lc >llib-lc.temp
 
+rm -f generated.txt
+
 find vax -name '*.s' -print |\
 sed -e 's:^vax/\(.*\)\.s$:\1:' |\
 while read i
@@ -62,6 +64,7 @@ do
         rm vax/$i.s
         mkdir -p `dirname $i`
         mv a $i.c
+        echo $i.c >>generated.txt
       fi
     fi
   fi
@@ -103,6 +106,30 @@ do
   done
 done
 
+find . -name '*.[ch]' -print |\
+sed -e 's:^\./::' |\
+while read i
+do
+  rm -f xx*
+  csplit -b '%05d' -q $i '/^[	 ]*{[	 ]*$/' '{*}'
+  for j in xx*
+  do
+    :
+  done
+  for k in xx*
+  do
+    if test $k != xx00000
+    then
+      sed -ne '2,$p' -i $k
+    fi
+    if test $k != $j
+    then
+      sed -e '$s/$/ {/' -i $k
+    fi
+  done
+  cat xx* >$i
+done
+
 #rm -f fcntl.h mp.h
 #ln -s sys/file.h fcntl.h
 #rm -f machine
diff --git a/lib/libstdc/net/getnetbyaddr.c b/lib/libstdc/net/getnetbyaddr.c
index 848c1c8..d5cef5b 100644
--- a/lib/libstdc/net/getnetbyaddr.c
+++ b/lib/libstdc/net/getnetbyaddr.c
@@ -14,8 +14,7 @@ extern int _net_stayopen;
 
 struct netent *
 getnetbyaddr(net, type)
-	register int net, type;
-{
+	register int net, type; {
 	register struct netent *p;
 
 	setnetent(_net_stayopen);
diff --git a/lib/libstdc/net/getnetbyname.c b/lib/libstdc/net/getnetbyname.c
index c944ae5..e4869f4 100644
--- a/lib/libstdc/net/getnetbyname.c
+++ b/lib/libstdc/net/getnetbyname.c
@@ -14,8 +14,7 @@ extern int _net_stayopen;
 
 struct netent *
 getnetbyname(name)
-	register char *name;
-{
+	register char *name; {
 	register struct netent *p;
 	register char **cp;
 
diff --git a/lib/libstdc/net/getnetent.c b/lib/libstdc/net/getnetent.c
index 488aa50..138e978 100644
--- a/lib/libstdc/net/getnetent.c
+++ b/lib/libstdc/net/getnetent.c
@@ -25,8 +25,7 @@ int _net_stayopen;
 static char *any();
 
 setnetent(f)
-	int f;
-{
+	int f; {
 	if (netf == NULL)
 		netf = fopen(NETDB, "r" );
 	else
@@ -34,8 +33,7 @@ setnetent(f)
 	_net_stayopen |= f;
 }
 
-endnetent()
-{
+endnetent() {
 	if (netf) {
 		fclose(netf);
 		netf = NULL;
@@ -44,8 +42,7 @@ endnetent()
 }
 
 struct netent *
-getnetent()
-{
+getnetent() {
 	char *p;
 	register char *cp, **q;
 
@@ -94,8 +91,7 @@ again:
 static char *
 any(cp, match)
 	register char *cp;
-	char *match;
-{
+	char *match; {
 	register char *mp, c;
 
 	while (c = *cp) {
diff --git a/lib/libstdc/net/getproto.c b/lib/libstdc/net/getproto.c
index f35a6d6..7bb4896 100644
--- a/lib/libstdc/net/getproto.c
+++ b/lib/libstdc/net/getproto.c
@@ -14,8 +14,7 @@ extern int _proto_stayopen;
 
 struct protoent *
 getprotobynumber(proto)
-	register int proto;
-{
+	register int proto; {
 	register struct protoent *p;
 
 	setprotoent(_proto_stayopen);
diff --git a/lib/libstdc/net/getprotoent.c b/lib/libstdc/net/getprotoent.c
index 15a6a18..244c8f9 100644
--- a/lib/libstdc/net/getprotoent.c
+++ b/lib/libstdc/net/getprotoent.c
@@ -25,8 +25,7 @@ static char *any();
 int _proto_stayopen;
 
 setprotoent(f)
-	int f;
-{
+	int f; {
 	if (protof == NULL)
 		protof = fopen(PROTODB, "r" );
 	else
@@ -34,8 +33,7 @@ setprotoent(f)
 	_proto_stayopen |= f;
 }
 
-endprotoent()
-{
+endprotoent() {
 	if (protof) {
 		fclose(protof);
 		protof = NULL;
@@ -44,8 +42,7 @@ endprotoent()
 }
 
 struct protoent *
-getprotoent()
-{
+getprotoent() {
 	char *p;
 	register char *cp, **q;
 
@@ -93,8 +90,7 @@ again:
 static char *
 any(cp, match)
 	register char *cp;
-	char *match;
-{
+	char *match; {
 	register char *mp, c;
 
 	while (c = *cp) {
diff --git a/lib/libstdc/net/getprotoname.c b/lib/libstdc/net/getprotoname.c
index 872303f..dc0910c 100644
--- a/lib/libstdc/net/getprotoname.c
+++ b/lib/libstdc/net/getprotoname.c
@@ -14,8 +14,7 @@ extern int _proto_stayopen;
 
 struct protoent *
 getprotobyname(name)
-	register char *name;
-{
+	register char *name; {
 	register struct protoent *p;
 	register char **cp;
 
diff --git a/lib/libstdc/net/getservbyname.c b/lib/libstdc/net/getservbyname.c
index 40c784d..d6c84ee 100644
--- a/lib/libstdc/net/getservbyname.c
+++ b/lib/libstdc/net/getservbyname.c
@@ -14,8 +14,7 @@ extern int _serv_stayopen;
 
 struct servent *
 getservbyname(name, proto)
-	char *name, *proto;
-{
+	char *name, *proto; {
 	register struct servent *p;
 	register char **cp;
 
diff --git a/lib/libstdc/net/getservbyport.c b/lib/libstdc/net/getservbyport.c
index d3632a2..c84c10e 100644
--- a/lib/libstdc/net/getservbyport.c
+++ b/lib/libstdc/net/getservbyport.c
@@ -15,8 +15,7 @@ extern int _serv_stayopen;
 struct servent *
 getservbyport(port, proto)
 	int port;
-	char *proto;
-{
+	char *proto; {
 	register struct servent *p;
 
 	setservent(_serv_stayopen);
diff --git a/lib/libstdc/net/getservent.c b/lib/libstdc/net/getservent.c
index 1f68cc2..09784ab 100644
--- a/lib/libstdc/net/getservent.c
+++ b/lib/libstdc/net/getservent.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -26,8 +25,7 @@ static char *any();
 int _serv_stayopen;
 
 setservent(f)
-	int f;
-{
+	int f; {
 	if (servf == NULL)
 		servf = fopen(SERVDB, "r" );
 	else
@@ -35,8 +33,7 @@ setservent(f)
 	_serv_stayopen |= f;
 }
 
-endservent()
-{
+endservent() {
 	if (servf) {
 		fclose(servf);
 		servf = NULL;
@@ -45,8 +42,7 @@ endservent()
 }
 
 struct servent *
-getservent()
-{
+getservent() {
 	char *p;
 	register char *cp, **q;
 
@@ -96,8 +92,7 @@ again:
 static char *
 any(cp, match)
 	register char *cp;
-	char *match;
-{
+	char *match; {
 	register char *mp, c;
 
 	while (c = *cp) {
diff --git a/lib/libstdc/net/hosttable/gethostent.c b/lib/libstdc/net/hosttable/gethostent.c
index 4faffe1..857b6ef 100644
--- a/lib/libstdc/net/hosttable/gethostent.c
+++ b/lib/libstdc/net/hosttable/gethostent.c
@@ -41,15 +41,13 @@ DBM	*_host_db;	/* set by gethostbyname(), gethostbyaddr() */
 static char *any();
 
 sethostent(f)
-	int f;
-{
+	int f; {
 	if (hostf != NULL)
 		rewind(hostf);
 	_host_stayopen |= f;
 }
 
-endhostent()
-{
+endhostent() {
 	if (hostf) {
 		fclose(hostf);
 		hostf = NULL;
@@ -62,8 +60,7 @@ endhostent()
 }
 
 struct hostent *
-gethostent()
-{
+gethostent() {
 	char *p;
 	register char *cp, **q;
 
@@ -110,16 +107,14 @@ again:
 }
 
 sethostfile(file)
-	char *file;
-{
+	char *file; {
 	_host_file = file;
 }
 
 static char *
 any(cp, match)
 	register char *cp;
-	char *match;
-{
+	char *match; {
 	register char *mp, c;
 
 	while (c = *cp) {
diff --git a/lib/libstdc/net/hosttable/gethostnamadr.c b/lib/libstdc/net/hosttable/gethostnamadr.c
index a077c5c..981d067 100644
--- a/lib/libstdc/net/hosttable/gethostnamadr.c
+++ b/lib/libstdc/net/hosttable/gethostnamadr.c
@@ -1,4 +1,3 @@
-#include <fcntl.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -33,8 +32,7 @@ int	_host_stayopen;	/* set by sethostent(), cleared by endhostent() */
 
 static struct hostent *
 fetchhost(key)
-	datum key;
-{
+	datum key; {
         register char *cp, *tp, **ap;
 	int naliases;
 
@@ -68,8 +66,7 @@ fetchhost(key)
 
 struct hostent *
 gethostbyname(nam)
-	register char *nam;
-{
+	register char *nam; {
 	register struct hostent *hp;
 	register char **cp;
         datum key;
@@ -114,8 +111,7 @@ struct hostent *
 gethostbyaddr(addr, length, type)
 	char *addr;
 	register int length;
-	register int type;
-{
+	register int type; {
 	register struct hostent *hp;
         datum key;
 
diff --git a/lib/libstdc/net/named/gethostnamadr.c b/lib/libstdc/net/named/gethostnamadr.c
index 5157098..b5f63f0 100644
--- a/lib/libstdc/net/named/gethostnamadr.c
+++ b/lib/libstdc/net/named/gethostnamadr.c
@@ -1,5 +1,3 @@
-#include <net.h>
-#include <sys/errno.h>
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -55,8 +53,7 @@ extern errno;
 static struct hostent *
 getanswer(msg, msglen, iquery)
 	char *msg;
-	int msglen, iquery;
-{
+	int msglen, iquery; {
 	register HEADER *hp;
 	register char *cp;
 	register int n;
@@ -226,8 +223,7 @@ getanswer(msg, msglen, iquery)
 
 struct hostent *
 gethostbyname(name)
-	char *name;
-{
+	char *name; {
 	int n;
 	querybuf buf;
 	register struct hostent *hp;
@@ -251,8 +247,7 @@ gethostbyname(name)
 struct hostent *
 gethostbyaddr(addr, len, type)
 	char *addr;
-	int len, type;
-{
+	int len, type; {
 	int n;
 	querybuf buf;
 	register struct hostent *hp;
@@ -290,8 +285,7 @@ gethostbyaddr(addr, len, type)
 
 
 _sethtent(f)
-	int f;
-{
+	int f; {
 	if (hostf == NULL)
 		hostf = fopen(HOSTDB, "r" );
 	else
@@ -299,8 +293,7 @@ _sethtent(f)
 	stayopen |= f;
 }
 
-_endhtent()
-{
+_endhtent() {
 	if (hostf && !stayopen) {
 		(void) fclose(hostf);
 		hostf = NULL;
@@ -308,8 +301,7 @@ _endhtent()
 }
 
 struct hostent *
-_gethtent()
-{
+_gethtent() {
 	char *p;
 	register char *cp, **q;
 
@@ -359,8 +351,7 @@ again:
 static char *
 any(cp, match)
 	register char *cp;
-	char *match;
-{
+	char *match; {
 	register char *mp, c;
 
 	while (c = *cp) {
@@ -374,8 +365,7 @@ any(cp, match)
 
 struct hostent *
 _gethtbyname(name)
-	char *name;
-{
+	char *name; {
 	register struct hostent *p;
 	register char **cp;
 	char lowname[128];
@@ -404,8 +394,7 @@ found:
 struct hostent *
 _gethtbyaddr(addr, len, type)
 	char *addr;
-	int len, type;
-{
+	int len, type; {
 	register struct hostent *p;
 
 	_sethtent(0);
diff --git a/lib/libstdc/net/named/sethostent.c b/lib/libstdc/net/named/sethostent.c
index 0acfe9c..2cdf459 100644
--- a/lib/libstdc/net/named/sethostent.c
+++ b/lib/libstdc/net/named/sethostent.c
@@ -13,21 +13,18 @@ static char sccsid[] = "@(#)sethostent.c	6.3 (Berkeley) 4/10/86";
 #include <netinet/in.h>
 #include <resolv.h>
 
-sethostent(stayopen)
-{
+sethostent(stayopen) {
 	if (stayopen)
 		_res.options |= RES_STAYOPEN | RES_USEVC;
 }
 
-endhostent()
-{
+endhostent() {
 	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
 	_res_close();
 }
 
 sethostfile(name)
-char *name;
-{
+char *name; {
 #ifdef lint
 name = name;
 #endif
diff --git a/lib/libstdc/net/rcmd.c b/lib/libstdc/net/rcmd.c
index 43e4150..cdfcea2 100644
--- a/lib/libstdc/net/rcmd.c
+++ b/lib/libstdc/net/rcmd.c
@@ -1,8 +1,3 @@
-#include <fcntl.h>
-#include <net.h>
-#include <signal.h>
-#include <sys/errno.h>
-#include <sys/types.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -34,8 +29,7 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 	char **ahost;
 	u_short rport;
 	char *locuser, *remuser, *cmd;
-	int *fd2p;
-{
+	int *fd2p; {
 	int s, timo = 1, pid, oldmask;
 	struct sockaddr_in sin, sin2, from;
 	char c;
@@ -155,8 +149,7 @@ bad:
 }
 
 rresvport(alport)
-	int *alport;
-{
+	int *alport; {
 	struct sockaddr_in sin;
 	int s;
 
@@ -185,8 +178,7 @@ rresvport(alport)
 ruserok(rhost, superuser, ruser, luser)
 	char *rhost;
 	int superuser;
-	char *ruser, *luser;
-{
+	char *ruser, *luser; {
 	FILE *hostf;
 	char fhost[MAXHOSTNAMELEN];
 	int first = 1;
@@ -239,8 +231,7 @@ again:
 _validuser(hostf, rhost, luser, ruser, baselen)
 char *rhost, *luser, *ruser;
 FILE *hostf;
-int baselen;
-{
+int baselen; {
 	char *user;
 	char ahost[MAXHOSTNAMELEN];
 	register char *p;
@@ -271,8 +262,7 @@ int baselen;
 
 _checkhost(rhost, lhost, len)
 char *rhost, *lhost;
-int len;
-{
+int len; {
 	static char ldomain[MAXHOSTNAMELEN + 1];
 	static char *domainp = NULL;
 	register char *cp;
diff --git a/lib/libstdc/net/res_comp.c b/lib/libstdc/net/res_comp.c
index 4047129..1c19c31 100644
--- a/lib/libstdc/net/res_comp.c
+++ b/lib/libstdc/net/res_comp.c
@@ -22,8 +22,7 @@ static char sccsid[] = "@(#)res_comp.c	6.7 (Berkeley) 3/11/86";
  */
 dn_expand(msg, eomorig, comp_dn, exp_dn, length)
 	char *msg, *eomorig, *comp_dn, *exp_dn;
-	int length;
-{
+	int length; {
 	register char *cp, *dn;
 	register int n, c;
 	char *eom;
@@ -93,8 +92,7 @@ dn_expand(msg, eomorig, comp_dn, exp_dn, length)
 dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
 	char *exp_dn, *comp_dn;
 	int length;
-	char **dnptrs, **lastdnptr;
-{
+	char **dnptrs, **lastdnptr; {
 	register char *cp, *dn;
 	register int c, l;
 	char **cpp, **lpp, *sp, *eob;
@@ -160,8 +158,7 @@ dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
  * Skip over a compressed domain name. Return the size or -1.
  */
 dn_skip(comp_dn)
-	char *comp_dn;
-{
+	char *comp_dn; {
 	register char *cp;
 	register int n;
 
@@ -190,8 +187,7 @@ dn_skip(comp_dn)
  */
 dn_find(exp_dn, msg, dnptrs, lastdnptr)
 	char *exp_dn, *msg;
-	char **dnptrs, **lastdnptr;
-{
+	char **dnptrs, **lastdnptr; {
 	register char *dn, *cp, **cpp;
 	register int n;
 	char *sp;
@@ -239,8 +235,7 @@ dn_find(exp_dn, msg, dnptrs, lastdnptr)
 
 u_short
 getshort(msgp)
-	char *msgp;
-{
+	char *msgp; {
 	register u_char *p = (u_char *) msgp;
 #ifdef vax
 	/*
@@ -257,8 +252,7 @@ getshort(msgp)
 
 u_long
 getlong(msgp)
-	char *msgp;
-{
+	char *msgp; {
 	register u_char *p = (u_char *) msgp;
 	register u_long u;
 
@@ -271,8 +265,7 @@ getlong(msgp)
 
 putshort(s, msgp)
 	register u_short s;
-	register char *msgp;
-{
+	register char *msgp; {
 
 	msgp[1] = s;
 	msgp[0] = s >> 8;
@@ -280,8 +273,7 @@ putshort(s, msgp)
 
 putlong(l, msgp)
 	register u_long l;
-	register char *msgp;
-{
+	register char *msgp; {
 
 	msgp[3] = l;
 	msgp[2] = (l >>= 8);
diff --git a/lib/libstdc/net/res_debug.c b/lib/libstdc/net/res_debug.c
index cbd0f72..0c5b4c0 100644
--- a/lib/libstdc/net/res_debug.c
+++ b/lib/libstdc/net/res_debug.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -60,8 +59,7 @@ char *rcodes[] = {
 };
 
 p_query(msg)
-	char *msg;
-{
+	char *msg; {
 #ifdef DEBUG
 	fp_query(msg,stdout);
 #endif
@@ -73,8 +71,7 @@ p_query(msg)
  */
 fp_query(msg,file)
 	char *msg;
-	FILE *file;
-{
+	FILE *file; {
 #ifdef DEBUG
 	register char *cp;
 	register HEADER *hp;
@@ -164,8 +161,7 @@ fp_query(msg,file)
 char *
 p_cdname(cp, msg, file)
 	char *cp, *msg;
-	FILE *file;
-{
+	FILE *file; {
 #ifdef DEBUG
 	char name[MAXDNAME];
 	int n;
@@ -187,8 +183,7 @@ p_cdname(cp, msg, file)
 char *
 p_rr(cp, msg, file)
 	char *cp, *msg;
-	FILE *file;
-{
+	FILE *file; {
 #ifdef DEBUG
 	int type, class, dlen, n, c;
 	struct in_addr inaddr;
@@ -336,8 +331,7 @@ extern	char *sprintf();
  */
 char *
 p_type(type)
-	int type;
-{
+	int type; {
 	switch (type) {
 	case T_A:
 		return("A");
@@ -395,8 +389,7 @@ p_type(type)
  */
 char *
 p_class(class)
-	int class;
-{
+	int class; {
 
 	switch (class) {
 	case C_IN:		/* internet class */
diff --git a/lib/libstdc/net/res_init.c b/lib/libstdc/net/res_init.c
index 197b31b..b7daf9e 100644
--- a/lib/libstdc/net/res_init.c
+++ b/lib/libstdc/net/res_init.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -53,8 +52,7 @@ struct state _res = {
  *
  * Return 0 if completes successfully, -1 on error
  */
-res_init()
-{
+res_init() {
     register FILE *fp;
     char buf[BUFSIZ], *cp;
     extern u_long inet_addr();
diff --git a/lib/libstdc/net/res_mkquery.c b/lib/libstdc/net/res_mkquery.c
index 849a2c9..ab4b475 100644
--- a/lib/libstdc/net/res_mkquery.c
+++ b/lib/libstdc/net/res_mkquery.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -29,8 +28,7 @@ res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen)
 	int datalen;		/* length of data */
 	struct rrec *newrr;	/* new rr for modify or append */
 	char *buf;		/* buffer to put query */
-	int buflen;		/* size of buffer */
-{
+	int buflen;		/* size of buffer */ {
 	register HEADER *hp;
 	register char *cp;
 	register int n;
diff --git a/lib/libstdc/net/res_send.c b/lib/libstdc/net/res_send.c
index 5e08986..6dec4d2 100644
--- a/lib/libstdc/net/res_send.c
+++ b/lib/libstdc/net/res_send.c
@@ -1,7 +1,3 @@
-#include <net.h>
-#include <sys/errno.h>
-#include <sys/select.h>
-#include <sys/types.h>
 
 /*
  * Copyright (c) 1985 Regents of the University of California.
@@ -37,8 +33,7 @@ res_send(buf, buflen, answer, anslen)
 	char *buf;
 	int buflen;
 	char *answer;
-	int anslen;
-{
+	int anslen; {
 	register int n;
 	int retry, v_circuit, resplen, ns;
 	int gotsomewhere = 0;
@@ -291,8 +286,7 @@ wait:
  *
  * This routine is not expected to be user visible.
  */
-_res_close()
-{
+_res_close() {
 	if (s != -1) {
 		(void) close(s);
 		s = -1;
diff --git a/lib/libstdc/net/rexec.c b/lib/libstdc/net/rexec.c
index 1da7ea5..750645e 100644
--- a/lib/libstdc/net/rexec.c
+++ b/lib/libstdc/net/rexec.c
@@ -1,5 +1,3 @@
-#include <net.h>
-#include <sys/errno.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -28,8 +26,7 @@ rexec(ahost, rport, name, pass, cmd, fd2p)
 	char **ahost;
 	int rport;
 	char *name, *pass, *cmd;
-	int *fd2p;
-{
+	int *fd2p; {
 	int s, timo = 1, s3;
 	struct sockaddr_in sin, sin2, from;
 	char c;
diff --git a/lib/libstdc/net/ruserpass.c b/lib/libstdc/net/ruserpass.c
index 6e495f4..971a62c 100644
--- a/lib/libstdc/net/ruserpass.c
+++ b/lib/libstdc/net/ruserpass.c
@@ -1,4 +1,3 @@
-#include <sys/errno.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -21,8 +20,7 @@ struct	utmp *getutmp();
 static	FILE *cfile;
 
 ruserpass(host, aname, apass)
-	char *host, **aname, **apass;
-{
+	char *host, **aname, **apass; {
 
 	renv(host, aname, apass);
 	if (*aname == 0 || *apass == 0)
@@ -49,8 +47,7 @@ ruserpass(host, aname, apass)
 
 static
 renv(host, aname, apass)
-	char *host, **aname, **apass;
-{
+	char *host, **aname, **apass; {
 	register char *cp;
 	char *stemp, fgetlogin, *comma;
 
@@ -78,8 +75,7 @@ renv(host, aname, apass)
 static
 char *
 renvlook(host)
-	char *host;
-{
+	char *host; {
 	register char *cp, **env;
 	extern char **environ;
 
@@ -131,8 +127,7 @@ static struct toktab {
 
 static
 rnetrc(host, aname, apass)
-	char *host, **aname, **apass;
-{
+	char *host, **aname, **apass; {
 	char *hdir, buf[BUFSIZ];
 	int t;
 	struct stat stb;
@@ -199,8 +194,7 @@ done:
 }
 
 static
-token()
-{
+token() {
 	char *cp;
 	int c;
 	struct toktab *t;
@@ -490,8 +484,7 @@ static	char	KS[16][48];
 
 static
 nbssetkey(key)
-char *key;
-{
+char *key; {
 	register i, j, k;
 	int t;
 
@@ -615,8 +608,7 @@ static	char	preS[48];
 
 static
 blkencrypt(block, edflag)
-char *block;
-{
+char *block; {
 	int i, ii;
 	register t, j, k;
 
@@ -710,8 +702,7 @@ char *block;
 */
 static
 struct utmp *getutmp(sttyname)
-char *sttyname;
-{
+char *sttyname; {
 	static struct utmp utmpstr;
 	FILE *fdutmp;
 
@@ -731,8 +722,7 @@ char *sttyname;
 
 static
 sreverse(sto, sfrom)
-	register char *sto, *sfrom;
-{
+	register char *sto, *sfrom; {
 	register int i;
 
 	i = strlen(sfrom);
@@ -742,8 +732,7 @@ sreverse(sto, sfrom)
 
 static
 char *mkenvkey(mch)
-	char mch;
-{
+	char mch; {
 	static char skey[40];
 	register struct utmp *putmp;
 	char stemp[40], stemp1[40], sttyname[30];
@@ -775,8 +764,7 @@ char *mkenvkey(mch)
 }
 
 mkpwunclear(spasswd,mch,sencpasswd)
-	char mch, *spasswd, *sencpasswd;
-{
+	char mch, *spasswd, *sencpasswd; {
 	register char *skey;
 
 	if (spasswd[0] == 0) {
@@ -792,8 +780,7 @@ mkpwunclear(spasswd,mch,sencpasswd)
 }
 
 mkpwclear(sencpasswd,mch,spasswd)
-	char mch, *spasswd, *sencpasswd;
-{
+	char mch, *spasswd, *sencpasswd; {
 	register char *skey;
 
 	if (sencpasswd[0] == 0) {
diff --git a/lib/libstdc/ns/ns_addr.c b/lib/libstdc/ns/ns_addr.c
index ff1758b..007d57c 100644
--- a/lib/libstdc/ns/ns_addr.c
+++ b/lib/libstdc/ns/ns_addr.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1986 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -19,8 +18,7 @@ static struct ns_addr addr, zero_addr;
 
 struct ns_addr 
 ns_addr(name)
-	char *name;
-{
+	char *name; {
 	u_long net;
 	u_short socket;
 	char separator = '.';
@@ -68,8 +66,7 @@ static
 Field(buf, out, len)
 char *buf;
 u_char *out;
-int len;
-{
+int len; {
 	register char *bp = buf;
 	int i, ibase, base16 = 0, base10 = 0, clen = 0;
 	int hb[6], *hp;
@@ -174,8 +171,7 @@ cvtbase(oldbase,newbase,input,inlen,result,reslen)
 	int input[];
 	int inlen;
 	unsigned char result[];
-	int reslen;
-{
+	int reslen; {
 	int d, e;
 	long sum;
 
diff --git a/lib/libstdc/ns/ns_ntoa.c b/lib/libstdc/ns/ns_ntoa.c
index 78c8eef..64a1d15 100644
--- a/lib/libstdc/ns/ns_ntoa.c
+++ b/lib/libstdc/ns/ns_ntoa.c
@@ -1,4 +1,3 @@
-#include <net.h>
 /*
  * Copyright (c) 1986 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -15,8 +14,7 @@ static char sccsid[] = "@(#)ns_ntoa.c	6.3 (Berkeley) 3/9/86";
 
 char *
 ns_ntoa(addr)
-struct ns_addr addr;
-{
+struct ns_addr addr; {
 	static char obuf[40];
 	char *spectHex();
 	union { union ns_net net_e; u_long long_e; } net;
@@ -53,8 +51,7 @@ struct ns_addr addr;
 
 static char *
 spectHex(p0)
-char *p0;
-{
+char *p0; {
 	int ok = 0;
 	int nonzero = 0;
 	register char *p = p0;
diff --git a/lib/libstdc/o.sh b/lib/libstdc/o.sh
index 9bc2065..8412c64 100755
--- a/lib/libstdc/o.sh
+++ b/lib/libstdc/o.sh
@@ -52,7 +52,7 @@ do
 
   if test -n "$pattern"
   then
-    grep -H "^\\(.*[^0-9A-Za-z_]\\)\\?\\($pattern\\)\\([^0-9A-Za-z_].*\\)\\?$" `find . -name '*.c.nocomm' -print` |sed -e 's:^\./::' |grep -v "^$i\.nocomm:" >a
+    grep -H "^\\(.*[^0-9A-Za-z_]\\)\\?\\($pattern\\)\\([^0-9A-Za-z_].*\\)\\?$" `cat generated.txt |sed -e 's/$/\.nocomm/'` |sed -e 's:^\./::' |grep -v "^$i\.nocomm:" >a
     if test -s a
     then
       cat a >>$i.usedby
diff --git a/lib/libstdc/stdio/Makefile b/lib/libstdc/stdio/Makefile
index cd18527..e837cfd 100644
--- a/lib/libstdc/stdio/Makefile
+++ b/lib/libstdc/stdio/Makefile
@@ -25,15 +25,15 @@ STDSRC=	clrerr.c doscan.c \
 	fprintf.c fputc.c fread.c freopen.c fseek.c ftell.c \
 	fwrite.c getchar.c getw.c printf.c putchar.c \
 	putw.c rew.c scanf.c setbuf.c setbuffer.c sibuf.c sobuf.c \
-	sprintf.c strout.c ungetc.c vfprintf.c vprintf.c vsprintf.c
-VAXSRC=	doprnt.c fgets.c fputs.c gets.c puts.c
+	sprintf.c strout.c ungetc.c
+VAXSRC=	fgets.c fputs.c gets.c puts.c
 STDOBJ=	clrerr.o doscan.o \
 	exit.o fdopen.o fgetc.o filbuf.o findiop.o flsbuf.o fopen.o \
 	fprintf.o fputc.o fread.o freopen.o fseek.o ftell.o \
 	fwrite.o getchar.o getw.o printf.o putchar.o \
 	putw.o rew.o scanf.o setbuf.o setbuffer.o sibuf.o sobuf.o \
-	sprintf.o strout.o ungetc.o vfprintf.o vprintf.o vsprintf.o
-VAXOBJ=	doprnt.o fgets.o fputs.o gets.o puts.o
+	sprintf.o strout.o ungetc.o
+VAXOBJ=	fgets.o fputs.o gets.o puts.o
 TAGSFILE=tags
 
 .c.o:
diff --git a/lib/libstdc/stdio/clrerr.c b/lib/libstdc/stdio/clrerr.c
index baaede2..d16b2f7 100644
--- a/lib/libstdc/stdio/clrerr.c
+++ b/lib/libstdc/stdio/clrerr.c
@@ -6,7 +6,6 @@ static char sccsid[] = "@(#)clrerr.c	5.2 (Berkeley) 3/9/86";
 #undef	clearerr
 
 clearerr(iop)
-	register FILE *iop;
-{
+	register FILE *iop; {
 	iop->_flag &= ~(_IOERR|_IOEOF);
 }
diff --git a/lib/libstdc/stdio/doprnt.c b/lib/libstdc/stdio/doprnt.c
index fb26796..ce12bc6 100644
--- a/lib/libstdc/stdio/doprnt.c
+++ b/lib/libstdc/stdio/doprnt.c
@@ -56,8 +56,7 @@ static char sccsid[] = "@(#)doprnt.c	5.35 (Berkeley) 6/27/88";
 _doprnt(fmt0, argp, fp)
 	u_char *fmt0;
 	va_list argp;
-	register FILE *fp;
-{
+	register FILE *fp; {
 	register u_char *fmt;	/* format string */
 	register int ch;	/* character from fmt */
 	register int cnt;	/* return value accumulator */
@@ -408,8 +407,7 @@ cvt(number, prec, flags, signp, fmtch, startp, endp)
 	register int prec;
 	int flags;
 	u_char fmtch;
-	char *signp, *startp, *endp;
-{
+	char *signp, *startp, *endp; {
 	register char *p, *t;
 	register double fract;
 	int dotrim, expcnt, gformat;
@@ -593,8 +591,7 @@ round(fract, exp, start, end, ch, signp)
 	double fract;
 	int *exp;
 	register char *start, *end;
-	char ch, *signp;
-{
+	char ch, *signp; {
 	double tmp;
 
 	if (fract)
@@ -637,8 +634,7 @@ static char *
 exponent(p, exp, fmtch)
 	register char *p;
 	register int exp;
-	u_char fmtch;
-{
+	u_char fmtch; {
 	register char *t;
 	char expbuf[MAXEXP];
 
diff --git a/lib/libstdc/stdio/doscan.c b/lib/libstdc/stdio/doscan.c
index 415d6ed..4da42b6 100644
--- a/lib/libstdc/stdio/doscan.c
+++ b/lib/libstdc/stdio/doscan.c
@@ -31,8 +31,7 @@ static char _sctab[256] = {
 _doscan(iop, fmt, ap)
 FILE *iop;
 register char *fmt;
-register va_list ap;
-{
+register va_list ap; {
 	register int ch;
 	int nmatch, len, ch1;
 	int *ptr, fileended, size;
@@ -102,8 +101,7 @@ register va_list ap;
 static
 _innum(ptr, type, len, size, iop, eofptr)
 int *ptr, *eofptr;
-FILE *iop;
-{
+FILE *iop; {
 	extern double atof();
 	register char *np;
 	char numbuf[64];
@@ -212,8 +210,7 @@ static
 _instr(ptr, type, len, iop, eofptr)
 register char *ptr;
 register FILE *iop;
-int *eofptr;
-{
+int *eofptr; {
 	register ch;
 	register char *optr;
 	int ignstp;
@@ -255,8 +252,7 @@ int *eofptr;
 
 static char *
 _getccl(s)
-register unsigned char *s;
-{
+register unsigned char *s; {
 	register c, t;
 
 	t = 0;
diff --git a/lib/libstdc/stdio/exit.c b/lib/libstdc/stdio/exit.c
index aa9949c..faf4229 100644
--- a/lib/libstdc/stdio/exit.c
+++ b/lib/libstdc/stdio/exit.c
@@ -3,8 +3,7 @@ static char sccsid[] = "@(#)exit.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
 
 exit(code)
-	int code;
-{
+	int code; {
 
 	_cleanup();
 	_exit(code);
diff --git a/lib/libstdc/stdio/fdopen.c b/lib/libstdc/stdio/fdopen.c
index 04032b7..f2a9706 100644
--- a/lib/libstdc/stdio/fdopen.c
+++ b/lib/libstdc/stdio/fdopen.c
@@ -20,8 +20,7 @@ static char sccsid[] = "@(#)fdopen.c	5.2 (Berkeley) 3/9/86";
 
 FILE *
 fdopen(fd, mode)
-	register char *mode;
-{
+	register char *mode; {
 	extern FILE *_findiop();
 	static int nofile = -1;
 	register FILE *iop;
diff --git a/lib/libstdc/stdio/fgetc.c b/lib/libstdc/stdio/fgetc.c
index 4fa4e8e..20ea7c4 100644
--- a/lib/libstdc/stdio/fgetc.c
+++ b/lib/libstdc/stdio/fgetc.c
@@ -5,7 +5,6 @@ static char sccsid[] = "@(#)fgetc.c	5.2 (Berkeley) 3/9/86";
 #include <stdio.h>
 
 fgetc(fp)
-FILE *fp;
-{
+FILE *fp; {
 	return(getc(fp));
 }
diff --git a/lib/libstdc/stdio/fgets.c b/lib/libstdc/stdio/fgets.c
index 8452eff..3d714d5 100644
--- a/lib/libstdc/stdio/fgets.c
+++ b/lib/libstdc/stdio/fgets.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)fgets.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -8,8 +7,7 @@ static char sccsid[] = "@(#)fgets.c	5.2 (Berkeley) 3/9/86";
 char *
 fgets(s, n, iop)
 char *s;
-register FILE *iop;
-{
+register FILE *iop; {
 	register c;
 	register char *cs;
 
diff --git a/lib/libstdc/stdio/filbuf.c b/lib/libstdc/stdio/filbuf.c
index d600992..67b4a8c 100644
--- a/lib/libstdc/stdio/filbuf.c
+++ b/lib/libstdc/stdio/filbuf.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -15,8 +14,7 @@ static char sccsid[] = "@(#)filbuf.c	5.3 (Berkeley) 3/9/86";
 char	*malloc();
 
 _filbuf(iop)
-register FILE *iop;
-{
+register FILE *iop; {
 	int size;
 	struct stat stbuf;
 	extern char *_smallbuf;
diff --git a/lib/libstdc/stdio/findiop.c b/lib/libstdc/stdio/findiop.c
index c0789a9..2451132 100644
--- a/lib/libstdc/stdio/findiop.c
+++ b/lib/libstdc/stdio/findiop.c
@@ -1,4 +1,3 @@
-#include <sys/errno.h>
 /*
  * Copyright (c) 1983, 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -41,8 +40,7 @@ static	FILE	**endglue;
  * the old and new FILE entries, which are then no longer contiguous.
  */
 FILE *
-_findiop()
-{
+_findiop() {
 	register FILE **iov, *iop;
 	register FILE *fp;
 
@@ -70,8 +68,7 @@ _findiop()
 	return (*iov);
 }
 
-_f_morefiles()
-{
+_f_morefiles() {
 	register FILE **iov;
 	register FILE *fp;
 	register char *cp;
@@ -92,8 +89,7 @@ _f_morefiles()
 	return (1);
 }
 
-f_prealloc()
-{
+f_prealloc() {
 	register FILE **iov;
 	register FILE *fp;
 
@@ -106,8 +102,7 @@ f_prealloc()
 }
 
 _fwalk(function)
-	register int (*function)();
-{
+	register int (*function)(); {
 	register FILE **iov;
 	register FILE *fp;
 
@@ -122,8 +117,7 @@ _fwalk(function)
 	}
 }
 
-_cleanup()
-{
+_cleanup() {
 	extern int fclose();
 
 	_fwalk(fclose);
diff --git a/lib/libstdc/stdio/flsbuf.c b/lib/libstdc/stdio/flsbuf.c
index 759ebc1..5619b1e 100644
--- a/lib/libstdc/stdio/flsbuf.c
+++ b/lib/libstdc/stdio/flsbuf.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -17,8 +16,7 @@ char	*malloc();
 
 _flsbuf(c, iop)
 unsigned char c;
-register FILE *iop;
-{
+register FILE *iop; {
 	register char *base;
 	register n, rn;
 	char c1;
@@ -82,8 +80,7 @@ tryagain:
 }
 
 fflush(iop)
-register FILE *iop;
-{
+register FILE *iop; {
 	register char *base;
 	register n;
 
@@ -100,8 +97,7 @@ register FILE *iop;
 }
 
 fclose(iop)
-	register FILE *iop;
-{
+	register FILE *iop; {
 	register int r;
 
 	r = EOF;
diff --git a/lib/libstdc/stdio/fopen.c b/lib/libstdc/stdio/fopen.c
index 40201ac..c6b1c75 100644
--- a/lib/libstdc/stdio/fopen.c
+++ b/lib/libstdc/stdio/fopen.c
@@ -1,4 +1,3 @@
-#include <fcntl.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -16,8 +15,7 @@ static char sccsid[] = "@(#)fopen.c	5.2 (Berkeley) 3/9/86";
 FILE *
 fopen(file, mode)
 	char *file;
-	register char *mode;
-{
+	register char *mode; {
 	register FILE *iop;
 	register f, rw, oflags;
 	extern FILE *_findiop();
diff --git a/lib/libstdc/stdio/fprintf.c b/lib/libstdc/stdio/fprintf.c
index 29f2efa..ac32b5f 100644
--- a/lib/libstdc/stdio/fprintf.c
+++ b/lib/libstdc/stdio/fprintf.c
@@ -25,8 +25,7 @@ static char sccsid[] = "@(#)fprintf.c	5.4 (Berkeley) 6/27/88";
 fprintf(iop, fmt, va_alist)
 	register FILE *iop;
 	char *fmt;
-	va_dcl
-{
+	va_dcl {
 	va_list ap;
 	int len;
 	char localbuf[BUFSIZ];
diff --git a/lib/libstdc/stdio/fputc.c b/lib/libstdc/stdio/fputc.c
index 2bd5999..9935612 100644
--- a/lib/libstdc/stdio/fputc.c
+++ b/lib/libstdc/stdio/fputc.c
@@ -5,7 +5,6 @@ static char sccsid[] = "@(#)fputc.c	5.2 (Berkeley) 3/9/86";
 #include <stdio.h>
 
 fputc(c, fp)
-register FILE *fp;
-{
+register FILE *fp; {
 	return(putc(c, fp));
 }
diff --git a/lib/libstdc/stdio/fputs.c b/lib/libstdc/stdio/fputs.c
index e2385e3..2789ca3 100644
--- a/lib/libstdc/stdio/fputs.c
+++ b/lib/libstdc/stdio/fputs.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1984 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -13,8 +12,7 @@ static char sccsid[] = "@(#)fputs.c	5.2 (Berkeley) 3/9/86";
 
 fputs(s, iop)
 register char *s;
-register FILE *iop;
-{
+register FILE *iop; {
 	register r = 0;
 	register c;
 	int unbuffered;
diff --git a/lib/libstdc/stdio/fread.c b/lib/libstdc/stdio/fread.c
index fa25a8e..0b827f4 100644
--- a/lib/libstdc/stdio/fread.c
+++ b/lib/libstdc/stdio/fread.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -14,8 +13,7 @@ static char sccsid[] = "@(#)fread.c	5.2 (Berkeley) 3/9/86";
 fread(ptr, size, count, iop)
 	register char *ptr;
 	unsigned size, count;
-	register FILE *iop;
-{
+	register FILE *iop; {
 	register int s;
 	int c;
 
diff --git a/lib/libstdc/stdio/freopen.c b/lib/libstdc/stdio/freopen.c
index 8aeb9c1..3eba83f 100644
--- a/lib/libstdc/stdio/freopen.c
+++ b/lib/libstdc/stdio/freopen.c
@@ -1,4 +1,3 @@
-#include <fcntl.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -17,8 +16,7 @@ FILE *
 freopen(file, mode, iop)
 	char *file;
 	register char *mode;
-	register FILE *iop;
-{
+	register FILE *iop; {
 	register f, rw, oflags;
 
 	rw = (mode[1] == '+');
diff --git a/lib/libstdc/stdio/fseek.c b/lib/libstdc/stdio/fseek.c
index 799bd0a..717a57a 100644
--- a/lib/libstdc/stdio/fseek.c
+++ b/lib/libstdc/stdio/fseek.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)fseek.c	5.3 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -13,8 +12,7 @@ long lseek();
 
 fseek(iop, offset, ptrname)
 	register FILE *iop;
-	long offset;
-{
+	long offset; {
 	register resync, c;
 	long p = -1;			/* can't happen? */
 
diff --git a/lib/libstdc/stdio/ftell.c b/lib/libstdc/stdio/ftell.c
index 4ed479a..60a4111 100644
--- a/lib/libstdc/stdio/ftell.c
+++ b/lib/libstdc/stdio/ftell.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ftell.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -13,8 +12,7 @@ long	lseek();
 
 
 long ftell(iop)
-register FILE *iop;
-{
+register FILE *iop; {
 	register long tres;
 	register adjust;
 
diff --git a/lib/libstdc/stdio/fwrite.c b/lib/libstdc/stdio/fwrite.c
index 688214a..234bbf3 100644
--- a/lib/libstdc/stdio/fwrite.c
+++ b/lib/libstdc/stdio/fwrite.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -14,8 +13,7 @@ static char sccsid[] = "@(#)fwrite.c	5.2 (Berkeley) 3/9/86";
 fwrite(ptr, size, count, iop)
 	register char *ptr;
 	unsigned size, count;
-	register FILE *iop;
-{
+	register FILE *iop; {
 	register int s;
 
 	s = size * count;
diff --git a/lib/libstdc/stdio/getchar.c b/lib/libstdc/stdio/getchar.c
index f85e8dd..843efaa 100644
--- a/lib/libstdc/stdio/getchar.c
+++ b/lib/libstdc/stdio/getchar.c
@@ -9,7 +9,6 @@ static char sccsid[] = "@(#)getchar.c	5.2 (Berkeley) 3/9/86";
 
 #undef getchar
 
-getchar()
-{
+getchar() {
 	return(getc(stdin));
 }
diff --git a/lib/libstdc/stdio/gets.c b/lib/libstdc/stdio/gets.c
index 8cbb92a..82e99a6 100644
--- a/lib/libstdc/stdio/gets.c
+++ b/lib/libstdc/stdio/gets.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gets.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -7,8 +6,7 @@ static char sccsid[] = "@(#)gets.c	5.2 (Berkeley) 3/9/86";
 
 char *
 gets(s)
-char *s;
-{
+char *s; {
 	register c;
 	register char *cs;
 
diff --git a/lib/libstdc/stdio/getw.c b/lib/libstdc/stdio/getw.c
index f307e1b..f6b62df 100644
--- a/lib/libstdc/stdio/getw.c
+++ b/lib/libstdc/stdio/getw.c
@@ -5,8 +5,7 @@ static char sccsid[] = "@(#)getw.c	5.2 (Berkeley) 3/9/86";
 #include <stdio.h>
 
 getw(iop)
-register FILE *iop;
-{
+register FILE *iop; {
 	register i;
 	register char *p;
 	int w;
diff --git a/lib/libstdc/stdio/popen.c b/lib/libstdc/stdio/popen.c
index b55ca31..632460e 100644
--- a/lib/libstdc/stdio/popen.c
+++ b/lib/libstdc/stdio/popen.c
@@ -1,4 +1,3 @@
-#include <sys/signal.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -24,8 +23,7 @@ static	int nfiles;
 FILE *
 popen(cmd,mode)
 	char *cmd;
-	char *mode;
-{
+	char *mode; {
 	int p[2];
 	int myside, hisside, pid;
 
@@ -63,8 +61,7 @@ popen(cmd,mode)
 }
 
 pclose(ptr)
-	FILE *ptr;
-{
+	FILE *ptr; {
 	int child, pid, status, omask;
 
 	child = popen_pid[fileno(ptr)];
diff --git a/lib/libstdc/stdio/printf.c b/lib/libstdc/stdio/printf.c
index 7c14a77..a9c2a4f 100644
--- a/lib/libstdc/stdio/printf.c
+++ b/lib/libstdc/stdio/printf.c
@@ -24,8 +24,7 @@ static char sccsid[] = "@(#)printf.c	5.4 (Berkeley) 6/27/88";
 
 printf(fmt, va_alist)
 	char *fmt;
-	va_dcl
-{
+	va_dcl {
 	va_list ap;
 	int len;
 
diff --git a/lib/libstdc/stdio/putchar.c b/lib/libstdc/stdio/putchar.c
index 5aa3cee..cf27222 100644
--- a/lib/libstdc/stdio/putchar.c
+++ b/lib/libstdc/stdio/putchar.c
@@ -10,7 +10,6 @@ static char sccsid[] = "@(#)putchar.c	5.2 (Berkeley) 3/9/86";
 #undef putchar
 
 putchar(c)
-register c;
-{
+register c; {
 	putc(c, stdout);
 }
diff --git a/lib/libstdc/stdio/puts.c b/lib/libstdc/stdio/puts.c
index d0a0b6e..0289c91 100644
--- a/lib/libstdc/stdio/puts.c
+++ b/lib/libstdc/stdio/puts.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)puts.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -6,8 +5,7 @@ static char sccsid[] = "@(#)puts.c	5.2 (Berkeley) 3/9/86";
 #include	<stdio.h>
 
 puts(s)
-register char *s;
-{
+register char *s; {
 	register c;
 
 	while (c = *s++)
diff --git a/lib/libstdc/stdio/putw.c b/lib/libstdc/stdio/putw.c
index d56868b..0a132c9 100644
--- a/lib/libstdc/stdio/putw.c
+++ b/lib/libstdc/stdio/putw.c
@@ -5,8 +5,7 @@ static char sccsid[] = "@(#)putw.c	5.2 (Berkeley) 3/9/86";
 #include <stdio.h>
 
 putw(w, iop)
-register FILE *iop;
-{
+register FILE *iop; {
 	register char *p;
 	register i;
 
diff --git a/lib/libstdc/stdio/rew.c b/lib/libstdc/stdio/rew.c
index f1b8a3f..33af77d 100644
--- a/lib/libstdc/stdio/rew.c
+++ b/lib/libstdc/stdio/rew.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rew.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -6,8 +5,7 @@ static char sccsid[] = "@(#)rew.c	5.2 (Berkeley) 3/9/86";
 #include	<stdio.h>
 
 rewind(iop)
-register FILE *iop;
-{
+register FILE *iop; {
 	fflush(iop);
 	lseek(fileno(iop), 0L, 0);
 	iop->_cnt = 0;
diff --git a/lib/libstdc/stdio/scanf.c b/lib/libstdc/stdio/scanf.c
index 9bca136..c7ded44 100644
--- a/lib/libstdc/stdio/scanf.c
+++ b/lib/libstdc/stdio/scanf.c
@@ -7,8 +7,7 @@ static char sccsid[] = "@(#)scanf.c	5.2 (Berkeley) 3/9/86";
 
 scanf(fmt, va_alist)
 char *fmt;
-va_dcl
-{
+va_dcl {
 	va_list ap;
 	int len;
 
@@ -21,8 +20,7 @@ va_dcl
 fscanf(iop, fmt, va_alist)
 FILE *iop;
 char *fmt;
-va_dcl
-{
+va_dcl {
 	va_list ap;
 	int len;
 
@@ -35,8 +33,7 @@ va_dcl
 sscanf(str, fmt, va_alist)
 register char *str;
 char *fmt;
-va_dcl
-{
+va_dcl {
 	FILE _strbuf;
 	va_list ap;
 	int len;
diff --git a/lib/libstdc/stdio/setbuf.c b/lib/libstdc/stdio/setbuf.c
index 5d201cd..1ace50a 100644
--- a/lib/libstdc/stdio/setbuf.c
+++ b/lib/libstdc/stdio/setbuf.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -13,8 +12,7 @@ static char sccsid[] = "@(#)setbuf.c	5.2 (Berkeley) 3/9/86";
 
 setbuf(iop, buf)
 register FILE *iop;
-char *buf;
-{
+char *buf; {
 	if (iop->_base != NULL && iop->_flag&_IOMYBUF)
 		free(iop->_base);
 	iop->_flag &= ~(_IOMYBUF|_IONBF|_IOLBF);
diff --git a/lib/libstdc/stdio/setbuffer.c b/lib/libstdc/stdio/setbuffer.c
index 82aeb93..5250c95 100644
--- a/lib/libstdc/stdio/setbuffer.c
+++ b/lib/libstdc/stdio/setbuffer.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -14,8 +13,7 @@ static char sccsid[] = "@(#)setbuffer.c	5.2 (Berkeley) 3/9/86";
 setbuffer(iop, buf, size)
 	register FILE *iop;
 	char *buf;
-	int size;
-{
+	int size; {
 	if (iop->_base != NULL && iop->_flag&_IOMYBUF)
 		free(iop->_base);
 	iop->_flag &= ~(_IOMYBUF|_IONBF|_IOLBF);
@@ -33,8 +31,7 @@ setbuffer(iop, buf, size)
  * set line buffering for either stdout or stderr
  */
 setlinebuf(iop)
-	register FILE *iop;
-{
+	register FILE *iop; {
 	char *buf;
 	extern char *malloc();
 
diff --git a/lib/libstdc/stdio/sprintf.c b/lib/libstdc/stdio/sprintf.c
index e4e9143..47fe97c 100644
--- a/lib/libstdc/stdio/sprintf.c
+++ b/lib/libstdc/stdio/sprintf.c
@@ -24,8 +24,7 @@ static char sccsid[] = "@(#)sprintf.c	5.5 (Berkeley) 6/27/88";
 
 sprintf(str, fmt, va_alist)
 	char *str, *fmt;
-	va_dcl
-{
+	va_dcl {
 	va_list ap;
 	FILE _strbuf;
 	int len;
diff --git a/lib/libstdc/stdio/strout.c b/lib/libstdc/stdio/strout.c
index a1086e7..c239f27 100644
--- a/lib/libstdc/stdio/strout.c
+++ b/lib/libstdc/stdio/strout.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strout.c	5.2 (Berkeley) 3/9/86";
 #endif LIBC_SCCS and not lint
@@ -9,8 +8,7 @@ _strout(count, string, adjust, file, fillch)
 register char *string;
 register count;
 int adjust;
-register FILE *file;
-{
+register FILE *file; {
 	while (adjust < 0) {
 		if (*string=='-' && fillch=='0') {
 			putc(*string++, file);
diff --git a/lib/libstdc/stdio/ungetc.c b/lib/libstdc/stdio/ungetc.c
index 286734c..c4cf59b 100644
--- a/lib/libstdc/stdio/ungetc.c
+++ b/lib/libstdc/stdio/ungetc.c
@@ -5,8 +5,7 @@ static char sccsid[] = "@(#)ungetc.c	5.3 (Berkeley) 3/26/86";
 #include <stdio.h>
 
 ungetc(c, iop)
-	register FILE *iop;
-{
+	register FILE *iop; {
 	if (c == EOF || (iop->_flag & (_IOREAD|_IORW)) == 0 ||
 	    iop->_ptr == NULL || iop->_base == NULL)
 		return (EOF);
diff --git a/lib/libstdc/stdio/vfprintf.c b/lib/libstdc/stdio/vfprintf.c
index 94f0fb5..e930f0a 100644
--- a/lib/libstdc/stdio/vfprintf.c
+++ b/lib/libstdc/stdio/vfprintf.c
@@ -26,8 +26,7 @@ int
 vfprintf(iop, fmt, ap)
 	FILE *iop;
 	char *fmt;
-	va_list ap;
-{
+	va_list ap; {
 	int len;
 	char localbuf[BUFSIZ];
 
diff --git a/lib/libstdc/stdio/vprintf.c b/lib/libstdc/stdio/vprintf.c
index ff99f39..f34655b 100644
--- a/lib/libstdc/stdio/vprintf.c
+++ b/lib/libstdc/stdio/vprintf.c
@@ -25,8 +25,7 @@ static char sccsid[] = "@(#)vprintf.c	5.2 (Berkeley) 6/27/88";
 int
 vprintf(fmt, ap)
 	char *fmt;
-	va_list ap;
-{
+	va_list ap; {
 	int len;
 
 	len = _doprnt(fmt, ap, stdout);
diff --git a/lib/libstdc/stdio/vsprintf.c b/lib/libstdc/stdio/vsprintf.c
index 7f43f90..0bc3e30 100644
--- a/lib/libstdc/stdio/vsprintf.c
+++ b/lib/libstdc/stdio/vsprintf.c
@@ -25,8 +25,7 @@ static char sccsid[] = "@(#)vsprintf.c	5.2 (Berkeley) 6/27/88";
 int
 vsprintf(str, fmt, ap)
 	char *str, *fmt;
-	va_list ap;
-{
+	va_list ap; {
 	FILE f;
 	int len;
 
diff --git a/lib/libstdc/sys/acct.h b/lib/libstdc/sys/acct.h
index e4dffee..a796ece 100644
--- a/lib/libstdc/sys/acct.h
+++ b/lib/libstdc/sys/acct.h
@@ -14,8 +14,7 @@
  */
 typedef	u_short comp_t;
 
-struct	acct
-{
+struct	acct {
 	char	ac_comm[10];		/* Accounting command name */
 	comp_t	ac_utime;		/* Accounting user time */
 	comp_t	ac_stime;		/* Accounting system time */
diff --git a/lib/libstdc/sys/buf.h b/lib/libstdc/sys/buf.h
index 1064b22..5001fd6 100644
--- a/lib/libstdc/sys/buf.h
+++ b/lib/libstdc/sys/buf.h
@@ -32,13 +32,11 @@
  * We only need three words for these, so this abbreviated
  * definition saves some space.
  */
-struct bufhd
-{
+struct bufhd {
 	long	b_flags;		/* see defines below */
 	struct	buf *b_forw, *b_back;	/* fwd/bkwd pointer in chain */
 };
-struct buf
-{
+struct buf {
 	long	b_flags;		/* too much goes here to describe */
 	struct	buf *b_forw, *b_back;	/* hash chain (2 way street) */
 	struct	buf *av_forw, *av_back;	/* position on free list if not BUSY */
diff --git a/lib/libstdc/sys/cmap.h b/lib/libstdc/sys/cmap.h
index 18fa690..77a3fd9 100644
--- a/lib/libstdc/sys/cmap.h
+++ b/lib/libstdc/sys/cmap.h
@@ -24,8 +24,7 @@
  *	(below) must be changed to long.
  */
 #ifndef	LOCORE
-struct cmap
-{
+struct cmap {
 unsigned short 	c_next,		/* index of next free list entry */
 		c_prev,		/* index of previous free list entry */
 		c_hlink;	/* hash link for <blkno,mdev> */
diff --git a/lib/libstdc/sys/conf.h b/lib/libstdc/sys/conf.h
index d97b00d..3d120ee 100644
--- a/lib/libstdc/sys/conf.h
+++ b/lib/libstdc/sys/conf.h
@@ -15,8 +15,7 @@
  * device switches is in the
  * file conf.c.
  */
-struct bdevsw
-{
+struct bdevsw {
 	int	(*d_open)();
 	int	(*d_close)();
 	int	(*d_strategy)();
@@ -31,8 +30,7 @@ struct	bdevsw bdevsw[];
 /*
  * Character device switch.
  */
-struct cdevsw
-{
+struct cdevsw {
 	int	(*d_open)();
 	int	(*d_close)();
 	int	(*d_read)();
@@ -51,8 +49,7 @@ struct	cdevsw cdevsw[];
 /*
  * tty line control switch.
  */
-struct linesw
-{
+struct linesw {
 	int	(*l_open)();
 	int	(*l_close)();
 	int	(*l_read)();
@@ -71,8 +68,7 @@ struct	linesw linesw[];
 /*
  * Swap device information
  */
-struct swdevt
-{
+struct swdevt {
 	dev_t	sw_dev;
 	int	sw_freed;
 	int	sw_nblks;
diff --git a/lib/libstdc/sys/dmap.h b/lib/libstdc/sys/dmap.h
index 57052d5..e5228cc 100644
--- a/lib/libstdc/sys/dmap.h
+++ b/lib/libstdc/sys/dmap.h
@@ -13,8 +13,7 @@
 
 #define	NDMAP 		38	/* size of the swap area map */
 
-struct	dmap
-{
+struct	dmap {
 	swblk_t	dm_size;	/* current size used by process */
 	swblk_t	dm_alloc;	/* amount of physical swap space allocated */
 	swblk_t	dm_map[NDMAP];	/* first disk block number in each chunk */
@@ -28,8 +27,7 @@ int	dmmin, dmmax, dmtext;
  * The following structure is that ``returned''
  * from a call to vstodb().
  */
-struct	dblock
-{
+struct	dblock {
 	swblk_t	db_base;	/* base of physical contig drum block */
 	swblk_t	db_size;	/* size of block */
 };
diff --git a/lib/libstdc/sys/fs.h b/lib/libstdc/sys/fs.h
index f453adb..f64fe35 100644
--- a/lib/libstdc/sys/fs.h
+++ b/lib/libstdc/sys/fs.h
@@ -130,8 +130,7 @@ struct csum {
  * Super block for a file system.
  */
 #define	FS_MAGIC	0x011954
-struct	fs
-{
+struct	fs {
 	struct	fs *fs_link;		/* linked list of file systems */
 	struct	fs *fs_rlink;		/*     used for incore super blocks */
 	daddr_t	fs_sblkno;		/* addr of super-block in filesys */
diff --git a/lib/libstdc/sys/fstat.c b/lib/libstdc/sys/fstat.c
index 59d563e..f5a2e1b 100644
--- a/lib/libstdc/sys/fstat.c
+++ b/lib/libstdc/sys/fstat.c
@@ -1,3 +1,4 @@
+#include <sys/stat.h>
 int fstat(f, b) struct stat *b; {
   abort();
 }
diff --git a/lib/libstdc/sys/inode.h b/lib/libstdc/sys/inode.h
index a6fd37c..8d5b4fe 100644
--- a/lib/libstdc/sys/inode.h
+++ b/lib/libstdc/sys/inode.h
@@ -37,8 +37,7 @@ struct inode {
 			struct inode **if_freeb;	/* free list back */
 		} i_fr;
 	} i_un;
-	struct 	icommon
-	{
+	struct 	icommon {
 		u_short	ic_mode;	/*  0: mode and type of file */
 		short	ic_nlink;	/*  2: number of links to file */
 		uid_t	ic_uid;		/*  4: owner's user id */
diff --git a/lib/libstdc/sys/lstat.c b/lib/libstdc/sys/lstat.c
index 275c947..9db8eab 100644
--- a/lib/libstdc/sys/lstat.c
+++ b/lib/libstdc/sys/lstat.c
@@ -1,3 +1,4 @@
+#include <sys/stat.h>
 int lstat(s, b) char *s; struct stat *b; {
   abort();
 }
diff --git a/lib/libstdc/sys/map.h b/lib/libstdc/sys/map.h
index 7e8ab8e..4d8922e 100644
--- a/lib/libstdc/sys/map.h
+++ b/lib/libstdc/sys/map.h
@@ -34,8 +34,7 @@ struct map {
 	char	*m_name;		/* name of resource */
 /* we use m_name when the map overflows, in warning messages */
 };
-struct mapent
-{
+struct mapent {
 	int	m_size;		/* size of this segment of the map */
 	int	m_addr;		/* resource-space addr of start of segment */
 };
diff --git a/lib/libstdc/sys/mount.h b/lib/libstdc/sys/mount.h
index 65a895b..89284a4 100644
--- a/lib/libstdc/sys/mount.h
+++ b/lib/libstdc/sys/mount.h
@@ -11,8 +11,7 @@
  * One allocated on every mount.
  * Used to find the super block.
  */
-struct	mount
-{
+struct	mount {
 	dev_t	m_dev;		/* device mounted */
 	struct	buf *m_bufp;	/* pointer to superblock */
 	struct	inode *m_inodp;	/* pointer to mounted on inode */
diff --git a/lib/libstdc/sys/stat.c b/lib/libstdc/sys/stat.c
index a620470..40cf959 100644
--- a/lib/libstdc/sys/stat.c
+++ b/lib/libstdc/sys/stat.c
@@ -1,3 +1,4 @@
+#include <sys/stat.h>
 int stat(s, b) char *s; struct stat *b; {
   abort();
 }
diff --git a/lib/libstdc/sys/stat.h b/lib/libstdc/sys/stat.h
index d5dfbcd..190f69c 100644
--- a/lib/libstdc/sys/stat.h
+++ b/lib/libstdc/sys/stat.h
@@ -6,8 +6,7 @@
  *	@(#)stat.h	7.1 (Berkeley) 6/4/86
  */
 
-struct	stat
-{
+struct	stat {
 	dev_t	st_dev;
 	ino_t	st_ino;
 	unsigned short st_mode;
diff --git a/lib/libstdc/sys/systm.h b/lib/libstdc/sys/systm.h
index bcd7b5d..503c88f 100644
--- a/lib/libstdc/sys/systm.h
+++ b/lib/libstdc/sys/systm.h
@@ -66,8 +66,7 @@ swblk_t	vtod();
 /*
  * Structure of the system-entry table
  */
-extern struct sysent
-{
+extern struct sysent {
 	int	sy_narg;		/* total number of arguments */
 	int	(*sy_call)();		/* handler */
 } sysent[];
diff --git a/lib/libstdc/sys/text.h b/lib/libstdc/sys/text.h
index ac0594a..e1088c2 100644
--- a/lib/libstdc/sys/text.h
+++ b/lib/libstdc/sys/text.h
@@ -14,8 +14,7 @@
  */
 #define	NXDAD	12		/* param.h:MAXTSIZ / vmparam.h:DMTEXT */
 
-struct text
-{
+struct text {
 	struct	text *x_forw;	/* forward link in free list */
 	struct	text **x_back;	/* backward link in free list */
 	swblk_t	x_daddr[NXDAD];	/* disk addresses of dmtext-page segments */
diff --git a/lib/libstdc/sys/timeb.h b/lib/libstdc/sys/timeb.h
index 47ee0e2..b133a0c 100644
--- a/lib/libstdc/sys/timeb.h
+++ b/lib/libstdc/sys/timeb.h
@@ -9,8 +9,7 @@
 /*
  * Structure returned by ftime system call
  */
-struct timeb
-{
+struct timeb {
 	time_t	time;
 	unsigned short millitm;
 	short	timezone;
diff --git a/lib/libstdc/sys/vmmeter.h b/lib/libstdc/sys/vmmeter.h
index 9a04350..e29a349 100644
--- a/lib/libstdc/sys/vmmeter.h
+++ b/lib/libstdc/sys/vmmeter.h
@@ -9,8 +9,7 @@
 /*
  * Virtual memory related instrumentation
  */
-struct vmmeter
-{
+struct vmmeter {
 #define	v_first	v_swtch
 	unsigned v_swtch;	/* context switches */
 	unsigned v_trap;	/* calls to trap */
@@ -50,8 +49,7 @@ struct	vmmeter cnt, rate, sum;
 #endif
 
 /* systemwide totals computed every five seconds */
-struct vmtotal
-{
+struct vmtotal {
 	short	t_rq;		/* length of the run queue */
 	short	t_dw;		/* jobs in ``disk wait'' (neg priority) */
 	short	t_pw;		/* jobs in page wait */
diff --git a/lib/libstdc/sys/vmsystm.h b/lib/libstdc/sys/vmsystm.h
index 972a585..00d07bb 100644
--- a/lib/libstdc/sys/vmsystm.h
+++ b/lib/libstdc/sys/vmsystm.h
@@ -33,8 +33,7 @@ int	fastscan;		/* fastest scan rate, clusters/second */
 /*
  * Fork/vfork accounting.
  */
-struct	forkstat
-{
+struct	forkstat {
 	int	cntfork;
 	int	cntvfork;
 	int	sizfork;
@@ -47,8 +46,7 @@ struct	forkstat forkstat;
 /*
  * Swap kind accounting.
  */
-struct	swptstat
-{
+struct	swptstat {
 	int	pteasy;		/* easy pt swaps */
 	int	ptexpand;	/* pt expansion swaps */
 	int	ptshrink;	/* pt shrinking swaps */
diff --git a/lib/libstdc/vax/ioa.h b/lib/libstdc/vax/ioa.h
index e2e7ff2..c4c0c71 100644
--- a/lib/libstdc/vax/ioa.h
+++ b/lib/libstdc/vax/ioa.h
@@ -33,8 +33,7 @@
 #define	IOA8600(i)	((caddr_t)(0x20080000+IOASIZE*i))
 
 #ifndef LOCORE
-struct	sbia_regs
-{
+struct	sbia_regs {
 	int sbi_cfg;
 	int sbi_csr;
 	int sbi_errsum;
diff --git a/lib/libstdc/vax/pcb.h b/lib/libstdc/vax/pcb.h
index fe970aa..26d772b 100644
--- a/lib/libstdc/vax/pcb.h
+++ b/lib/libstdc/vax/pcb.h
@@ -10,8 +10,7 @@
  * VAX process control block
  */
 
-struct pcb
-{
+struct pcb {
 	int	pcb_ksp; 	/* kernel stack pointer */
 	int	pcb_esp; 	/* exec stack pointer */
 	int	pcb_ssp; 	/* supervisor stack pointer */
diff --git a/lib/libstdc/vax/pte.h b/lib/libstdc/vax/pte.h
index 86d0987..b72ade9 100644
--- a/lib/libstdc/vax/pte.h
+++ b/lib/libstdc/vax/pte.h
@@ -17,8 +17,7 @@
  */
 
 #ifndef LOCORE
-struct pte
-{
+struct pte {
 unsigned int	pg_pfnum:21,		/* core page frame number or 0 */
 		:2,
 		pg_vreadm:1,		/* modified since vread (or with _m) */
@@ -28,14 +27,12 @@ unsigned int	pg_pfnum:21,		/* core page frame number or 0 */
 		pg_prot:4,		/* access control */
 		pg_v:1;			/* valid bit */
 };
-struct hpte
-{
+struct hpte {
 unsigned int	pg_pfnum:21,
 		:2,
 		pg_high:9;		/* special for clustering */
 };
-struct fpte
-{
+struct fpte {
 unsigned int	pg_blkno:24,		/* file system block number */
 		pg_fileno:1,		/* file mapped from or TEXT or ZERO */
 		pg_fod:1,		/* is fill on demand (=1) */
diff --git a/lib/libstdc/vaxmba/hpreg.h b/lib/libstdc/vaxmba/hpreg.h
index a2b7a3d..9d44a5e 100644
--- a/lib/libstdc/vaxmba/hpreg.h
+++ b/lib/libstdc/vaxmba/hpreg.h
@@ -6,8 +6,7 @@
  *	@(#)hpreg.h	7.1 (Berkeley) 6/5/86
  */
 
-struct hpdevice
-{
+struct hpdevice {
 	int	hpcs1;		/* control and status register 1 */
 	int	hpds;		/* drive status */
 	int	hper1;		/* error register 1 */
diff --git a/lib/libstdc/vaxmba/htreg.h b/lib/libstdc/vaxmba/htreg.h
index 91b4802..97c1c57 100644
--- a/lib/libstdc/vaxmba/htreg.h
+++ b/lib/libstdc/vaxmba/htreg.h
@@ -6,8 +6,7 @@
  *	@(#)htreg.h	7.1 (Berkeley) 6/5/86
  */
 
-struct	htdevice
-{
+struct	htdevice {
 	int	htcs1;		/* control status register */
 	int	htds;		/* drive status register */
 	int	hter;		/* error register */
diff --git a/lib/libstdc/vaxmba/mbareg.h b/lib/libstdc/vaxmba/mbareg.h
index 3a5a9a9..80e08b9 100644
--- a/lib/libstdc/vaxmba/mbareg.h
+++ b/lib/libstdc/vaxmba/mbareg.h
@@ -10,8 +10,7 @@
  * VAX MASSBUS adapter registers
  */
 
-struct mba_regs
-{
+struct mba_regs {
 	int	mba_csr;		/* configuration register */
 	int	mba_cr;			/* control register */
 	int	mba_sr;			/* status register */
diff --git a/lib/libstdc/vaxuba/idcreg.h b/lib/libstdc/vaxuba/idcreg.h
index caa47cf..b1cacad 100644
--- a/lib/libstdc/vaxuba/idcreg.h
+++ b/lib/libstdc/vaxuba/idcreg.h
@@ -13,8 +13,7 @@
 #define	NRB80TRK	14	/* RB80 tracks/cylinder */
 #define	NRB80CYL	559	/* RB80 cylinders/disk */
 
-struct idcdevice
-{
+struct idcdevice {
 	int	idccsr;		/* control status register */
 	int	idcbar;		/* bus address register */
 	int	idcbcr;		/* byte count register */
diff --git a/lib/libstdc/vaxuba/rkreg.h b/lib/libstdc/vaxuba/rkreg.h
index 5c8b4aa..6c9162b 100644
--- a/lib/libstdc/vaxuba/rkreg.h
+++ b/lib/libstdc/vaxuba/rkreg.h
@@ -11,8 +11,7 @@
 #define NRKSECT		22
 #define NRKTRK		3
 
-struct rkdevice
-{
+struct rkdevice {
 	short	rkcs1;		/* control status reg 1 */
 	short	rkwc;		/* word count */
 	u_short	rkba;		/* bus address */
diff --git a/lib/libstdc/vaxuba/ubareg.h b/lib/libstdc/vaxuba/ubareg.h
index 4474995..807b486 100644
--- a/lib/libstdc/vaxuba/ubareg.h
+++ b/lib/libstdc/vaxuba/ubareg.h
@@ -26,8 +26,7 @@
 /*
  * UBA hardware registers
  */
-struct uba_regs
-{
+struct uba_regs {
 	int	uba_cnfgr;		/* configuration register */
 	int	uba_cr;			/* control register */
 	int	uba_sr;			/* status register */
diff --git a/lib/libstdc/vaxuba/upreg.h b/lib/libstdc/vaxuba/upreg.h
index c0d8802..98142af 100644
--- a/lib/libstdc/vaxuba/upreg.h
+++ b/lib/libstdc/vaxuba/upreg.h
@@ -11,8 +11,7 @@
  * registers and bits.
  */
 
-struct updevice
-{
+struct updevice {
 	u_short	upcs1;		/* control and status register 1 */
 	short	upwc;		/* word count register */
 	u_short	upba;		/* UNIBUS address register */