remove __P

74 files changed, 815 insertions, 842 deletions

diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 4b98e01..f63b4781 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -32,6 +32,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -99,22 +101,22 @@ static char sccsid[] = "@(#)expr.c	8.1 (Berkeley) 6/6/93";
 
 static char *nxtch;		       /* Parser scan pointer */
 
-static int query __P((void));
-static int lor __P((void));
-static int land __P((void));
-static int not __P((void));
-static int eqrel __P((void));
-static int shift __P((void));
-static int primary __P((void));
-static int term __P((void));
-static int exp __P((void));
-static int unary __P((void));
-static int factor __P((void));
-static int constant __P((void));
-static int num __P((void));
-static int geteqrel __P((void));
-static int skipws __P((void));
-static void experr __P((char *));
+static int query(void);
+static int lor(void);
+static int land(void);
+static int not(void);
+static int eqrel(void);
+static int shift(void);
+static int primary(void);
+static int term(void);
+static int exp(void);
+static int unary(void);
+static int factor(void);
+static int constant(void);
+static int num(void);
+static int geteqrel(void);
+static int skipws(void);
+static void experr(char *);
 
 /*
  * For longjmp
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index a9e51f7..2b54e3c 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -37,36 +37,36 @@
  * $FreeBSD$
  */
 
-int	expr __P((char *));
-ndptr	addent __P((char *));
-void	chrsave __P((int));
-void	cleanup __P((int));
-void	dochc __P((char *[], int));
-void	dochq __P((char *[], int));
-void	dodefine __P((char *, char *));
-void	dodefn __P((char *));
-void	dodiv __P((int));
-void	dodump __P((char *[], int));
-void	doifelse __P((char *[], int));
-int	doincl __P((char *));
-int	dopaste __P((char *));
-void	dopushdef __P((char *, char *));
-void	dosub __P((char *[], int));
-void	doundiv __P((char *[], int));
-void	eval __P((char *[], int, int));
-void	expand __P((char *[], int));
-void	getdiv __P((int));
-int	hash __P((char *));
-int	indx __P((char *, char *));
-void	killdiv __P((void));
-ndptr	lookup __P((char *));
-void	map __P((char *, char *, char *, char *));
-void	onintr __P((int));
-void	pbnum __P((int));
-void    pbstr __P((unsigned char *));
-void	putback __P((int));
-void	remhash __P((char *, int));
-void	usage __P((void));
+int	expr(char *);
+ndptr	addent(char *);
+void	chrsave(int);
+void	cleanup(int);
+void	dochc(char *[], int);
+void	dochq(char *[], int);
+void	dodefine(char *, char *);
+void	dodefn(char *);
+void	dodiv(int);
+void	dodump(char *[], int);
+void	doifelse(char *[], int);
+int	doincl(char *);
+int	dopaste(char *);
+void	dopushdef(char *, char *);
+void	dosub(char *[], int);
+void	doundiv(char *[], int);
+void	eval(char *[], int, int);
+void	expand(char *[], int);
+void	getdiv(int);
+int	hash(char *);
+int	indx(char *, char *);
+void	killdiv(void);
+ndptr	lookup(char *);
+void	map(char *, char *, char *, char *);
+void	onintr(int);
+void	pbnum(int);
+void    pbstr(unsigned char *);
+void	putback(int);
+void	remhash(char *, int);
+void	usage(void);
 
 extern ndptr hashtab[];		/* hash table for macros etc. */
 extern stae mstack[];		/* stack of m4 machine */
diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/aux.c
index 866b91b..c73d952 100644
--- a/usr.bin/mail/aux.c
+++ b/usr.bin/mail/aux.c
@@ -50,7 +50,7 @@ static const char rcsid[] =
  * Auxiliary functions.
  */
 
-static char *save2str __P((char *, char *));
+static char *save2str(char *, char *);
 
 /*
  * Return a pointer to a dynamic copy of the argument.
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index f012962..7385abc 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -35,224 +35,221 @@
  * $FreeBSD$
  */
 
-struct name *cat __P((struct name *, struct name *));
-struct name *delname __P((struct name *, char []));
-struct name *elide __P((struct name *));
-struct name *extract __P((char [], int));
-struct name *gexpand __P((struct name *, struct grouphead *, int, int));
-struct name *nalloc __P((char [], int));
-struct name *outof __P((struct name *, FILE *, struct header *));
-struct name *put __P((struct name *, struct name *));
-struct name *tailof __P((struct name *));
-struct name *usermap __P((struct name *));
-FILE	*Fdopen __P((int, const char *));
-FILE	*Fopen __P((const char *, const char *));
-FILE	*Popen __P((char *, const char *));
-FILE	*collect __P((struct header *, int));
-char	*copyin __P((char *, char **));
-char	*detract __P((struct name *, int));
-char	*expand __P((char *));
-char	*getdeadletter __P((void));
-char	*getname __P((int));
-char	*hfield __P((const char *, struct message *));
-FILE	*infix __P((struct header *, FILE *));
-char	*ishfield __P((char [], char *, const char *));
-char	*name1 __P((struct message *, int));
-char	*nameof __P((struct message *, int));
-char	*nextword __P((char *, char *));
-char	*readtty __P((const char *, char []));
-char 	*reedit __P((char *));
-FILE	*run_editor __P((FILE *, off_t, int, int));
-char	*salloc __P((int));
-char	*savestr __P((char *));
-FILE	*setinput __P((struct message *));
-char	*skin __P((char *));
-char	*skip_comment __P((char *));
-char	*snarf __P((char [], int *));
-char	*username __P((void));
-char	*value __P((const char *));
-char	*vcopy __P((const char *));
-char	*yankword __P((char *, char []));
-int	 Fclose __P((FILE *));
-int	 More __P((int *));
-int	 Pclose __P((FILE *));
-int	 Respond __P((int *));
-int	 Type __P((int *));
-int	 doRespond __P((int []));
-int	 dorespond __P((int *));
-void	 alter __P((char *));
-int	 alternates __P((char **));
-void	 announce __P((void));
-int	 append __P((struct message *, FILE *));
-int	 argcount __P((char **));
-void	 assign __P((const char *, const char *));
-int	 bangexp __P((char *, size_t));
-void	 brokpipe __P((int));
-int	 charcount __P((char *, int));
-int	 check __P((int, int));
-void	 clob1 __P((int));
-int	 clobber __P((char **));
-void	 close_all_files __P((void));
-int	 cmatch __P((char *, char *));
-void	 collhup __P((int));
-void	 collint __P((int));
-void	 collstop __P((int));
-void	 commands __P((void));
-int	 copycmd __P((char []));
-int	 core __P((void));
-int	 count __P((struct name *));
-int	 delete __P((int []));
-int	 delm __P((int []));
-int	 deltype __P((int []));
-void	 demail __P((void));
-int	 diction __P((const void *, const void *));
-int	 dosh __P((char *));
-int	 echo __P((char **));
-int	 edit1 __P((int *, int));
-int	 editor __P((int *));
-void	 edstop __P((void));
-int	 elsecmd __P((void));
-int	 endifcmd __P((void));
-int	 evalcol __P((int));
-int	 execute __P((char [], int));
-int	 exwrite __P((char [], FILE *, int));
-void	 fail __P((const char *, const char *));
-int	 file __P((char **));
+struct name *cat(struct name *, struct name *);
+struct name *delname(struct name *, char []);
+struct name *elide(struct name *);
+struct name *extract(char [], int);
+struct name *gexpand(struct name *, struct grouphead *, int, int);
+struct name *nalloc(char [], int);
+struct name *outof(struct name *, FILE *, struct header *);
+struct name *put(struct name *, struct name *);
+struct name *tailof(struct name *);
+struct name *usermap(struct name *);
+FILE	*Fdopen(int, const char *);
+FILE	*Fopen(const char *, const char *);
+FILE	*Popen(char *, const char *);
+FILE	*collect(struct header *, int);
+char	*copyin(char *, char **);
+char	*detract(struct name *, int);
+char	*expand(char *);
+char	*getdeadletter(void);
+char	*getname(int);
+char	*hfield(const char *, struct message *);
+FILE	*infix(struct header *, FILE *);
+char	*ishfield(char [], char *, const char *);
+char	*name1(struct message *, int);
+char	*nameof(struct message *, int);
+char	*nextword(char *, char *);
+char	*readtty(const char *, char []);
+char 	*reedit(char *);
+FILE	*run_editor(FILE *, off_t, int, int);
+char	*salloc(int);
+char	*savestr(char *);
+FILE	*setinput(struct message *);
+char	*skin(char *);
+char	*skip_comment(char *);
+char	*snarf(char [], int *);
+char	*username(void);
+char	*value(const char *);
+char	*vcopy(const char *);
+char	*yankword(char *, char []);
+int	 Fclose(FILE *);
+int	 More(int *);
+int	 Pclose(FILE *);
+int	 Respond(int *);
+int	 Type(int *);
+int	 doRespond(int []);
+int	 dorespond(int *);
+void	 alter(char *);
+int	 alternates(char **);
+void	 announce(void);
+int	 append(struct message *, FILE *);
+int	 argcount(char **);
+void	 assign(const char *, const char *);
+int	 bangexp(char *, size_t);
+void	 brokpipe(int);
+int	 charcount(char *, int);
+int	 check(int, int);
+void	 clob1(int);
+int	 clobber(char **);
+void	 close_all_files(void);
+int	 cmatch(char *, char *);
+void	 collhup(int);
+void	 collint(int);
+void	 collstop(int);
+void	 commands(void);
+int	 copycmd(char []);
+int	 core(void);
+int	 count(struct name *);
+int	 delete(int []);
+int	 delm(int []);
+int	 deltype(int []);
+void	 demail(void);
+int	 diction(const void *, const void *);
+int	 dosh(char *);
+int	 echo(char **);
+int	 edit1(int *, int);
+int	 editor(int *);
+void	 edstop(void);
+int	 elsecmd(void);
+int	 endifcmd(void);
+int	 evalcol(int);
+int	 execute(char [], int);
+int	 exwrite(char [], FILE *, int);
+void	 fail(const char *, const char *);
+int	 file(char **);
 struct grouphead *
-	 findgroup __P((char []));
-void	 findmail __P((char *, char *, int));
-int	 first __P((int, int));
-void	 fixhead __P((struct header *, struct name *));
-void	 fmt __P((const char *, struct name *, FILE *, int));
-int	 folders __P((void));
-int	 forward __P((char [], FILE *, char *, int));
-void	 free_child __P((int));
-int	 from __P((int *));
-off_t	 fsize __P((FILE *));
-int	 getfold __P((char *, int));
-int	 gethfield __P((FILE *, char [], int, char **));
-int	 getmsglist __P((char *, int *, int));
-int	 getrawlist __P((char [], char **, int));
-int	 getuserid __P((char []));
-int	 grabh __P((struct header *, int));
-int	 group __P((char **));
-void	 hangup __P((int));
-int	 hash __P((const char *));
-void	 hdrstop __P((int));
-int	 headers __P((int *));
-int	 help __P((void));
-void	 holdsigs __P((void));
-int	 ifcmd __P((char **));
-int	 igcomp __P((const void *, const void *));
-int	 igfield __P((char *[]));
-int	 ignore1 __P((char *[], struct ignoretab *, const char *));
-int	 igshow __P((struct ignoretab *, const char *));
-int	 inc __P((void *));
-int	 incfile __P((void));
-void	 intr __P((int));
-int	 isdate __P((char []));
-int	 isdir __P((char []));
-int	 isfileaddr __P((char *));
-int	 ishead __P((char []));
-int	 isign __P((const char *, struct ignoretab []));
-int	 isprefix __P((const char *, const char *));
-void	 istrncpy __P((char *, const char *, size_t));
+	 findgroup(char []);
+void	 findmail(char *, char *, int);
+int	 first(int, int);
+void	 fixhead(struct header *, struct name *);
+void	 fmt(const char *, struct name *, FILE *, int);
+int	 folders(void);
+int	 forward(char [], FILE *, char *, int);
+void	 free_child(int);
+int	 from(int *);
+off_t	 fsize(FILE *);
+int	 getfold(char *, int);
+int	 gethfield(FILE *, char [], int, char **);
+int	 getmsglist(char *, int *, int);
+int	 getrawlist(char [], char **, int);
+int	 getuserid(char []);
+int	 grabh(struct header *, int);
+int	 group(char **);
+void	 hangup(int);
+int	 hash(const char *);
+void	 hdrstop(int);
+int	 headers(int *);
+int	 help(void);
+void	 holdsigs(void);
+int	 ifcmd(char **);
+int	 igcomp(const void *, const void *);
+int	 igfield(char *[]);
+int	 ignore1(char *[], struct ignoretab *, const char *);
+int	 igshow(struct ignoretab *, const char *);
+int	 inc(void *);
+int	 incfile(void);
+void	 intr(int);
+int	 isdate(char []);
+int	 isdir(char []);
+int	 isfileaddr(char *);
+int	 ishead(char []);
+int	 isign(const char *, struct ignoretab []);
+int	 isprefix(const char *, const char *);
+void	 istrncpy(char *, const char *, size_t);
 __const struct cmd *
-	 lex __P((char []));
-void	 load __P((char *));
+	 lex(char []);
+void	 load(char *);
 struct var *
-	 lookup __P((const char *));
-int	 mail __P((struct name *,
-	    struct name *, struct name *, struct name *, char *, char *));
-void	 mail1 __P((struct header *, int));
-void	 makemessage __P((FILE *, int));
-void	 mark __P((int));
-int	 markall __P((char [], int));
-int	 matchsender __P((char *, int));
-int	 matchsubj __P((char *, int));
-int	 mboxit __P((int []));
-int	 member __P((char *, struct ignoretab *));
-void	 mesedit __P((FILE *, int));
-void	 mespipe __P((FILE *, char []));
-int	 messize __P((int *));
-int	 metamess __P((int, int));
-int	 more __P((int *));
-int	 newfileinfo __P((int));
-int	 next __P((int *));
-int	 null __P((int));
-void	 parse __P((char [], struct headline *, char []));
-int	 pcmdlist __P((void));
-int	 pdot __P((void));
-void	 prepare_child __P((sigset_t *, int, int));
-int	 preserve __P((int *));
-void	 prettyprint __P((struct name *));
-void	 printgroup __P((char []));
-void	 printhead __P((int));
-int	 puthead __P((struct header *, FILE *, int));
-int	 putline __P((FILE *, char *, int));
-int	 pversion __P((int));
-void	 quit __P((void));
-int	 quitcmd __P((void));
-int	 readline __P((FILE *, char *, int));
-void	 register_file __P((FILE *, int, int));
-void	 regret __P((int));
-void	 relsesigs __P((void));
-int	 respond __P((int *));
-int	 retfield __P((char *[]));
-int	 rexit __P((int));
-int	 rm __P((char *));
-int	 run_command __P((char *, sigset_t *, int, int, char *, char *,
-	    char *));
-int	 save __P((char []));
-int	 save1 __P((char [], int, const char *, struct ignoretab *));
-void	 savedeadletter __P((FILE *));
-int	 saveigfield __P((char *[]));
-int	 savemail __P((char [], FILE *));
-int	 saveretfield __P((char *[]));
-int	 scan __P((char **));
-void	 scaninit __P((void));
-int	 schdir __P((char **));
-int	 screensize __P((void));
-int	 scroll __P((char []));
-int	 sendmessage __P((struct message *, FILE *, struct ignoretab *,
-	    char *));
-int	 sendmail __P((char *));
-int	 set __P((char **));
-int	 setfile __P((char *));
-void	 setmsize __P((int));
-void	 setptr __P((FILE *, off_t));
-void	 setscreensize __P((void));
-int	 shell __P((char *));
-void	 sigchild __P((int));
-void	 sort __P((char **));
-int	 source __P((char **));
-void	 spreserve __P((void));
-void	 sreset __P((void));
-int	 start_command __P((char *, sigset_t *, int, int, char *, char *,
-	    char *));
-void	 statusput __P((struct message *, FILE *, char *));
-void	 stop __P((int));
-int	 stouch __P((int []));
-int	 swrite __P((char []));
-void	 tinit __P((void));
-int	 top __P((int *));
-void	 touch __P((struct message *));
-void	 ttyint __P((int));
-void	 ttystop __P((int));
-int	 type __P((int *));
-int	 type1 __P((int *, int, int));
-int	 undelete_messages __P((int *));
-void	 unmark __P((int));
-char	**unpack __P((struct name *));
-int	 unread __P((int []));
-void	 unregister_file __P((FILE *));
-int	 unset __P((char **));
-int	 unstack __P((void));
-void	 vfree __P((char *));
-int	 visual __P((int *));
-int	 wait_child __P((int));
-int	 wait_command __P((int));
-int	 writeback __P((FILE *));
+	 lookup(const char *);
+int	 mail(struct name *,
+	    struct name *, struct name *, struct name *, char *, char *);
+void	 mail1(struct header *, int);
+void	 makemessage(FILE *, int);
+void	 mark(int);
+int	 markall(char [], int);
+int	 matchsender(char *, int);
+int	 matchsubj(char *, int);
+int	 mboxit(int []);
+int	 member(char *, struct ignoretab *);
+void	 mesedit(FILE *, int);
+void	 mespipe(FILE *, char []);
+int	 messize(int *);
+int	 metamess(int, int);
+int	 more(int *);
+int	 newfileinfo(int);
+int	 next(int *);
+int	 null(int);
+void	 parse(char [], struct headline *, char []);
+int	 pcmdlist(void);
+int	 pdot(void);
+void	 prepare_child(sigset_t *, int, int);
+int	 preserve(int *);
+void	 prettyprint(struct name *);
+void	 printgroup(char []);
+void	 printhead(int);
+int	 puthead(struct header *, FILE *, int);
+int	 putline(FILE *, char *, int);
+int	 pversion(int);
+void	 quit(void);
+int	 quitcmd(void);
+int	 readline(FILE *, char *, int);
+void	 register_file(FILE *, int, int);
+void	 regret(int);
+void	 relsesigs(void);
+int	 respond(int *);
+int	 retfield(char *[]);
+int	 rexit(int);
+int	 rm(char *);
+int	 run_command(char *, sigset_t *, int, int, char *, char *, char *);
+int	 save(char []);
+int	 save1(char [], int, const char *, struct ignoretab *);
+void	 savedeadletter(FILE *);
+int	 saveigfield(char *[]);
+int	 savemail(char [], FILE *);
+int	 saveretfield(char *[]);
+int	 scan(char **);
+void	 scaninit(void);
+int	 schdir(char **);
+int	 screensize(void);
+int	 scroll(char []);
+int	 sendmessage(struct message *, FILE *, struct ignoretab *, char *);
+int	 sendmail(char *);
+int	 set(char **);
+int	 setfile(char *);
+void	 setmsize(int);
+void	 setptr(FILE *, off_t);
+void	 setscreensize(void);
+int	 shell(char *);
+void	 sigchild(int);
+void	 sort(char **);
+int	 source(char **);
+void	 spreserve(void);
+void	 sreset(void);
+int	 start_command(char *, sigset_t *, int, int, char *, char *, char *);
+void	 statusput(struct message *, FILE *, char *);
+void	 stop(int);
+int	 stouch(int []);
+int	 swrite(char []);
+void	 tinit(void);
+int	 top(int *);
+void	 touch(struct message *);
+void	 ttyint(int);
+void	 ttystop(int);
+int	 type(int *);
+int	 type1(int *, int, int);
+int	 undelete_messages(int *);
+void	 unmark(int);
+char	**unpack(struct name *);
+int	 unread(int []);
+void	 unregister_file(FILE *);
+int	 unset(char **);
+int	 unstack(void);
+void	 vfree(char *);
+int	 visual(int *);
+int	 wait_child(int);
+int	 wait_command(int);
+int	 writeback(FILE *);
 
 extern char *__progname;
 extern char *tmpdir;
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index bbb2c11..73678ee 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -63,9 +63,9 @@ struct child {
 	struct	child *link;
 };
 static struct child *child;
-static struct child *findchild __P((int));
-static void delchild __P((struct child *));
-static int file_pid __P((FILE *));
+static struct child *findchild(int);
+static void delchild(struct child *);
+static int file_pid(FILE *);
 
 FILE *
 Fopen(path, mode)
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index a842577..7aba6c9 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -115,13 +115,13 @@ typedef struct Arch {
     size_t	  fnamesize;  /* Size of the string table */
 } Arch;
 
-static int ArchFindArchive __P((void *, void *));
-static void ArchFree __P((void *));
-static struct ar_hdr *ArchStatMember __P((char *, char *, Boolean));
-static FILE *ArchFindMember __P((char *, char *, struct ar_hdr *, char *));
+static int ArchFindArchive(void *, void *);
+static void ArchFree(void *);
+static struct ar_hdr *ArchStatMember(char *, char *, Boolean);
+static FILE *ArchFindMember(char *, char *, struct ar_hdr *, char *);
 #if defined(__svr4__) || defined(__SVR4) || defined(__ELF__)
 #define SVR4ARCHIVES
-static int ArchSVR4Entry __P((Arch *, char *, size_t, FILE *));
+static int ArchSVR4Entry(Arch *, char *, size_t, FILE *);
 #endif
 
 /*-
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 207262b..d6367be 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -66,17 +66,17 @@ typedef struct Buffer {
 
 #define BUF_ERROR 256
 
-void Buf_OvAddByte __P((Buffer, int));
-void Buf_AddBytes __P((Buffer, int, const Byte *));
-void Buf_UngetByte __P((Buffer, int));
-void Buf_UngetBytes __P((Buffer, int, Byte *));
-int Buf_GetByte __P((Buffer));
-int Buf_GetBytes __P((Buffer, int, Byte *));
-Byte *Buf_GetAll __P((Buffer, int *));
-void Buf_Discard __P((Buffer, int));
-int Buf_Size __P((Buffer));
-Buffer Buf_Init __P((int));
-void Buf_Destroy __P((Buffer, Boolean));
-void Buf_ReplaceLastByte __P((Buffer, int));
+void Buf_OvAddByte(Buffer, int);
+void Buf_AddBytes(Buffer, int, const Byte *);
+void Buf_UngetByte(Buffer, int);
+void Buf_UngetBytes(Buffer, int, Byte *);
+int Buf_GetByte(Buffer);
+int Buf_GetBytes(Buffer, int, Byte *);
+Byte *Buf_GetAll(Buffer, int *);
+void Buf_Discard(Buffer, int);
+int Buf_Size(Buffer);
+Buffer Buf_Init(int);
+void Buf_Destroy(Buffer, Boolean);
+void Buf_ReplaceLastByte(Buffer, int);
 
 #endif /* _BUF_H */
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index b4d2823..0a60bac 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -80,9 +80,9 @@ static char 	    meta[256];
 
 static GNode	    *curTarg = NULL;
 static GNode	    *ENDNode;
-static void CompatInterrupt __P((int));
-static int CompatRunCommand __P((void *, void *));
-static int CompatMake __P((void *, void *));
+static void CompatInterrupt(int);
+static int CompatRunCommand(void *, void *);
+static int CompatMake(void *, void *);
 
 static char *sh_builtin[] = { 
 	"alias", "cd", "eval", "exec", "exit", "read", "set", "ulimit", 
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 8e94700..2def8dc 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -97,24 +97,24 @@ typedef enum {
  * Structures to handle elegantly the different forms of #if's. The
  * last two fields are stored in condInvert and condDefProc, respectively.
  */
-static void CondPushBack __P((Token));
-static int CondGetArg __P((char **, char **, char *, Boolean));
-static Boolean CondDoDefined __P((int, char *));
-static int CondStrMatch __P((void *, void *));
-static Boolean CondDoMake __P((int, char *));
-static Boolean CondDoExists __P((int, char *));
-static Boolean CondDoTarget __P((int, char *));
-static char * CondCvtArg __P((char *, double *));
-static Token CondToken __P((Boolean));
-static Token CondT __P((Boolean));
-static Token CondF __P((Boolean));
-static Token CondE __P((Boolean));
+static void CondPushBack(Token);
+static int CondGetArg(char **, char **, char *, Boolean);
+static Boolean CondDoDefined(int, char *);
+static int CondStrMatch(void *, void *);
+static Boolean CondDoMake(int, char *);
+static Boolean CondDoExists(int, char *);
+static Boolean CondDoTarget(int, char *);
+static char * CondCvtArg(char *, double *);
+static Token CondToken(Boolean);
+static Token CondT(Boolean);
+static Token CondF(Boolean);
+static Token CondE(Boolean);
 
 static struct If {
     char	*form;	      /* Form of if */
     int		formlen;      /* Length of form */
     Boolean	doNot;	      /* TRUE if default function should be negated */
-    Boolean	(*defProc) __P((int, char *)); /* Default function to apply */
+    Boolean	(*defProc)(int, char *); /* Default function to apply */
 } ifs[] = {
     { "ifdef",	  5,	  FALSE,  CondDoDefined },
     { "ifndef",	  6,	  TRUE,	  CondDoDefined },
@@ -126,7 +126,7 @@ static struct If {
 
 static Boolean	  condInvert;	    	/* Invert the default function */
 static Boolean	  (*condDefProc)	/* Default function to apply */
-		    __P((int, char *));
+(int, char *);
 static char 	  *condExpr;	    	/* The expression to parse */
 static Token	  condPushBack=None;	/* Single push-back token used in
 					 * parsing */
@@ -764,7 +764,7 @@ error:
 		break;
 	    }
 	    default: {
-		Boolean (*evalProc) __P((int, char *));
+		Boolean (*evalProc)(int, char *);
 		Boolean invert = FALSE;
 		char	*arg;
 		int	arglen;
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 76b2478..f20df20 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -190,12 +190,12 @@ static Hash_Table mtimes;   /* Results of doing a last-resort stat in
 			     * should be ok, but... */
 
 
-static int DirFindName __P((void *, void *));
-static int DirMatchFiles __P((char *, Path *, Lst));
-static void DirExpandCurly __P((char *, char *, Lst, Lst));
-static void DirExpandInt __P((char *, Lst, Lst));
-static int DirPrintWord __P((void *, void *));
-static int DirPrintDir __P((void *, void *));
+static int DirFindName(void *, void *);
+static int DirMatchFiles(char *, Path *, Lst);
+static void DirExpandCurly(char *, char *, Lst, Lst);
+static void DirExpandInt(char *, Lst, Lst);
+static int DirPrintWord(void *, void *);
+static int DirPrintDir(void *, void *);
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index c1f8d93..0f84a7b 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -53,19 +53,19 @@ typedef struct Path {
     Hash_Table    files;    	/* Hash table of files in directory */
 } Path;
 
-void Dir_Init __P((void));
-void Dir_End __P((void));
-Boolean Dir_HasWildcards __P((char *));
-void Dir_Expand __P((char *, Lst, Lst));
-char *Dir_FindFile __P((char *, Lst));
-int Dir_MTime __P((GNode *));
-void Dir_AddDir __P((Lst, char *));
-char *Dir_MakeFlags __P((char *, Lst));
-void Dir_ClearPath __P((Lst));
-void Dir_Concat __P((Lst, Lst));
-void Dir_PrintDirectories __P((void));
-void Dir_PrintPath __P((Lst));
-void Dir_Destroy __P((void *));
-void * Dir_CopyDir __P((void *));
+void Dir_Init(void);
+void Dir_End(void);
+Boolean Dir_HasWildcards(char *);
+void Dir_Expand(char *, Lst, Lst);
+char *Dir_FindFile(char *, Lst);
+int Dir_MTime(GNode *);
+void Dir_AddDir(Lst, char *);
+char *Dir_MakeFlags(char *, Lst);
+void Dir_ClearPath(Lst);
+void Dir_Concat(Lst, Lst);
+void Dir_PrintDirectories(void);
+void Dir_PrintPath(Lst);
+void Dir_Destroy(void *);
+void * Dir_CopyDir(void *);
 
 #endif /* _DIR */
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 714ccfb..22e0f73 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -82,7 +82,7 @@ typedef struct _For {
     Lst  	  lst;			/* List of variables	*/
 } For;
 
-static int ForExec	__P((void *, void *));
+static int ForExec(void *, void *);
 
 
 
@@ -297,6 +297,6 @@ For_Run()
     Lst_ForEach(arg.lst, ForExec, (void *) &arg);
 
     free(arg.var);
-    Lst_Destroy(arg.lst, (void (*) __P((void *))) free);
+    Lst_Destroy(arg.lst, (void (*)(void *)) free);
     Buf_Destroy(arg.buf, TRUE);
 }
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index c063f45..1e03dd3 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -60,7 +60,7 @@ __RCSID("$FreeBSD$");
  * defined:
  */
 
-static void RebuildTable __P((Hash_Table *));
+static void RebuildTable(Hash_Table *);
 
 /*
  * The following defines the ratio of # entries to # buckets
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 19012fa..6809901 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -106,12 +106,12 @@ typedef struct Hash_Search {
 
 #define	Hash_Size(n)	(((n) + sizeof (int) - 1) / sizeof (int))
 
-void Hash_InitTable __P((Hash_Table *, int));
-void Hash_DeleteTable __P((Hash_Table *));
-Hash_Entry *Hash_FindEntry __P((Hash_Table *, char *));
-Hash_Entry *Hash_CreateEntry __P((Hash_Table *, char *, Boolean *));
-void Hash_DeleteEntry __P((Hash_Table *, Hash_Entry *));
-Hash_Entry *Hash_EnumFirst __P((Hash_Table *, Hash_Search *));
-Hash_Entry *Hash_EnumNext __P((Hash_Search *));
+void Hash_InitTable(Hash_Table *, int);
+void Hash_DeleteTable(Hash_Table *);
+Hash_Entry *Hash_FindEntry(Hash_Table *, char *);
+Hash_Entry *Hash_CreateEntry(Hash_Table *, char *, Boolean *);
+void Hash_DeleteEntry(Hash_Table *, Hash_Entry *);
+Hash_Entry *Hash_EnumFirst(Hash_Table *, Hash_Search *);
+Hash_Entry *Hash_EnumNext(Hash_Search *);
 
 #endif /* _HASH */
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 72d3f3c..b12b39a 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -298,29 +298,29 @@ STATIC Lst	stoppedJobs;	/* Lst of Job structures describing
 #define W_SETEXITSTATUS(st, val) W_SETMASKED(st, val, WEXITSTATUS)
 
 
-static int JobCondPassSig __P((void *, void *));
-static void JobPassSig __P((int));
-static int JobCmpPid __P((void *, void *));
-static int JobPrintCommand __P((void *, void *));
-static int JobSaveCommand __P((void *, void *));
-static void JobClose __P((Job *));
+static int JobCondPassSig(void *, void *);
+static void JobPassSig(int);
+static int JobCmpPid(void *, void *);
+static int JobPrintCommand(void *, void *);
+static int JobSaveCommand(void *, void *);
+static void JobClose(Job *);
 #ifdef REMOTE
-static int JobCmpRmtID __P((Job *, int));
+static int JobCmpRmtID(Job *, int);
 # ifdef RMT_WILL_WATCH
-static void JobLocalInput __P((int, Job *));
+static void JobLocalInput(int, Job *);
 # endif
 #else
-static void JobFinish __P((Job *, int *));
-static void JobExec __P((Job *, char **));
+static void JobFinish(Job *, int *);
+static void JobExec(Job *, char **);
 #endif
-static void JobMakeArgv __P((Job *, char **));
-static void JobRestart __P((Job *));
-static int JobStart __P((GNode *, int, Job *));
-static char *JobOutput __P((Job *, char *, char *, int));
-static void JobDoOutput __P((Job *, Boolean));
-static Shell *JobMatchShell __P((char *));
-static void JobInterrupt __P((int, int));
-static void JobRestartJobs __P((void));
+static void JobMakeArgv(Job *, char **);
+static void JobRestart(Job *);
+static int JobStart(GNode *, int, Job *);
+static char *JobOutput(Job *, char *, char *, int);
+static void JobDoOutput(Job *, Boolean);
+static Shell *JobMatchShell(char *);
+static void JobInterrupt(int, int);
+static void JobRestartJobs(void);
 
 /*-
  *-----------------------------------------------------------------------
@@ -1093,7 +1093,7 @@ Boolean
 Job_CheckCommands(gn, abortProc)
     GNode          *gn;	    	    /* The target whose commands need
 				     * verifying */
-    void    	 (*abortProc) __P((char *, ...));
+    void    	 (*abortProc)(char *, ...);
 			/* Function to abort with message */
 {
     if (OP_NOP(gn->type) && Lst_IsEmpty(gn->commands) &&
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index e52b9cc..7626f39 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -219,18 +219,18 @@ extern Lst  	stoppedJobs;	/* List of jobs that are stopped or didn't
 extern Boolean	jobFull;    	/* Non-zero if no more jobs should/will start*/
 
 
-void Job_Touch __P((GNode *, Boolean));
-Boolean Job_CheckCommands __P((GNode *, void (*abortProc )(char *, ...)));
-void Job_CatchChildren __P((Boolean));
-void Job_CatchOutput __P((void));
-void Job_Make __P((GNode *));
-void Job_Init __P((int, int));
-Boolean Job_Full __P((void));
-Boolean Job_Empty __P((void));
-ReturnStatus Job_ParseShell __P((char *));
-int Job_End __P((void));
-void Job_Wait __P((void));
-void Job_AbortAll __P((void));
-void JobFlagForMigration __P((int));
+void Job_Touch(GNode *, Boolean);
+Boolean Job_CheckCommands(GNode *, void (*abortProc )(char *, ...));
+void Job_CatchChildren(Boolean);
+void Job_CatchOutput(void);
+void Job_Make(GNode *);
+void Job_Init(int, int);
+Boolean Job_Full(void);
+Boolean Job_Empty(void);
+ReturnStatus Job_ParseShell(char *);
+int Job_End(void);
+void Job_Wait(void);
+void Job_AbortAll(void);
+void JobFlagForMigration(int);
 
 #endif /* _JOB_H_ */
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 86691d7..7bb5f74 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -64,8 +64,8 @@ typedef	struct	LstNode	*LstNode;
  *	not to be freed.
  * NOCOPY performs similarly when given as the copyProc to Lst_Duplicate.
  */
-#define NOFREE		((void (*) __P((void *))) 0)
-#define NOCOPY		((void * (*) __P((void *))) 0)
+#define NOFREE		((void (*)(void *)) 0)
+#define NOCOPY		((void * (*)(void *)) 0)
 
 #define LST_CONCNEW	0   /* create new LstNode's when using Lst_Concat */
 #define LST_CONCLINK	1   /* relink LstNode's when using Lst_Concat */
@@ -74,89 +74,84 @@ typedef	struct	LstNode	*LstNode;
  * Creation/destruction functions
  */
 /* Create a new list */
-Lst		Lst_Init __P((Boolean));
+Lst		Lst_Init(Boolean);
 /* Duplicate an existing list */
-Lst		Lst_Duplicate __P((Lst, void * (*)(void *)));
+Lst		Lst_Duplicate(Lst, void * (*)(void *));
 /* Destroy an old one */
-void		Lst_Destroy __P((Lst, void (*)(void *)));
+void		Lst_Destroy(Lst, void (*)(void *));
 /* True if list is empty */
-Boolean		Lst_IsEmpty __P((Lst));
+Boolean		Lst_IsEmpty(Lst);
 
 /*
  * Functions to modify a list
  */
 /* Insert an element before another */
-ReturnStatus	Lst_Insert __P((Lst, LstNode, void *));
+ReturnStatus	Lst_Insert(Lst, LstNode, void *);
 /* Insert an element after another */
-ReturnStatus	Lst_Append __P((Lst, LstNode, void *));
+ReturnStatus	Lst_Append(Lst, LstNode, void *);
 /* Place an element at the front of a lst. */
-ReturnStatus	Lst_AtFront __P((Lst, void *));
+ReturnStatus	Lst_AtFront(Lst, void *);
 /* Place an element at the end of a lst. */
-ReturnStatus	Lst_AtEnd __P((Lst, void *));
+ReturnStatus	Lst_AtEnd(Lst, void *);
 /* Remove an element */
-ReturnStatus	Lst_Remove __P((Lst, LstNode));
+ReturnStatus	Lst_Remove(Lst, LstNode);
 /* Replace a node with a new value */
-ReturnStatus	Lst_Replace __P((LstNode, void *));
+ReturnStatus	Lst_Replace(LstNode, void *);
 /* Concatenate two lists */
-ReturnStatus	Lst_Concat __P((Lst, Lst, int));
+ReturnStatus	Lst_Concat(Lst, Lst, int);
 
 /*
  * Node-specific functions
  */
 /* Return first element in list */
-LstNode		Lst_First __P((Lst));
+LstNode		Lst_First(Lst);
 /* Return last element in list */
-LstNode		Lst_Last __P((Lst));
+LstNode		Lst_Last(Lst);
 /* Return successor to given element */
-LstNode		Lst_Succ __P((LstNode));
+LstNode		Lst_Succ(LstNode);
 /* Get datum from LstNode */
-void *	Lst_Datum __P((LstNode));
+void *	Lst_Datum(LstNode);
 
 /*
  * Functions for entire lists
  */
 /* Find an element in a list */
-LstNode		Lst_Find __P((Lst, void *,
-			      int (*)(void *, void *)));
+LstNode		Lst_Find(Lst, void *, int (*)(void *, void *));
 /* Find an element starting from somewhere */
-LstNode		Lst_FindFrom __P((Lst, LstNode, void *,
-				  int (*cProc)(void *, void *)));
+LstNode		Lst_FindFrom(Lst, LstNode, void *, int (*cProc)(void *, void *));
 /*
  * See if the given datum is on the list. Returns the LstNode containing
  * the datum
  */
-LstNode		Lst_Member __P((Lst, void *));
+LstNode		Lst_Member(Lst, void *);
 /* Apply a function to all elements of a lst */
-void		Lst_ForEach __P((Lst, int (*)(void *, void *),
-				 void *));
+void		Lst_ForEach(Lst, int (*)(void *, void *), void *);
 /*
  * Apply a function to all elements of a lst starting from a certain point.
  * If the list is circular, the application will wrap around to the
  * beginning of the list again.
  */
-void		Lst_ForEachFrom __P((Lst, LstNode,
-				     int (*)(void *, void *),
-				     void *));
+void		Lst_ForEachFrom(Lst, LstNode, int (*)(void *, void *), void *);
 /*
  * these functions are for dealing with a list as a table, of sorts.
  * An idea of the "current element" is kept and used by all the functions
  * between Lst_Open() and Lst_Close().
  */
 /* Open the list */
-ReturnStatus	Lst_Open __P((Lst));
+ReturnStatus	Lst_Open(Lst);
 /* Next element please */
-LstNode		Lst_Next __P((Lst));
+LstNode		Lst_Next(Lst);
 /* Done yet? */
-Boolean		Lst_IsAtEnd __P((Lst));
+Boolean		Lst_IsAtEnd(Lst);
 /* Finish table access */
-void		Lst_Close __P((Lst));
+void		Lst_Close(Lst);
 
 /*
  * for using the list as a queue
  */
 /* Place an element at tail of queue */
-ReturnStatus	Lst_EnQueue __P((Lst, void *));
+ReturnStatus	Lst_EnQueue(Lst, void *);
 /* Remove an element from head of queue */
-void *	Lst_DeQueue __P((Lst));
+void *	Lst_DeQueue(Lst);
 
 #endif /* _LST_H_ */
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index a0316b8..f640ec5 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -66,7 +66,7 @@ __RCSID("$FreeBSD$");
 void
 Lst_Destroy (l, freeProc)
     Lst	    	  	l;
-    register void	(*freeProc) __P((void *));
+    register void	(*freeProc)(void *);
 {
     register ListNode	ln;
     register ListNode	tln = NULL;
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index cf69388..5742dad 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -66,7 +66,7 @@ Lst
 Lst_Duplicate (l, copyProc)
     Lst     	  l;	    	 /* the list to duplicate */
     /* A function to duplicate each void * */
-    void *	  (*copyProc) __P((void *));
+    void *	  (*copyProc)(void *);
 {
     register Lst 	nl;
     register ListNode  	ln;
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index fe85e73..abdb581 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -66,7 +66,7 @@ LstNode
 Lst_Find (l, d, cProc)
     Lst		l;
     void *	d;
-    int		(*cProc) __P((void *, void *));
+    int		(*cProc)(void *, void *);
 {
     return (Lst_FindFrom (l, Lst_First(l), d, cProc));
 }
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 0da8020..87a56da 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -68,7 +68,7 @@ Lst_FindFrom (l, ln, d, cProc)
     Lst		      	l;
     register LstNode    ln;
     register void * d;
-    register int	(*cProc) __P((void *, void *));
+    register int	(*cProc)(void *, void *);
 {
     register ListNode	tln;
     Boolean		found = FALSE;
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index e897448..0971b75 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -67,7 +67,7 @@ __RCSID("$FreeBSD$");
 void
 Lst_ForEach (l, proc, d)
     Lst	    	  	l;
-    register int	(*proc) __P((void *, void *));
+    register int	(*proc)(void *, void *);
     register void *	d;
 {
     Lst_ForEachFrom(l, Lst_First(l), proc, d);
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 6655ab8..9fa5c2e 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -69,7 +69,7 @@ void
 Lst_ForEachFrom (l, ln, proc, d)
     Lst	    	    	l;
     LstNode    	  	ln;
-    register int	(*proc) __P((void *, void *));
+    register int	(*proc)(void *, void *);
     register void *	d;
 {
     register ListNode	tln = (ListNode)ln;
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 6c2381d..7767937 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -136,10 +136,10 @@ Boolean			checkEnvFirst;	/* -e flag */
 Lst			envFirstVars;	/* (-E) vars to override from env */
 static Boolean		jobsRunning;	/* TRUE if the jobs might be running */
 
-static void		MainParseArgs __P((int, char **));
-char *			chdir_verify_path __P((char *, char *));
-static int		ReadMakefile __P((void *, void *));
-static void		usage __P((void));
+static void		MainParseArgs(int, char **);
+char *			chdir_verify_path(char *, char *);
+static int		ReadMakefile(void *, void *);
+static void		usage(void);
 
 static char *curdir;			/* startup directory */
 static char *objdir;			/* where we chdir'ed to */
@@ -874,7 +874,7 @@ main(argc, argv)
 	Lst_Destroy(targs, NOFREE);
 	Lst_Destroy(variables, NOFREE);
 	Lst_Destroy(makefiles, NOFREE);
-	Lst_Destroy(create, (void (*) __P((void *))) free);
+	Lst_Destroy(create, (void (*)(void *)) free);
 
 	/* print the graph now it's been processed if the user requested it */
 	if (DEBUG(GRAPH2))
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 8153af1..99685b6 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -89,12 +89,12 @@ static int  	numNodes;   	/* Number of nodes to be processed. If this
 				 * is non-zero when Job_Empty() returns
 				 * TRUE, there's a cycle in the graph */
 
-static int MakeAddChild __P((void *, void *));
-static int MakeAddAllSrc __P((void *, void *));
-static int MakeTimeStamp __P((void *, void *));
-static int MakeHandleUse __P((void *, void *));
-static Boolean MakeStartJobs __P((void));
-static int MakePrintStatus __P((void *, void *));
+static int MakeAddChild(void *, void *);
+static int MakeAddAllSrc(void *, void *);
+static int MakeTimeStamp(void *, void *);
+static int MakeHandleUse(void *, void *);
+static Boolean MakeStartJobs(void);
+static int MakePrintStatus(void *, void *);
 /*-
  *-----------------------------------------------------------------------
  * Make_TimeStamp --
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 81aabcb..4f4e571 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -52,30 +52,8 @@
 #include <string.h>
 #include <ctype.h>
 
-#if !defined(MAKE_BOOTSTRAP) && defined(BSD4_4)
-# include <sys/cdefs.h>
-#else
-# ifndef __P
-#  if defined(__STDC__) || defined(__cplusplus)
-#   define	__P(protos)	protos		/* full-blown ANSI C */
-#  else
-#   define	__P(protos)	()		/* traditional C preprocessor */
-#  endif
-# endif
-# ifndef __STDC__
-#  ifndef const
-#   define const
-#  endif
-#  ifndef volatile
-#   define volatile
-#  endif
-# endif
-#endif
-
-#ifdef __STDC__
 #include <stdlib.h>
 #include <unistd.h>
-#endif
 #include "sprite.h"
 #include "lst.h"
 #include "config.h"
@@ -357,12 +335,7 @@ extern int debug;
 #define DEBUG_FOR	0x0400
 #define DEBUG_LOUD	0x0800
 
-#ifdef __STDC__
 #define CONCAT(a,b)	a##b
-#else
-#define I(a)	  	a
-#define CONCAT(a,b)	I(a)b
-#endif /* __STDC__ */
 
 #define	DEBUG(module)	(debug & CONCAT(DEBUG_,module))
 #define ISDOT(c) ((c)[0] == '.' && (((c)[1] == '\0') || ((c)[1] == '/')))
@@ -374,11 +347,11 @@ extern int debug;
  */
 #include "nonints.h"
 
-int Make_TimeStamp __P((GNode *, GNode *));
-Boolean Make_OODate __P((GNode *));
-int Make_HandleUse __P((GNode *, GNode *));
-void Make_Update __P((GNode *));
-void Make_DoAllVar __P((GNode *));
-Boolean Make_Run __P((Lst));
+int Make_TimeStamp(GNode *, GNode *);
+Boolean Make_OODate(GNode *);
+int Make_HandleUse(GNode *, GNode *);
+void Make_Update(GNode *);
+void Make_DoAllVar(GNode *);
+Boolean Make_Run(Lst);
 
 #endif /* _MAKE_H_ */
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index d3c9a7f..81c0f4b 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -40,109 +40,109 @@
  */
 
 /* arch.c */
-ReturnStatus Arch_ParseArchive __P((char **, Lst, GNode *));
-void Arch_Touch __P((GNode *));
-void Arch_TouchLib __P((GNode *));
-int Arch_MTime __P((GNode *));
-int Arch_MemMTime __P((GNode *));
-void Arch_FindLib __P((GNode *, Lst));
-Boolean Arch_LibOODate __P((GNode *));
-void Arch_Init __P((void));
-void Arch_End __P((void));
+ReturnStatus Arch_ParseArchive(char **, Lst, GNode *);
+void Arch_Touch(GNode *);
+void Arch_TouchLib(GNode *);
+int Arch_MTime(GNode *);
+int Arch_MemMTime(GNode *);
+void Arch_FindLib(GNode *, Lst);
+Boolean Arch_LibOODate(GNode *);
+void Arch_Init(void);
+void Arch_End(void);
 
 /* compat.c */
-void Compat_Run __P((Lst));
+void Compat_Run(Lst);
 
 /* cond.c */
-int Cond_Eval __P((char *));
-void Cond_End __P((void));
+int Cond_Eval(char *);
+void Cond_End(void);
 
 /* for.c */
-int For_Eval __P((char *));
-void For_Run  __P((void));
+int For_Eval(char *);
+void For_Run(void);
 
 /* main.c */
-void Main_ParseArgLine __P((char *));
-int main __P((int, char **));
-char *Cmd_Exec __P((char *, char **));
-void Error __P((char *, ...));
-void Fatal __P((char *, ...));
-void Punt __P((char *, ...));
-void DieHorribly __P((void));
-int PrintAddr __P((void *, void *));
-void Finish __P((int));
-char *estrdup __P((const char *));
-void *emalloc __P((size_t));
+void Main_ParseArgLine(char *);
+int main(int, char **);
+char *Cmd_Exec(char *, char **);
+void Error(char *, ...);
+void Fatal(char *, ...);
+void Punt(char *, ...);
+void DieHorribly(void);
+int PrintAddr(void *, void *);
+void Finish(int);
+char *estrdup(const char *);
+void *emalloc(size_t);
 /* efree(x) works when x==NULL. STDC behavior, may need some different
  * definition for cross-builds on deficient systems */
 #define efree	free
-void *erealloc __P((void *, size_t));
-void enomem __P((void));
-int eunlink __P((const char *));
+void *erealloc(void *, size_t);
+void enomem(void);
+int eunlink(const char *);
 
 /* parse.c */
-void Parse_Error __P((int, char *, ...));
-Boolean Parse_AnyExport __P((void));
-Boolean Parse_IsVar __P((char *));
-void Parse_DoVar __P((char *, GNode *));
-void Parse_AddIncludeDir __P((char *));
-void Parse_File __P((char *, FILE *));
-void Parse_Init __P((void));
-void Parse_End __P((void));
-void Parse_FromString __P((char *));
-Lst Parse_MainName __P((void));
+void Parse_Error(int, char *, ...);
+Boolean Parse_AnyExport(void);
+Boolean Parse_IsVar(char *);
+void Parse_DoVar(char *, GNode *);
+void Parse_AddIncludeDir(char *);
+void Parse_File(char *, FILE *);
+void Parse_Init(void);
+void Parse_End(void);
+void Parse_FromString(char *);
+Lst Parse_MainName(void);
 
 /* str.c */
-void str_init __P((void));
-void str_end __P((void));
-char *str_concat __P((char *, char *, int));
-char **brk_string __P((char *, int *, Boolean));
-char *Str_FindSubstring __P((char *, char *));
-int Str_Match __P((char *, char *));
-char *Str_SYSVMatch __P((char *, char *, int *len));
-void Str_SYSVSubst __P((Buffer, char *, char *, int));
+void str_init(void);
+void str_end(void);
+char *str_concat(char *, char *, int);
+char **brk_string(char *, int *, Boolean);
+char *Str_FindSubstring(char *, char *);
+int Str_Match(char *, char *);
+char *Str_SYSVMatch(char *, char *, int *len);
+void Str_SYSVSubst(Buffer, char *, char *, int);
 
 /* suff.c */
-void Suff_ClearSuffixes __P((void));
-Boolean Suff_IsTransform __P((char *));
-GNode *Suff_AddTransform __P((char *));
-int Suff_EndTransform __P((void *, void *));
-void Suff_AddSuffix __P((char *));
-Lst Suff_GetPath __P((char *));
-void Suff_DoPaths __P((void));
-void Suff_AddInclude __P((char *));
-void Suff_AddLib __P((char *));
-void Suff_FindDeps __P((GNode *));
-void Suff_SetNull __P((char *));
-void Suff_Init __P((void));
-void Suff_End __P((void));
-void Suff_PrintAll __P((void));
+void Suff_ClearSuffixes(void);
+Boolean Suff_IsTransform(char *);
+GNode *Suff_AddTransform(char *);
+int Suff_EndTransform(void *, void *);
+void Suff_AddSuffix(char *);
+Lst Suff_GetPath(char *);
+void Suff_DoPaths(void);
+void Suff_AddInclude(char *);
+void Suff_AddLib(char *);
+void Suff_FindDeps(GNode *);
+void Suff_SetNull(char *);
+void Suff_Init(void);
+void Suff_End(void);
+void Suff_PrintAll(void);
 
 /* targ.c */
-void Targ_Init __P((void));
-void Targ_End __P((void));
-GNode *Targ_NewGN __P((char *));
-GNode *Targ_FindNode __P((char *, int));
-Lst Targ_FindList __P((Lst, int));
-Boolean Targ_Ignore __P((GNode *));
-Boolean Targ_Silent __P((GNode *));
-Boolean Targ_Precious __P((GNode *));
-void Targ_SetMain __P((GNode *));
-int Targ_PrintCmd __P((void *, void *));
-char *Targ_FmtTime __P((time_t));
-void Targ_PrintType __P((int));
-void Targ_PrintGraph __P((int));
+void Targ_Init(void);
+void Targ_End(void);
+GNode *Targ_NewGN(char *);
+GNode *Targ_FindNode(char *, int);
+Lst Targ_FindList(Lst, int);
+Boolean Targ_Ignore(GNode *);
+Boolean Targ_Silent(GNode *);
+Boolean Targ_Precious(GNode *);
+void Targ_SetMain(GNode *);
+int Targ_PrintCmd(void *, void *);
+char *Targ_FmtTime(time_t);
+void Targ_PrintType(int);
+void Targ_PrintGraph(int);
 
 /* var.c */
-void Var_Delete __P((char *, GNode *));
-void Var_Set __P((char *, char *, GNode *));
-void Var_Append __P((char *, char *, GNode *));
-Boolean Var_Exists __P((char *, GNode *));
-char *Var_Value __P((char *, GNode *, char **));
-char *Var_Parse __P((char *, GNode *, Boolean, int *, Boolean *));
-char *Var_Subst __P((char *, char *, GNode *, Boolean));
-char *Var_GetTail __P((char *));
-char *Var_GetHead __P((char *));
-void Var_Init __P((void));
-void Var_End __P((void));
-void Var_Dump __P((GNode *));
+void Var_Delete(char *, GNode *);
+void Var_Set(char *, char *, GNode *);
+void Var_Append(char *, char *, GNode *);
+Boolean Var_Exists(char *, GNode *);
+char *Var_Value(char *, GNode *, char **);
+char *Var_Parse(char *, GNode *, Boolean, int *, Boolean *);
+char *Var_Subst(char *, char *, GNode *, Boolean);
+char *Var_GetTail(char *);
+char *Var_GetHead(char *);
+void Var_Init(void);
+void Var_End(void);
+void Var_Dump(GNode *);
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 7dc9e61..7a6bc4a 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -236,28 +236,28 @@ static struct {
 { ".WAIT",	  Wait, 	0 },
 };
 
-static int ParseFindKeyword __P((char *));
-static int ParseLinkSrc __P((void *, void *));
-static int ParseDoOp __P((void *, void *));
-static int ParseAddDep __P((void *, void *));
-static void ParseDoSrc __P((int, char *, Lst));
-static int ParseFindMain __P((void *, void *));
-static int ParseAddDir __P((void *, void *));
-static int ParseClearPath __P((void *, void *));
-static void ParseDoDependency __P((char *));
-static int ParseAddCmd __P((void *, void *));
-static int ParseReadc __P((void));
-static void ParseUnreadc __P((int));
-static void ParseHasCommands __P((void *));
-static void ParseDoInclude __P((char *));
-static void ParseDoError __P((char *));
+static int ParseFindKeyword(char *);
+static int ParseLinkSrc(void *, void *);
+static int ParseDoOp(void *, void *);
+static int ParseAddDep(void *, void *);
+static void ParseDoSrc(int, char *, Lst);
+static int ParseFindMain(void *, void *);
+static int ParseAddDir(void *, void *);
+static int ParseClearPath(void *, void *);
+static void ParseDoDependency(char *);
+static int ParseAddCmd(void *, void *);
+static int ParseReadc(void);
+static void ParseUnreadc(int);
+static void ParseHasCommands(void *);
+static void ParseDoInclude(char *);
+static void ParseDoError(char *);
 #ifdef SYSVINCLUDE
-static void ParseTraditionalInclude __P((char *));
+static void ParseTraditionalInclude(char *);
 #endif
-static int ParseEOF __P((int));
-static char *ParseReadLine __P((void));
-static char *ParseSkipLine __P((int));
-static void ParseFinishLine __P((void));
+static int ParseEOF(int);
+static char *ParseReadLine(void);
+static char *ParseSkipLine(int);
+static void ParseFinishLine(void);
 
 /*-
  *----------------------------------------------------------------------
@@ -2588,7 +2588,7 @@ Parse_Init ()
 void
 Parse_End()
 {
-    Lst_Destroy(targCmds, (void (*) __P((void *))) free);
+    Lst_Destroy(targCmds, (void (*)(void *)) free);
     if (targets)
 	Lst_Destroy(targets, NOFREE);
     Lst_Destroy(sysIncPath, Dir_Destroy);
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 8ade95e..01e42c3 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -155,30 +155,30 @@ static Suff 	    *emptySuff;	/* The empty suffix required for POSIX
 				 * single-suffix transformation rules */
 
 
-static char *SuffStrIsPrefix __P((char *, char *));
-static char *SuffSuffIsSuffix __P((Suff *, char *));
-static int SuffSuffIsSuffixP __P((void *, void *));
-static int SuffSuffHasNameP __P((void *, void *));
-static int SuffSuffIsPrefix __P((void *, void *));
-static int SuffGNHasNameP __P((void *, void *));
-static void SuffFree __P((void *));
-static void SuffInsert __P((Lst, Suff *));
-static void SuffRemove __P((Lst, Suff *));
-static Boolean SuffParseTransform __P((char *, Suff **, Suff **));
-static int SuffRebuildGraph __P((void *, void *));
-static int SuffAddSrc __P((void *, void *));
-static int SuffRemoveSrc __P((Lst));
-static void SuffAddLevel __P((Lst, Src *));
-static Src *SuffFindThem __P((Lst, Lst));
-static Src *SuffFindCmds __P((Src *, Lst));
-static int SuffExpandChildren __P((void *, void *));
-static Boolean SuffApplyTransform __P((GNode *, GNode *, Suff *, Suff *));
-static void SuffFindDeps __P((GNode *, Lst));
-static void SuffFindArchiveDeps __P((GNode *, Lst));
-static void SuffFindNormalDeps __P((GNode *, Lst));
-static int SuffPrintName __P((void *, void *));
-static int SuffPrintSuff __P((void *, void *));
-static int SuffPrintTrans __P((void *, void *));
+static char *SuffStrIsPrefix(char *, char *);
+static char *SuffSuffIsSuffix(Suff *, char *);
+static int SuffSuffIsSuffixP(void *, void *);
+static int SuffSuffHasNameP(void *, void *);
+static int SuffSuffIsPrefix(void *, void *);
+static int SuffGNHasNameP(void *, void *);
+static void SuffFree(void *);
+static void SuffInsert(Lst, Suff *);
+static void SuffRemove(Lst, Suff *);
+static Boolean SuffParseTransform(char *, Suff **, Suff **);
+static int SuffRebuildGraph(void *, void *);
+static int SuffAddSrc(void *, void *);
+static int SuffRemoveSrc(Lst);
+static void SuffAddLevel(Lst, Src *);
+static Src *SuffFindThem(Lst, Lst);
+static Src *SuffFindCmds(Src *, Lst);
+static int SuffExpandChildren(void *, void *);
+static Boolean SuffApplyTransform(GNode *, GNode *, Suff *, Suff *);
+static void SuffFindDeps(GNode *, Lst);
+static void SuffFindArchiveDeps(GNode *, Lst);
+static void SuffFindNormalDeps(GNode *, Lst);
+static int SuffPrintName(void *, void *);
+static int SuffPrintSuff(void *, void *);
+static int SuffPrintTrans(void *, void *);
 
 	/*************** Lst Predicates ****************/
 /*-
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 57b6b80..30de628 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -96,10 +96,10 @@ static Hash_Table targets;	/* a hash table of same */
 
 #define HTSIZE	191		/* initial size of hash table */
 
-static int TargPrintOnlySrc __P((void *, void *));
-static int TargPrintName __P((void *, void *));
-static int TargPrintNode __P((void *, void *));
-static void TargFreeGN __P((void *));
+static int TargPrintOnlySrc(void *, void *);
+static int TargPrintName(void *, void *);
+static int TargPrintNode(void *, void *);
+static void TargFreeGN(void *);
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 0b88650..fb7f901 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -168,29 +168,28 @@ typedef struct {
     int		   flags;
 } VarREPattern;
 
-static int VarCmp __P((void *, void *));
-static Var *VarFind __P((char *, GNode *, int));
-static void VarAdd __P((char *, char *, GNode *));
-static void VarDelete __P((void *));
-static Boolean VarHead __P((char *, Boolean, Buffer, void *));
-static Boolean VarTail __P((char *, Boolean, Buffer, void *));
-static Boolean VarSuffix __P((char *, Boolean, Buffer, void *));
-static Boolean VarRoot __P((char *, Boolean, Buffer, void *));
-static Boolean VarMatch __P((char *, Boolean, Buffer, void *));
+static int VarCmp(void *, void *);
+static Var *VarFind(char *, GNode *, int);
+static void VarAdd(char *, char *, GNode *);
+static void VarDelete(void *);
+static Boolean VarHead(char *, Boolean, Buffer, void *);
+static Boolean VarTail(char *, Boolean, Buffer, void *);
+static Boolean VarSuffix(char *, Boolean, Buffer, void *);
+static Boolean VarRoot(char *, Boolean, Buffer, void *);
+static Boolean VarMatch(char *, Boolean, Buffer, void *);
 #ifdef SYSVVARSUB
-static Boolean VarSYSVMatch __P((char *, Boolean, Buffer, void *));
+static Boolean VarSYSVMatch(char *, Boolean, Buffer, void *);
 #endif
-static Boolean VarNoMatch __P((char *, Boolean, Buffer, void *));
-static void VarREError __P((int, regex_t *, const char *));
-static Boolean VarRESubstitute __P((char *, Boolean, Buffer, void *));
-static Boolean VarSubstitute __P((char *, Boolean, Buffer, void *));
-static char *VarGetPattern __P((GNode *, int, char **, int, int *, int *,
-				VarPattern *));
-static char *VarQuote __P((char *));
-static char *VarModify __P((char *, Boolean (*)(char *, Boolean, Buffer,
-						void *),
-			    void *));
-static int VarPrintVar __P((void *, void *));
+static Boolean VarNoMatch(char *, Boolean, Buffer, void *);
+static void VarREError(int, regex_t *, const char *);
+static Boolean VarRESubstitute(char *, Boolean, Buffer, void *);
+static Boolean VarSubstitute(char *, Boolean, Buffer, void *);
+static char *VarGetPattern(GNode *, int, char **, int, int *, int *, 
+			   VarPattern *);
+static char *VarQuote(char *);
+static char *VarModify(char *, Boolean (*)(char *, Boolean, Buffer, void *),
+		       void *);
+static int VarPrintVar(void *, void *);
 
 /*-
  *-----------------------------------------------------------------------
@@ -1243,7 +1242,7 @@ static char *
 VarModify (str, modProc, datum)
     char    	  *str;	    	    /* String whose words should be trimmed */
 				    /* Function to use to modify them */
-    Boolean    	  (*modProc) __P((char *, Boolean, Buffer, void *));
+    Boolean    	  (*modProc)(char *, Boolean, Buffer, void *);
     void *	  datum;    	    /* Datum to pass it */
 {
     Buffer  	  buf;	    	    /* Buffer for the new string */
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 4e5878b..d80acb6 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -59,7 +59,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 84ee453..cf66e58 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -58,7 +58,7 @@ static const char rcsid[] =
 #define	BASEMODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | \
 			S_IROTH | S_IWOTH
 
-static void usage __P((void));
+static void usage(void);
 
 static int f_mode;
 
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index b7d486f..2889cfd 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -81,14 +81,14 @@ static const char rcsid[] =
 FILE	*mesgread, *mesgwrite;
 char	name[100], *np;
 
-void copystr __P((void));
-int fgetNUL __P((char *, int, FILE *));
-unsigned hashit __P((char *, char, unsigned));
-void inithash __P((void));
-int match __P((const char *));
-int octdigit __P((char));
-void process __P((void));
-static void usage __P((void));
+void copystr(void);
+int fgetNUL(char *, int, FILE *);
+unsigned hashit(char *, char, unsigned);
+void inithash(void);
+int match(const char *);
+int octdigit(char);
+void process(void);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index d20ca3d..b58ac4b 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -46,7 +46,7 @@ static const char rcsid[] =
 	"$FreeBSD$";
 #endif /* not lint */
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(int argc, char **argv)
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 6f15272..eeda04f 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -151,16 +151,16 @@ bool	lastcmd = NO;
 jmp_buf	tstpbuf;
 
 
-void		ask __P((const char *));
-void		gfrsub __P((FILE *));
-int		linecnt __P((FILE *));
-int		main __P((int, char *[]));
-int		next __P((char *));
-char		*nxtfld __P((unsigned char *));
-void		onsusp __P((int));
-void		onintr __P((int));
-void		prmesg __P((int));
-static void	usage __P((void));
+void		ask(const char *);
+void		gfrsub(FILE *);
+int		linecnt(FILE *);
+int		main(int, char *[]);
+int		next(char *);
+char		*nxtfld(unsigned char *);
+void		onsusp(int);
+void		onintr(int);
+void		prmesg(int);
+static void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 83e02c7..fccc5a9 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -117,16 +119,16 @@ struct commands {
 	{ NULL }
 };
 
-void printreg __P((char *, u_int, char *));
-void status __P((struct mtget *));
-void usage __P((void));
+void printreg(char *, u_int, char *);
+void status(struct mtget *);
+void usage(void);
 void st_status (struct mtget *);
 int stringtodens (const char *s);
 const char *denstostring (int d);
 int denstobp(int d, int bpi);
 u_int32_t stringtocomp(const char *s);
 const char * comptostring(u_int32_t comp);
-void warn_eof __P((void));
+void warn_eof(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/newkey/extern.h b/usr.bin/newkey/extern.h
index ce2f84d..d39baa0 100644
--- a/usr.bin/newkey/extern.h
+++ b/usr.bin/newkey/extern.h
@@ -39,8 +39,8 @@
 #define	YPOP_STORE  4			/* add, or change */
 #endif
 
-void genkeys __P((char *, char *, char *));
-int setpublicmap __P((char *, char *, char *));
-int mapupdate __P((char *, char *, u_int, u_int, char *, u_int, char *));
-void xencrypt __P((char *, char *));
-void xdecrypt __P((char *, char *));
+void genkeys(char *, char *, char *);
+int setpublicmap(char *, char *, char *);
+int mapupdate(char *, char *, u_int, u_int, char *, u_int, char *);
+void xencrypt(char *, char *);
+void xdecrypt(char *, char *);
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 223dcf4..f4c8b92 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -48,8 +48,8 @@ static const char rcsid[] =
 
 #include "extern.h"
 
-static void adjust __P((char[], char *));
-static void getseed __P((char *, int, unsigned char *));
+static void adjust(char[], char *);
+static void getseed(char *, int, unsigned char *);
 
 /*
  * Generate a seed
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index 6b98709..00af889 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -84,7 +84,7 @@ static char PKFILE[] = "/etc/publickey";
 static char *err_string();
 #endif	/* YP */
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 972c0e3..af397a1 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -70,8 +70,8 @@ static char PKFILE[] = "/etc/publickey";
 #endif	/* YP */
 
 #ifdef YP
-static int _openchild __P((char *, FILE **, FILE **));
-static char *basename __P((char *path));
+static int _openchild(char *, FILE **, FILE **);
+static char *basename(char *path);
 
 /*
  * Determine if requester is allowed to update the given map,
@@ -234,7 +234,7 @@ basename(path)
 #define	ERR_DBASE	5
 #define	ERR_KEY		6
 
-static int match __P(( char * , char * ));
+static int match( char * , char * );
 
 /*
  * Determine if requester is allowed to update the given map,
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 2664df3..053a1ed 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -82,12 +82,12 @@ kvm_t *kd;
 static int deadkernel = 0;
 static int widemode = 0;
 
-void intpr __P((int, int));
-void printhdr __P((int, int));
-void sidewaysintpr __P((u_int, int, int));
-void usage __P((void));
-char *sperc1 __P((int, int));
-char *sperc2 __P((int, int));
+void intpr(int, int);
+void printhdr(int, int);
+void sidewaysintpr(u_int, int, int);
+void usage(void);
+char *sperc1(int, int);
+char *sperc2(int, int);
 
 #define DELTA(field)	(nfsstats.field - lastst.field)
 
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index ea1ec44..52be762 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 
 #define	DEFNICE	10
 
-void usage __P((void));
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index ea1f185..a6b6f93 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -91,10 +91,10 @@ static struct numbering_property numbering_properties[NP_LAST + 1] = {
 #define INT_STRLEN_MAXIMUM \
 	((sizeof (int) * CHAR_BIT - 1) * 302 / 1000 + 2)
 
-static void	filter __P((void));
-int		main __P((int, char *[]));
-static void	parse_numbering __P((const char *, int));
-static void	usage __P((void));
+static void	filter(void);
+int		main(int, char *[]);
+static void	parse_numbering(const char *, int);
+static void	usage(void);
 
 /*
  * Pointer to dynamically allocated input line buffer, and its size.
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 5bad221..06d1b56 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -79,12 +79,12 @@ int (*sfunc)() = fname;
 #define	SYMBOL_TYPE(x)		((x) & (N_TYPE | N_STAB))
 #define SYMBOL_BIND(x)		(((x) >> 4) & 0xf)
 
-static void usage __P(( void ));
-int process_file __P(( char * ));
-int show_archive __P(( char *, FILE * ));
-int show_objfile __P(( char *, FILE * ));
-void print_symbol __P(( char *, struct nlist * ));
-char typeletter __P((u_char));
+static void usage( void );
+int process_file( char * );
+int show_archive( char *, FILE * );
+int show_objfile( char *, FILE * );
+void print_symbol( char *, struct nlist * );
+char typeletter(u_char);
 
 /*
  * main()
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 8d8df86..4fd82c8 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -57,8 +57,8 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
-static void dofile __P((void));
-static void usage __P((void));
+static void dofile(void);
+static void usage(void);
 
 #define	FILENAME	"nohup.out"
 /*
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index 287646c..eae768c 100644
--- a/usr.bin/passwd/extern.h
+++ b/usr.bin/passwd/extern.h
@@ -34,5 +34,5 @@
  * $FreeBSD$
  */
 
-int	krb_passwd __P((char *, char *, char *, char *));
-int	local_passwd __P((char *));
+int	krb_passwd(char *, char *, char *, char *);
+int	local_passwd(char *);
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 0e03109..d241650 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -61,7 +61,7 @@ static const char rcsid[] =
 #include <rpcsvc/yp.h>
 int __use_yp = 0;
 int yp_errno = YP_TRUE;
-extern int yp_passwd	__P(( char * ));
+extern int yp_passwd( char * );
 #endif
 
 #ifdef KERBEROS
@@ -70,7 +70,7 @@ extern int yp_passwd	__P(( char * ));
 
 #include "extern.h"
 
-static void usage __P((void));
+static void usage(void);
 
 int use_local_passwd = 0;
 
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index cad7bef..b066a84 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -61,10 +61,10 @@ __FBSDID("$FreeBSD$");
 char *delim;
 int delimcnt;
 
-void parallel __P((char **));
-void sequential __P((char **));
-int tr __P((char *));
-static void usage __P((void));
+void parallel(char **);
+void sequential(char **);
+int tr(char *);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index 1456b55..93efa65 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -35,26 +35,27 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
+ * $FreeBSD$
  */
 
 extern int eoptind;
 extern char *eoptarg;
 
-void	 addnum __P((char *, int, int));
-int	 egetopt __P((int, char * const *, const char *));
-void	 flsh_errs __P((void));
-int	 horzcol __P((int, char **));
-int	 inln __P((FILE *, char *, int, int *, int, int *));
-int	 inskip __P((FILE *, int, int));
-void	 mfail __P((void));
-int	 mulfile __P((int, char **));
-FILE	*nxtfile __P((int, char **, char **, char *, int));
-int	 onecol __P((int, char **));
-int	 otln __P((char *, int, int *, int *, int));
-void	 pfail __P((void));
-int	 prhead __P((char *, char *, int));
-int	 prtail __P((int, int));
-int	 setup __P((int, char **));
-void	 terminate __P((int));
-void	 usage __P((void));
-int	 vertcol __P((int, char **));
+void	 addnum(char *, int, int);
+int	 egetopt(int, char * const *, const char *);
+void	 flsh_errs(void);
+int	 horzcol(int, char **);
+int	 inln(FILE *, char *, int, int *, int, int *);
+int	 inskip(FILE *, int, int);
+void	 mfail(void);
+int	 mulfile(int, char **);
+FILE	*nxtfile(int, char **, char **, char *, int);
+int	 onecol(int, char **);
+int	 otln(char *, int, int *, int *, int);
+void	 pfail(void);
+int	 prhead(char *, char *, int);
+int	 prtail(int, int);
+int	 setup(int, char **);
+void	 terminate(int);
+void	 usage(void);
+int	 vertcol(int, char **);
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index cf825c2..5d5bebf 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-void	usage __P((void));
+void	usage(void);
 
 /*
  * printenv
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 37b18f1..64fb127 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -88,15 +88,15 @@ static const char rcsid[] =
 	} \
 }
 
-static int	 asciicode __P((void));
-static void	 escape __P((char *));
-static int	 getchr __P((void));
-static double	 getdouble __P((void));
-static int	 getint __P((int *));
-static int	 getquad __P((quad_t *));
-static const char	*getstr __P((void));
-static char	*mklong __P((char *, int));
-static void	 usage __P((void));
+static int	 asciicode(void);
+static void	 escape(char *);
+static int	 getchr(void);
+static double	 getdouble(void);
+static int	 getint(int *);
+static int	 getquad(quad_t *);
+static const char	*getstr(void);
+static char	*mklong(char *, int);
+static void	 usage(void);
 
 static char **gargv;
 
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 372d591..c03fb03 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -84,8 +84,8 @@ struct quotause {
 };
 #define	FOUND	0x01
 
-static char *timeprt	__P((time_t seconds));
-static struct quotause *getprivs __P((long id, int quotatype));
+static char *timeprt(time_t seconds);
+static struct quotause *getprivs(long id, int quotatype);
 static void usage ();
 static void showuid(u_long uid);
 static void showgid(u_long gid);
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index 6768257..88bebf7 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -57,10 +57,10 @@ static const char rcsid[] =
 
 #include "archive.h"
 
-extern int tmp __P(( void ));
-extern void error __P(( char * ));
-extern void badfmt __P(( void ));
-extern void settime __P(( int ));
+extern int tmp( void );
+extern void error( char * );
+extern void badfmt( void );
+extern void settime( int );
 
 extern CHDR chdr;			/* converted header */
 extern char *archive;			/* archive name */
@@ -79,8 +79,8 @@ FILE *fp;
 long symcnt;				/* symbol count */
 long tsymlen;				/* total string length */
 
-static void rexec __P((int, int));
-static void symobj __P((void));
+static void rexec(int, int);
+static void symobj(void);
 
 int
 build(void)
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index 85a5f8c..b67def0 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -56,7 +56,7 @@ static const char rcsid[] =
 extern char *archive;			/* archive name */
 char *tname = "temporary file";		/* temporary file "name" */
 
-void error __P(( char * ));
+void error( char * );
 
 int
 tmp(void)
diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index 6177984..290339b 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -55,9 +55,9 @@ static const char rcsid[] =
 #include <unistd.h>
 #include "archive.h"
 
-extern int build __P(( void ));
-extern int touch __P(( void ));
-static void usage __P((void));
+extern int build( void );
+extern int touch( void );
+static void usage(void);
 
 CHDR chdr;
 u_int options;				/* UNUSED -- keep open_archive happy */
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index b062e08..aca8ee6 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -57,9 +57,9 @@ static const char rcsid[] =
 extern CHDR chdr;			/* converted header */
 extern char *archive;			/* archive name */
 
-extern void error __P(( char * ));
-void settime __P(( int ));
-int touch __P(( void ));
+extern void error( char * );
+void settime( int );
+int touch( void );
 
 int
 touch(void)
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index e169cad..a2822b3 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -56,8 +56,8 @@ static const char rcsid[] =
 #include <string.h>
 #include <pwd.h>
 
-int donice __P((int, int, int));
-static void usage __P((void));
+int donice(int, int, int);
+static void usage(void);
 
 /*
  * Change the priority (nice) of processes
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index 50921e7..86d7276 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-void usage __P((void));
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index 9bbf2a4..90db189 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -116,27 +116,27 @@ struct winsize {
 #endif
 struct	winsize winsize;
 
-void		catch_child __P((int));
-void		copytochild __P((int));
-void		doit __P((long)) __dead2;
-void		done __P((int)) __dead2;
-void		echo __P((char));
-u_int		getescape __P((char *));
-void		lostpeer __P((int));
-void		mode __P((int));
-void		msg __P((char *));
-void		oob __P((int));
-int		reader __P((int));
-void		sendwindow __P((void));
-void		setsignal __P((int));
-void		sigwinch __P((int));
-void		stop __P((char));
-void		usage __P((void)) __dead2;
-void		writer __P((void));
-void		writeroob __P((int));
+void		catch_child(int);
+void		copytochild(int);
+void		doit(long) __dead2;
+void		done(int) __dead2;
+void		echo(char);
+u_int		getescape(char *);
+void		lostpeer(int);
+void		mode(int);
+void		msg(char *);
+void		oob(int);
+int		reader(int);
+void		sendwindow(void);
+void		setsignal(int);
+void		sigwinch(int);
+void		stop(char);
+void		usage(void) __dead2;
+void		writer(void);
+void		writeroob(int);
 
 #ifdef OLDSUN
-int		get_window_size __P((int, struct winsize *));
+int		get_window_size(int, struct winsize *);
 #endif
 
 int
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 48869dd..0378604 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -25,6 +25,8 @@
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
+ *
+ * $FreeBSD$
  */
 
 #ident	"@(#)rpc_clntout.c	1.15	94/04/25 SMI"
@@ -43,10 +45,10 @@ static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-extern void pdeclaration __P(( char *, declaration *, int, char * ));
-void printarglist __P(( proc_list *, char *, char *, char *));
-static void write_program __P(( definition * ));
-static void printbody __P(( proc_list * ));
+extern void pdeclaration( char *, declaration *, int, char * );
+void printarglist( proc_list *, char *, char *, char *);
+static void write_program( definition * );
+static void printbody( proc_list * );
 
 static char RESULT[] = "clnt_res";
 
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index cf78304..a9d19e9 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -48,16 +48,16 @@ static const char rcsid[] =
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-static void print_header __P(( definition * ));
-static void print_trailer __P(( void ));
-static void print_stat __P(( int , declaration * ));
-static void emit_enum __P(( definition * ));
-static void emit_program __P(( definition * ));
-static void emit_union __P(( definition * ));
-static void emit_struct __P(( definition * ));
-static void emit_typedef __P(( definition * ));
-static void emit_inline __P(( int, declaration *, int ));
-static void emit_single_in_line __P(( int, declaration *, int, relation ));
+static void print_header( definition * );
+static void print_trailer( void );
+static void print_stat( int , declaration * );
+static void emit_enum( definition * );
+static void emit_program( definition * );
+static void emit_union( definition * );
+static void emit_struct( definition * );
+static void emit_typedef( definition * );
+static void emit_inline( int, declaration *, int );
+static void emit_single_in_line( int, declaration *, int, relation );
 
 /*
  * Emit the C-routine for the given definition
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 6a12663..e5d5647 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -43,19 +43,19 @@ static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-void storexdrfuncdecl __P(( char *, int ));
-static void pconstdef __P(( definition * ));
-static void pstructdef __P(( definition * ));
-static void puniondef __P(( definition * ));
-static void pprogramdef __P(( definition * ));
-static void pstructdef __P(( definition * ));
-static void penumdef __P(( definition * ));
-static void ptypedef __P(( definition * ));
-static void pdefine __P(( char *, char * ));
-static int undefined2 __P(( char *, char * ));
-static void parglist __P(( proc_list *, char * ));
-static void pprocdef __P(( proc_list *, version_list *, char *, int, int ));
-void pdeclaration __P(( char *, declaration *, int, char * ));
+void storexdrfuncdecl( char *, int );
+static void pconstdef( definition * );
+static void pstructdef( definition * );
+static void puniondef( definition * );
+static void pprogramdef( definition * );
+static void pstructdef( definition * );
+static void penumdef( definition * );
+static void ptypedef( definition * );
+static void pdefine( char *, char * );
+static int undefined2( char *, char * );
+static void parglist( proc_list *, char * );
+static void pprocdef( proc_list *, version_list *, char *, int, int );
+void pdeclaration( char *, declaration *, int, char * );
 
 static char RESULT[] = "clnt_res";
 
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 30eb21c..cc3b47b 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -56,29 +56,29 @@ static const char rcsid[] =
 #include "rpc_util.h"
 #include "rpc_scan.h"
 
-extern void write_sample_svc __P(( definition * ));
-extern int write_sample_clnt __P(( definition * ));
-extern void write_sample_clnt_main __P(( void ));
-extern void add_sample_msg __P(( void ));
-static void c_output __P(( char *, char *, int, char * ));
-static void h_output __P(( char *, char *, int, char * ));
-static void l_output __P(( char *, char *, int, char * ));
-static void t_output __P(( char *, char *, int, char * ));
-static void clnt_output __P(( char *, char *, int, char * ));
-
-void c_initialize __P(( void ));
+extern void write_sample_svc( definition * );
+extern int write_sample_clnt( definition * );
+extern void write_sample_clnt_main( void );
+extern void add_sample_msg( void );
+static void c_output( char *, char *, int, char * );
+static void h_output( char *, char *, int, char * );
+static void l_output( char *, char *, int, char * );
+static void t_output( char *, char *, int, char * );
+static void clnt_output( char *, char *, int, char * );
+
+void c_initialize( void );
 
 #if !defined(__FreeBSD__) && !defined(__NetBSD__)
 char * rindex();
 #endif
 
-static void usage __P(( void ));
-static void options_usage __P (( void ));
-static int do_registers __P(( int, char ** ));
-static int parseargs __P(( int, char **, struct commandline * ));
-static void svc_output __P(( char *, char *, int, char * ));
-static void mkfile_output __P(( struct commandline * ));
-static void s_output __P(( int, char **, char *, char *, int, char *, int, int ));
+static void usage(void);
+static void options_usage(void);
+static int do_registers(int, char **);
+static int parseargs(int, char **, struct commandline *);
+static void svc_output(char *, char *, int, char *);
+static void mkfile_output(struct commandline *);
+static void s_output(int, char **, char *, char *, int, char *, int, int);
 
 #define	EXTEND	1		/* alias for TRUE */
 #define	DONT_EXTEND	0		/* alias for FALSE */
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index a4a44c8..0190dd9 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -47,18 +47,18 @@ static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 
 #define ARGNAME "arg"
 
-extern char *make_argname __P(( char *, char * ));
-static void isdefined __P(( definition * ));
-static void def_struct __P(( definition * ));
-static void def_program __P(( definition * ));
-static void def_enum __P(( definition * ));
-static void def_const __P(( definition * ));
-static void def_union __P(( definition * ));
-static void def_typedef __P(( definition * ));
-static void get_declaration __P(( declaration *, defkind ));
-static void get_prog_declaration __P(( declaration *, defkind, int ));
-static void get_type __P(( char **, char **, defkind ));
-static void unsigned_dec __P(( char ** ));
+extern char *make_argname( char *, char * );
+static void isdefined( definition * );
+static void def_struct( definition * );
+static void def_program( definition * );
+static void def_enum( definition * );
+static void def_const( definition * );
+static void def_union( definition * );
+static void def_typedef( definition * );
+static void get_declaration( declaration *, defkind );
+static void get_prog_declaration( declaration *, defkind, int );
+static void get_type( char **, char **, defkind );
+static void unsigned_dec( char ** );
 
 #ifndef __FreeBSD__
 extern char *strdup();
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index e4f045f..d20348e 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -25,6 +25,8 @@
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
+ *
+ * $FreeBSD$
  */
 
 #pragma ident	"@(#)rpc_sample.c	1.9	94/04/25 SMI" 
@@ -42,10 +44,10 @@
 
 static char RQSTP[] = "rqstp";
 
-extern void printarglist __P(( proc_list *, char *, char *, char *));
-static void write_sample_client __P(( char *, version_list * ));
-static void write_sample_server __P(( definition * ));
-static void return_type __P(( proc_list * ));
+extern void printarglist( proc_list *, char *, char *, char *);
+static void write_sample_client( char *, version_list * );
+static void write_sample_server( definition * );
+static void return_type( proc_list * );
 
 void
 write_sample_svc(def)
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index 140c608..5d4ce16 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -56,15 +56,15 @@ static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
 static int pushed = 0;	/* is a token pushed */
 static token lasttok;	/* last token, if pushed */
 
-static void unget_token __P(( token * ));
-static void findstrconst __P(( char **, char **));
-static void findchrconst __P(( char **, char **));
-static void findconst __P(( char **, char **));
-static void findkind __P(( char **, token * ));
-static int cppline __P(( char * ));
-static int directive __P(( char * ));
-static void printdirective __P(( char * ));
-static void docppline __P(( char *, int *, char ** ));
+static void unget_token( token * );
+static void findstrconst( char **, char **);
+static void findchrconst( char **, char **);
+static void findconst( char **, char **);
+static void findkind( char **, token * );
+static int cppline( char * );
+static int directive( char * );
+static void printdirective( char * );
+static void docppline( char *, int *, char ** );
 
 /*
  * scan expecting 1 given token 
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index fd48ee7..20f6aaf 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -55,21 +55,21 @@ static char RETVAL[] = "retval";
 
 char _errbuf[256];	/* For all messages */
 
-void internal_proctype __P(( proc_list * ));
-static void write_real_program __P(( definition * ));
-static void write_program __P(( definition *, char * ));
-static void printerr __P(( char *, char * ));
-static void printif __P(( char *, char *, char *, char * ));
-static void write_inetmost __P(( char * ));
-static void print_return __P(( char * ));
-static void print_pmapunset __P(( char * ));
-static void print_err_message __P(( char * ));
-static void write_timeout_func __P(( void ));
-static void write_pm_most __P(( char *, int ));
-static void write_rpc_svc_fg __P(( char *, char * ));
-static void open_log_file __P(( char *, char * ));
-static void write_msg_out __P(( void ));
-int nullproc __P(( proc_list * ));
+void internal_proctype( proc_list * );
+static void write_real_program( definition * );
+static void write_program( definition *, char * );
+static void printerr( char *, char * );
+static void printif( char *, char *, char *, char * );
+static void write_inetmost( char * );
+static void print_return( char * );
+static void print_pmapunset( char * );
+static void print_err_message( char * );
+static void write_timeout_func( void );
+static void write_pm_most( char *, int );
+static void write_rpc_svc_fg( char *, char * );
+static void open_log_file( char *, char * );
+static void write_msg_out( void );
+int nullproc( proc_list * );
 
 
 static void
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 45282c8..9488f76 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -63,9 +63,9 @@ static char null_entry[] = "\n\t(char *(*)())0,\n\
 
 static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n";
 
-extern int nullproc __P(( proc_list * ));
-static void write_table __P(( definition * ));
-static void printit __P(( char *, char * ));
+extern int nullproc( proc_list * );
+static void write_table( definition * );
+static void printit( char *, char * );
 
 void
 write_tables()
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 75583a5..939ddaf 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -67,7 +67,7 @@ FILE *fin;			/* file pointer of current input */
 
 list *defined;			/* list of defined things */
 
-static void printwhere __P(( void ));
+static void printwhere( void );
 
 /*
  * Reinitialize the world
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index a1c2f30..d8ff445 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -94,16 +94,16 @@ int	propgutter;
 char	isep = ' ', osep = ' ';
 int	owidth = 80, gutter = 2;
 
-void	  getargs __P((int, char *[]));
-void	  getfile __P((void));
-int	  getline __P((void));
-char	 *getlist __P((short **, char *));
-char	 *getnum __P((int *, char *, int));
-char	**getptrs __P((char **));
-void	  prepfile __P((void));
-void	  prints __P((char *, int));
-void	  putfile __P((void));
-static void usage __P((void));
+void	  getargs(int, char *[]);
+void	  getfile(void);
+int	  getline(void);
+char	 *getlist(short **, char *);
+char	 *getnum(int *, char *, int);
+char	**getptrs(char **);
+void	  prepfile(void);
+void	  prints(char *, int);
+void	  putfile(void);
+static void usage(void);
 
 #define	INCR(ep) do {			\
 	if (++ep >= endelem)		\
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 6067035..a011642 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -87,10 +87,10 @@ int	rfd2;
 
 int family = PF_UNSPEC;
 
-char   *copyargs __P((char **));
-void	sendsig __P((int));
-void	talk __P((int, long, pid_t, int, int));
-void	usage __P((void));
+char   *copyargs(char **);
+void	sendsig(int);
+void	talk(int, long, pid_t, int, int);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index d573835..4144193 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -72,13 +72,13 @@ size_t nhosts;
 time_t now;
 int rflg = 1;
 
-int	 hscmp __P((const void *, const void *));
-char	*interval __P((time_t, char *));
-int	 lcmp __P((const void *, const void *));
-void	 morehosts __P((void));
-int	 tcmp __P((const void *, const void *));
-int	 ucmp __P((const void *, const void *));
-void	 usage __P((void));
+int	 hscmp(const void *, const void *);
+char	*interval(time_t, char *);
+int	 lcmp(const void *, const void *);
+void	 morehosts(void);
+int	 tcmp(const void *, const void *);
+int	 ucmp(const void *, const void *);
+void	 usage(void);
 
 int
 main(argc, argv)
@@ -93,7 +93,7 @@ main(argc, argv)
 	size_t hspace;
 	int aflg, cc, ch, fd, i, maxloadav;
 	char buf[sizeof(struct whod)];
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp)(const void *, const void *);
 
 	aflg = 0;
 	cmp = hscmp;
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index d87ec7d..fe3a17d 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -80,8 +80,8 @@ int	nusers;
 time_t	now;
 int	aflg;
 
-static void usage __P((void));
-int utmpcmp __P((const void *, const void *));
+static void usage(void);
+int utmpcmp(const void *, const void *);
 
 int
 main(argc, argv)