Manual cleanup of remaining userland __P use (excluding packages maintained outside the tree)

210 files changed, 1176 insertions, 1451 deletions

diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index 393be67a3a8..6b161488209 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:06 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.5 2002/02/17 19:42:18 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $	*/
 
 /*-
@@ -163,7 +163,7 @@ Char	 *globone(Char *, int);
 int	  Gmatch(Char *, Char *);
 void	  ginit(void);
 Char	**globall(Char **);
-void	  rscan __P((Char **, void (*)()));
+void	  rscan(Char **, void (*)());
 void	  tglob(Char **);
 void	  trim(Char **);
 #ifdef FILEC
@@ -296,8 +296,8 @@ void	 plist(struct varent *);
  */
 void	donice(Char **, struct command *);
 void	dotime(Char **, struct command *);
-void	prusage __P((struct rusage *, struct rusage *,
-	    struct timeval *, struct timeval *));
+void	prusage(struct rusage *, struct rusage *,
+	    struct timeval *, struct timeval *);
 void	ruadd(struct rusage *, struct rusage *);
 void	settimes(void);
 void	pcsecs(long);
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 72e2d7b8615..d8226f1bf55 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ed.h,v 1.8 2002/02/16 21:27:06 millert Exp $	*/
+/*	$OpenBSD: ed.h,v 1.9 2002/02/17 19:42:19 millert Exp $	*/
 /*	$NetBSD: ed.h,v 1.23 1995/03/21 09:04:40 cgd Exp $	*/
 
 /* ed.h: type and constant definitions for the ed editor. */
@@ -190,14 +190,6 @@ if ((i) > (n)) { \
 # define strerror(n) sys_errlist[n]
 #endif
 
-#ifndef __P
-# ifndef __STDC__
-#  define __P(proto) ()
-# else
-#  define __P(proto) proto
-# endif
-#endif
-
 /* Local Function Declarations */
 void add_line_node(line_t *);
 int append_lines(long);
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 3368beab00d..902f8419c48 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcp.c,v 1.26 2002/02/16 21:27:07 millert Exp $	*/
+/*	$OpenBSD: rcp.c,v 1.27 2002/02/17 19:42:19 millert Exp $	*/
 /*	$NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $	*/
 
 /*
@@ -103,8 +103,8 @@ int	 kerberos(char **, char *, char *, char *);
 void	 oldw(const char *, ...);
 /* XXX from ../../usr.bin/rlogin/krcmd.c */
 int krcmd(char **, u_short, char *, char *, int *, char *);
-int krcmd_mutual __P((char **, u_short, char *, char *, int *,
-		       char *, CREDENTIALS *, Key_schedule));
+int krcmd_mutual(char **, u_short, char *, char *, int *,
+		 char *, CREDENTIALS *, Key_schedule);
 #endif
 int	 response(void);
 void	 rsource(char *, struct stat *);
diff --git a/games/battlestar/cypher.c b/games/battlestar/cypher.c
index 38ee010e196..926f79be8e0 100644
--- a/games/battlestar/cypher.c
+++ b/games/battlestar/cypher.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cypher.c,v 1.12 2000/09/26 04:42:56 pjanzen Exp $	*/
+/*	$OpenBSD: cypher.c,v 1.13 2002/02/17 19:42:20 millert Exp $	*/
 /*	$NetBSD: cypher.c,v 1.3 1995/03/21 15:07:15 cgd Exp $	*/
 
 /*
@@ -38,14 +38,14 @@
 #if 0
 static char sccsid[] = "@(#)cypher.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: cypher.c,v 1.12 2000/09/26 04:42:56 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: cypher.c,v 1.13 2002/02/17 19:42:20 millert Exp $";
 #endif
 #endif /* not lint */
 
 #include "extern.h"
 #include "pathnames.h"
 
-static void verb_with_all __P((unsigned int *, int, int (*)(void), const char *));
+static void verb_with_all(unsigned int *, int, int (*)(void), const char *);
 
 /* returns 0 if error or no more commands to do,
  *         1 if there are more commands remaining on the current input line
diff --git a/games/boggle/boggle/extern.h b/games/boggle/boggle/extern.h
index c1a0dc1ef66..4e7726b0e9d 100644
--- a/games/boggle/boggle/extern.h
+++ b/games/boggle/boggle/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 2002/02/16 21:27:09 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/17 19:42:20 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.3 1995/04/24 12:22:37 cgd Exp $	*/
 
 /*-
@@ -57,8 +57,8 @@ char	*nextword(FILE *);
 FILE	*opendict(char *);
 void	 playgame(void);
 void	 prompt(char *);
-void	 prtable __P((char *[],
-	    int, int, int, void (*)(char *[], int), int (*)(char *[], int)));
+void	 prtable(char *[],
+	    int, int, int, void (*)(char *[], int), int (*)(char *[], int));
 void	 putstr(char *);
 void	 redraw(void);
 void	 results(void);
diff --git a/games/boggle/boggle/prtable.c b/games/boggle/boggle/prtable.c
index 4d04a57c132..c721f7e98f4 100644
--- a/games/boggle/boggle/prtable.c
+++ b/games/boggle/boggle/prtable.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prtable.c,v 1.5 2002/02/16 21:27:09 millert Exp $	*/
+/*	$OpenBSD: prtable.c,v 1.6 2002/02/17 19:42:20 millert Exp $	*/
 /*	$NetBSD: prtable.c,v 1.2 1995/03/21 12:14:42 cgd Exp $	*/
 
 /*-
@@ -45,7 +45,7 @@
 
 #define NCOLS	5
 
-static int	get_maxlen __P((char *[], int, int (*)(char **, int)));
+static int	get_maxlen(char *[], int, int (*)(char **, int));
 
 /*
  * Routine to print a table
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index 090b646f273..2adb2771bca 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fortune.c,v 1.12 2002/02/16 21:27:09 millert Exp $	*/
+/*	$OpenBSD: fortune.c,v 1.13 2002/02/17 19:42:20 millert Exp $	*/
 /*	$NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 cgd Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)fortune.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: fortune.c,v 1.12 2002/02/16 21:27:09 millert Exp $";
+static char rcsid[] = "$OpenBSD: fortune.c,v 1.13 2002/02/17 19:42:20 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -128,8 +128,8 @@ FILEDESC	*Fortfile;		/* Fortune file to use */
 STRFILE		Noprob_tbl;		/* sum of data for all no prob files */
 
 int	 add_dir(FILEDESC *);
-int	 add_file __P((int,
-	    char *, char *, FILEDESC **, FILEDESC **, FILEDESC *));
+int	 add_file(int,
+	    char *, char *, FILEDESC **, FILEDESC **, FILEDESC *);
 void	 all_forts(FILEDESC *, char *);
 char	*copy(char *, u_int);
 void	 display(FILEDESC *);
diff --git a/games/gomoku/gomoku.h b/games/gomoku/gomoku.h
index 9b83fb0d4d5..a19f098c6a9 100644
--- a/games/gomoku/gomoku.h
+++ b/games/gomoku/gomoku.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gomoku.h,v 1.5 2002/02/16 21:27:10 millert Exp $	*/
+/*	$OpenBSD: gomoku.h,v 1.6 2002/02/17 19:42:20 millert Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -278,8 +278,8 @@ void	bdump(FILE *);
 #endif
 void	bdwho(int);
 int	better(struct spotstr *, struct spotstr *, int);
-int	checkframes __P((struct combostr *, struct combostr *,
-				 struct spotstr *, int, struct ovlp_info *));
+int	checkframes(struct combostr *, struct combostr *,
+	    struct spotstr *, int, struct ovlp_info *);
 #ifdef DEBUG
 void	clearcombo(struct combostr *, int);
 #endif
diff --git a/games/hunt/huntd/server.h b/games/hunt/huntd/server.h
index cac2c72d2f5..e632432118e 100644
--- a/games/hunt/huntd/server.h
+++ b/games/hunt/huntd/server.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.h,v 1.6 2002/02/16 21:27:10 millert Exp $	*/
+/*	$OpenBSD: server.h,v 1.7 2002/02/17 19:42:20 millert Exp $	*/
 /*	$NetBSD: hunt.h,v 1.5 1998/09/13 15:27:28 hubertf Exp $	*/
 
 /*
@@ -211,8 +211,8 @@ void	cleanup(int);
 void	mon_execute(PLAYER *);
 void	execute(PLAYER *);
 void	add_shot(int, int, int, char, int, PLAYER *, int, char);
-BULLET *create_shot __P((int, int, int, char, int, int, PLAYER *, IDENT *,
-	int, char));
+BULLET *create_shot(int, int, int, char, int, int, PLAYER *, IDENT *,
+	    int, char);
 void	ammo_update(PLAYER *);
 
 /* expl.c */
diff --git a/games/mille/mille.h b/games/mille/mille.h
index bd924d721c6..73ac2234ae1 100644
--- a/games/mille/mille.h
+++ b/games/mille/mille.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mille.h,v 1.6 2002/02/16 21:27:10 millert Exp $	*/
+/*	$OpenBSD: mille.h,v 1.7 2002/02/17 19:42:20 millert Exp $	*/
 /*	$NetBSD: mille.h,v 1.5 1995/03/24 05:01:51 cgd Exp $	*/
 
 /*
@@ -262,7 +262,7 @@ void	show_card(int, int, CARD, CARD *);
 void	show_score(int, int, int, int *);
 void	shuffle(void);
 void	sort(CARD *);
-bool	varpush __P((int, ssize_t(int, const struct iovec *, int)));
+bool	varpush(int, ssize_t(int, const struct iovec *, int));
 #ifdef EXTRAP
 void	extrapolate(PLAY *);
 void	undoex(void);
diff --git a/games/sail/extern.h b/games/sail/extern.h
index 3748d42d3f1..23760ac305d 100644
--- a/games/sail/extern.h
+++ b/games/sail/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.5 2002/02/16 22:33:16 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.6 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.8 1998/09/13 15:27:30 hubertf Exp $ */
 
 /*
@@ -324,8 +324,8 @@ int str_end(const char *);
 void closeon(struct ship *, struct ship *, char[], int, int, int);
 int score(char[], struct ship *, struct ship *, int);
 void move_ship(const char *, struct ship *, unsigned char *, short *, short *, char *);
-void try __P((char[], char [], int, int, int, int, int, struct ship *,
-    struct ship *, int *, int));
+void try(char[], char [], int, int, int, int, int, struct ship *,
+    struct ship *, int *, int);
 void rmend(char *);
 
 /* dr_3.c */
@@ -345,8 +345,7 @@ void grap(struct ship *, struct ship *);
 
 /* dr_5.c */
 void subtract(struct ship *, int, int [3], struct ship *, int);
-int mensent __P((struct ship *, struct ship *, int[3], struct ship **, int *,
-    int));
+int mensent(struct ship *, struct ship *, int[3], struct ship **, int *, int);
 
 /* dr_main.c */
 int dr_main(void);
diff --git a/include/dirent.h b/include/dirent.h
index 012e8006073..45392a7d20c 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dirent.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: dirent.h,v 1.8 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $	*/
 
 /*-
@@ -104,8 +104,8 @@ int closedir(DIR *);
 DIR *__opendir2(const char *, int);
 long telldir(const DIR *);
 void seekdir(DIR *, long);
-int scandir __P((const char *, struct dirent ***,
-    int (*)(struct dirent *), int (*)(const void *, const void *)));
+int scandir(const char *, struct dirent ***,
+    int (*)(struct dirent *), int (*)(const void *, const void *));
 int alphasort(const void *, const void *);
 int getdirentries(int, char *, int, long *);
 #endif /* not POSIX */
diff --git a/include/fts.h b/include/fts.h
index 8f01f294886..233c2c775ee 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fts.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: fts.h,v 1.8 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: fts.h,v 1.5 1994/12/28 01:41:50 mycroft Exp $	*/
 
 /*
@@ -122,8 +122,8 @@ typedef struct _ftsent {
 __BEGIN_DECLS
 FTSENT	*fts_children(FTS *, int);
 int	 fts_close(FTS *);
-FTS	*fts_open __P((char * const *, int,
-	    int (*)(const FTSENT **, const FTSENT **)));
+FTS	*fts_open(char * const *, int,
+	    int (*)(const FTSENT **, const FTSENT **));
 FTSENT	*fts_read(FTS *);
 int	 fts_set(FTS *, FTSENT *, int);
 __END_DECLS
diff --git a/include/glob.h b/include/glob.h
index 6766660bcb9..84cdd081e57 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glob.h,v 1.6 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: glob.h,v 1.7 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $	*/
 
 /*
@@ -93,7 +93,7 @@ typedef struct {
 #define GLOB_ABEND	GLOB_ABORTED
 
 __BEGIN_DECLS
-int	glob __P((const char *, int, int (*)(const char *, int), glob_t *));
+int	glob(const char *, int, int (*)(const char *, int), glob_t *);
 void	globfree(glob_t *);
 __END_DECLS
 
diff --git a/include/mpool.h b/include/mpool.h
index 3d5a249c607..b355371ca87 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpool.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: mpool.h,v 1.8 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: mpool.h,v 1.7 1996/05/03 21:13:41 cgd Exp $	*/
 
 /*-
@@ -99,8 +99,8 @@ typedef struct MPOOL {
 
 __BEGIN_DECLS
 MPOOL	*mpool_open(void *, int, pgno_t, pgno_t);
-void	 mpool_filter __P((MPOOL *, void (*)(void *, pgno_t, void *),
-	    void (*)(void *, pgno_t, void *), void *));
+void	 mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *),
+	    void (*)(void *, pgno_t, void *), void *);
 void	*mpool_new(MPOOL *, pgno_t *, u_int);
 void	*mpool_get(MPOOL *, pgno_t, u_int);
 int	 mpool_delete(MPOOL *, void *);
diff --git a/include/netdb.h b/include/netdb.h
index 6dd03a21c87..a8cdbf2f7ef 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netdb.h,v 1.15 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: netdb.h,v 1.16 2002/02/17 19:42:21 millert Exp $	*/
 
 /*
  * ++Copyright++ 1980, 1983, 1988, 1993
@@ -265,12 +265,11 @@ void		setnetent(int);
 void		setprotoent(int);
 void		setservent(int);
 
-int		getaddrinfo __P((const char *, const char *,
-		    const struct addrinfo *, struct addrinfo **));
+int		getaddrinfo(const char *, const char *,
+		    const struct addrinfo *, struct addrinfo **);
 void		freeaddrinfo(struct addrinfo *);
-int		getnameinfo __P((const struct sockaddr *, socklen_t,
-		    char *, size_t, char *, size_t,
-		    int));
+int		getnameinfo(const struct sockaddr *, socklen_t,
+		    char *, size_t, char *, size_t, int);
 char		*gai_strerror(int);
 int		net_addrcmp(struct sockaddr *, struct sockaddr *);
 int		getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **);
diff --git a/include/netgroup.h b/include/netgroup.h
index ac68a0b835a..23a76a73ab3 100644
--- a/include/netgroup.h
+++ b/include/netgroup.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: netgroup.h,v 1.4 2002/02/16 21:27:17 millert Exp $*/
+/* * $OpenBSD: netgroup.h,v 1.5 2002/02/17 19:42:21 millert Exp $*/
 /*
  * Copyright (c) 1994 Christos Zoulas
  * All rights reserved.
@@ -61,8 +61,7 @@ __BEGIN_DECLS
 void	setnetgrent(const char *);
 int	getnetgrent(const char **, const char **, const char **);
 void	endnetgrent(void);
-int	innetgr		__P((const char *, const char *, const char *,
-			     const char *));
+int	innetgr(const char *, const char *, const char *, const char *);
 #ifdef _NETGROUP_PRIVATE
 struct stringlist;
 
diff --git a/include/ohash.h b/include/ohash.h
index b53121d7c5e..6e7a6c2f483 100644
--- a/include/ohash.h
+++ b/include/ohash.h
@@ -1,6 +1,6 @@
 #ifndef OHASH_H
 #define OHASH_H
-/* $OpenBSD: ohash.h,v 1.2 2002/02/16 21:27:17 millert Exp $ */
+/* $OpenBSD: ohash.h,v 1.3 2002/02/17 19:42:21 millert Exp $ */
 /* ex:ts=8 sw=4: 
  */
 
@@ -65,10 +65,10 @@ void ohash_init(struct ohash *, unsigned, struct ohash_info *);
 void ohash_delete(struct ohash *);
 
 unsigned int ohash_lookup_string(struct ohash *, const char *, u_int32_t);
-unsigned int ohash_lookup_interval __P((struct ohash *, const char *, \
-	const char *, u_int32_t));
-unsigned int ohash_lookup_memory __P((struct ohash *, const char *, \
-	size_t, u_int32_t));
+unsigned int ohash_lookup_interval(struct ohash *, const char *,
+	    const char *, u_int32_t);
+unsigned int ohash_lookup_memory(struct ohash *, const char *,
+	    size_t, u_int32_t);
 void *ohash_find(struct ohash *, unsigned int);
 void *ohash_remove(struct ohash *, unsigned int);
 void *ohash_insert(struct ohash *, unsigned int, void *);
diff --git a/include/regex.h b/include/regex.h
index 7e70e07d8e1..68dba6347fc 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regex.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: regex.h,v 1.5 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: regex.h,v 1.4.6.1 1996/06/10 18:57:07 explorer Exp $	*/
 
 /*-
@@ -102,8 +102,7 @@ typedef struct {
 __BEGIN_DECLS
 int	regcomp(regex_t *, const char *, int);
 size_t	regerror(int, const regex_t *, char *, size_t);
-int	regexec __P((const regex_t *,
-	    const char *, size_t, regmatch_t [], int));
+int	regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
 void	regfree(regex_t *);
 __END_DECLS
 
diff --git a/include/resolv.h b/include/resolv.h
index 2a866edea98..137d2ba66f0 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolv.h,v 1.8 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: resolv.h,v 1.9 2002/02/17 19:42:21 millert Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -223,19 +223,19 @@ struct __res_state_ext {
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
 	res_sendhookact;
 
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
+typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
 					      const u_char **query,
 					      int *querylen,
 					      u_char *ans,
 					      int anssiz,
-					      int *resplen));
+					      int *resplen);
 
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
+typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
 					      const u_char *query,
 					      int querylen,
 					      u_char *ans,
 					      int anssiz,
-					      int *resplen));
+					      int *resplen);
 
 struct res_sym {
 	int	number;		/* Identifying number, like T_MX */
@@ -324,31 +324,31 @@ const char *	p_type(int);
 void		p_query(const u_char *);
 const u_char *	p_cdnname(const u_char *, const u_char *, int, FILE *);
 const u_char *	p_cdname(const u_char *, const u_char *, FILE *);
-const u_char *	p_fqnname __P((const u_char *cp, const u_char *msg,
-			       int, char *, int));
+const u_char *	p_fqnname(const u_char *cp, const u_char *msg,
+		    int, char *, int);
 const u_char *	p_fqname(const u_char *, const u_char *, FILE *);
 const u_char *	p_rr(const u_char *, const u_char *, FILE *);
 const char *	p_option(u_long option);
 char *		p_secstodate(u_long);
 int		dn_count_labels(char *);
-int		dn_comp __P((const char *, u_char *, int,
-			     u_char **, u_char **));
-int		dn_expand __P((const u_char *, const u_char *, const u_char *,
-			       char *, int));
+int		dn_comp(const char *, u_char *, int,
+		    u_char **, u_char **);
+int		dn_expand(const u_char *, const u_char *, const u_char *,
+		    char *, int);
 int		res_init(void);
 u_int		res_randomid(void);
 int		res_query(const char *, int, int, u_char *, int);
 int		res_search(const char *, int, int, u_char *, int);
-int		res_querydomain __P((const char *, const char *, int, int,
-				     u_char *, int));
-int		res_mkquery __P((int, const char *, int, int, const u_char *, int,
-				 const u_char *, u_char *, int));
+int		res_querydomain(const char *, const char *, int, int,
+		    u_char *, int);
+int		res_mkquery(int, const char *, int, int, const u_char *, int,
+		    const u_char *, u_char *, int);
 int		res_send(const u_char *, int, u_char *, int);
 int		res_isourserver(const struct sockaddr_in *);
-int		res_nameinquery __P((const char *, int, int,
-				     const u_char *, const u_char *));
-int		res_queriesmatch __P((const u_char *, const u_char *,
-				      const u_char *, const u_char *));
+int		res_nameinquery(const char *, int, int,
+		    const u_char *, const u_char *);
+int		res_queriesmatch(const u_char *, const u_char *,
+		    const u_char *, const u_char *);
 void		res_close(void);
 __END_DECLS
 
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 7787659b9d0..fc983083b47 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: auth.h,v 1.4 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: auth.h,v 1.7 1995/04/29 05:27:55 cgd Exp $	*/
 
 /*
@@ -106,8 +106,8 @@ typedef struct __rpc_auth {
 		/* nextverf & serialize */
 		int	(*ah_marshal)(struct __rpc_auth *, XDR *);
 		/* validate varifier */
-		int	(*ah_validate) __P((struct __rpc_auth *,
-			    struct opaque_auth *));
+		int	(*ah_validate)(struct __rpc_auth *,
+			    struct opaque_auth *);
 		/* refresh credentials */
 		int	(*ah_refresh)(struct __rpc_auth *);
 		/* destroy this structure */
@@ -172,8 +172,7 @@ struct sockaddr_in;
 extern AUTH *authunix_create(char *, int, int, int, int *);
 extern AUTH *authunix_create_default(void);
 extern AUTH *authnone_create(void);
-extern AUTH *authdes_create		__P((char *, u_int,
-					    struct sockaddr_in *, des_block *));
+extern AUTH *authdes_create(char *, u_int, struct sockaddr_in *, des_block *);
 __END_DECLS
 
 #define AUTH_NONE	0		/* no authentication */
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 93c9b78350a..46b402711b7 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnt.h,v 1.6 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: clnt.h,v 1.7 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: clnt.h,v 1.6 1995/04/29 05:27:58 cgd Exp $	*/
 
 /*
@@ -120,22 +120,22 @@ typedef struct __rpc_client {
 	AUTH	*cl_auth;			/* authenticator */
 	struct clnt_ops {
 		/* call remote procedure */
-		enum clnt_stat	(*cl_call) __P((struct __rpc_client *,
+		enum clnt_stat	(*cl_call)(struct __rpc_client *,
 				    u_long, xdrproc_t, caddr_t, xdrproc_t,
-				    caddr_t, struct timeval));
+				    caddr_t, struct timeval);
 		/* abort a call */
 		void		(*cl_abort)(struct __rpc_client *);
 		/* get specific error code */
-		void		(*cl_geterr) __P((struct __rpc_client *,
-				    struct rpc_err *));
+		void		(*cl_geterr)(struct __rpc_client *,
+				    struct rpc_err *);
 		/* frees results */
-		bool_t		(*cl_freeres) __P((struct __rpc_client *,
-				    xdrproc_t, caddr_t));
+		bool_t		(*cl_freeres)(struct __rpc_client *,
+				    xdrproc_t, caddr_t);
 		/* destroy this structure */
 		void		(*cl_destroy)(struct __rpc_client *);
 		/* the ioctl() of rpc */
-		bool_t          (*cl_control) __P((struct __rpc_client *, u_int,
-				    void *));
+		bool_t          (*cl_control)(struct __rpc_client *, u_int,
+				    void *);
 	} *cl_ops;
 	caddr_t			cl_private;	/* private stuff */
 } CLIENT;
@@ -285,12 +285,8 @@ __END_DECLS
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clnttcp_create	__P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     int *,
-				     u_int,
-				     u_int));
+extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
+    u_int, u_int);
 __END_DECLS
 
 
@@ -316,18 +312,10 @@ __END_DECLS
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clntudp_create	__P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     struct timeval,
-				     int *));
-extern CLIENT *clntudp_bufcreate __P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     struct timeval,
-				     int *,
-				     u_int,
-				     u_int));
+extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long,
+    struct timeval, int *);
+extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
+    struct timeval, int *, u_int, u_int);
 __END_DECLS
 
 
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 9e54c50243e..2a6fbecb355 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_clnt.h,v 1.4 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: pmap_clnt.h,v 1.5 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: pmap_clnt.h,v 1.5 1994/12/04 01:12:42 cgd Exp $	*/
 
 /*
@@ -70,18 +70,14 @@ __BEGIN_DECLS
 extern bool_t		pmap_set(u_long, u_long, u_int, int);
 extern bool_t		pmap_unset(u_long, u_long);
 extern struct pmaplist	*pmap_getmaps(struct sockaddr_in *);
-extern enum clnt_stat	pmap_rmtcall	__P((struct sockaddr_in *,
-					     u_long, u_long, u_long,
-					     xdrproc_t, caddr_t,
-					     xdrproc_t, caddr_t,
-					     struct timeval, u_long *));
-extern enum clnt_stat	clnt_broadcast	__P((u_long, u_long, u_long,
-					     xdrproc_t, char *,
-					     xdrproc_t, char *,
-					     bool_t (*) __P((caddr_t,
-						struct sockaddr_in *))));
-extern u_short		pmap_getport	__P((struct sockaddr_in *,
-					     u_long, u_long, u_int));
+extern enum clnt_stat	pmap_rmtcall(struct sockaddr_in *, u_long, u_long,
+			    u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t,
+			    struct timeval, u_long *);
+extern enum clnt_stat	clnt_broadcast(u_long, u_long, u_long, xdrproc_t,
+			    char *, xdrproc_t, char *,
+			    bool_t (*)(caddr_t, struct sockaddr_in *));
+extern u_short		pmap_getport(struct sockaddr_in *, u_long, u_long,
+			    u_int);
 __END_DECLS
 
 #endif /* !_RPC_PMAPCLNT_H */
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 1d929e86a8c..fc9189f5fe5 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.h,v 1.9 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: rpc.h,v 1.10 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: rpc.h,v 1.5 1994/12/04 01:15:30 cgd Exp $	*/
 
 /*
@@ -93,10 +93,10 @@ extern void setrpcent(int);
 extern void endrpcent(void);
 
 extern int get_myaddress(struct sockaddr_in *);
-extern int registerrpc __P((int, int, int, char *(*)(char [UDPMSGSIZE]),
-	xdrproc_t, xdrproc_t));
-extern int callrpc __P((char *, int, int, int, xdrproc_t, char *,
-	xdrproc_t , char *));
+extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
+	xdrproc_t, xdrproc_t);
+extern int callrpc(char *, int, int, int, xdrproc_t, char *,
+	xdrproc_t , char *);
 extern int getrpcport(char *, int, int, int);
 
 extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index be428e2f4ef..d41951bcbbf 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc.h,v 1.6 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: svc.h,v 1.7 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: svc.h,v 1.9 1995/04/29 05:28:01 cgd Exp $	*/
 
 /*
@@ -79,19 +79,18 @@ typedef struct __rpc_svcxprt {
 	u_short		xp_port;	 /* associated port number */
 	struct xp_ops {
 		/* receive incomming requests */
-		bool_t	(*xp_recv) __P((struct __rpc_svcxprt *,
-			    struct rpc_msg *));
+		bool_t	(*xp_recv)(struct __rpc_svcxprt *,
+			    struct rpc_msg *);
 		/* get transport status */
 		enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *);
 		/* get arguments */
-		bool_t	(*xp_getargs) __P((struct __rpc_svcxprt *, xdrproc_t,
-			    caddr_t));
+		bool_t	(*xp_getargs)(struct __rpc_svcxprt *, xdrproc_t,
+			    caddr_t);
 		/* send reply */
-		bool_t	(*xp_reply) __P((struct __rpc_svcxprt *,
-			    struct rpc_msg *));
+		bool_t	(*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *);
 		/* free mem allocated for args */
-		bool_t	(*xp_freeargs) __P((struct __rpc_svcxprt *, xdrproc_t,
-			    caddr_t));
+		bool_t	(*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t,
+			    caddr_t);
 		/* destroy this struct */
 		void	(*xp_destroy)(struct __rpc_svcxprt *);
 	} *xp_ops;
@@ -170,8 +169,8 @@ struct svc_req {
  *	int protocol;    like TCP or UDP, zero means do not register 
  */
 __BEGIN_DECLS
-extern bool_t	svc_register __P((SVCXPRT *, u_long, u_long,
-		    void (*)(struct svc_req *, SVCXPRT *), int));
+extern bool_t	svc_register(SVCXPRT *, u_long, u_long,
+		    void (*)(struct svc_req *, SVCXPRT *), int);
 __END_DECLS
 
 /*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 3b9076ea4ca..26731c04f3d 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xdr.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: xdr.h,v 1.4 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: xdr.h,v 1.7 1995/04/29 05:28:06 cgd Exp $	*/
 
 /*
@@ -291,9 +291,9 @@ extern void   xdrstdio_create(XDR *, FILE *, enum xdr_op);
 #endif
 
 /* XDR pseudo records for tcp */
-extern void   xdrrec_create	__P((XDR *, u_int, u_int, char *,
-				    int (*)(caddr_t, caddr_t, int),
-				    int (*)(caddr_t, caddr_t, int)));
+extern void   xdrrec_create(XDR *, u_int, u_int, char *,
+			    int (*)(caddr_t, caddr_t, int),
+			    int (*)(caddr_t, caddr_t, int));
 
 /* make end of xdr record */
 extern bool_t xdrrec_endofrecord(XDR *, int);
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index 8a4d6cf2594..e80b64dc3a9 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypclnt.h,v 1.5 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: ypclnt.h,v 1.6 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: ypclnt.h,v 1.7 1995/07/14 21:11:10 christos Exp $	*/
 
 /*
@@ -72,16 +72,14 @@ struct dom_binding;
 int	_yp_dobind(const char *, struct dom_binding **);
 void	yp_unbind(const char *);
 int	yp_get_default_domain(char **);
-int	yp_match 	__P((const char *, const char *, const char *,
-			     int , char **, int *));
-int	yp_first 	__P((const char *, const char *, char **, int *,
-			     char **, int *));
-int	yp_next		__P((const char *, const char *, const char *,
-			     int, char **, int *, char **, int *));
+int	yp_match(const char *, const char *, const char *, int , char **,
+	    int *);
+int	yp_first(const char *, const char *, char **, int *, char **, int *);
+int	yp_next(const char *, const char *, const char *, int, char **, int *,
+	    char **, int *);
 int	yp_master(const char *, const char *, char **);
 int	yp_order(const char *, const char *, int *);
-int	yp_all		__P((const char *, const char *,
-			     struct ypall_callback *));
+int	yp_all(const char *, const char *, struct ypall_callback *);
 char *	yperr_string(int);
 int	ypprot_err(unsigned int);
 struct ypmaplist;
diff --git a/include/search.h b/include/search.h
index 53efbadba50..d0460df0f92 100644
--- a/include/search.h
+++ b/include/search.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: search.h,v 1.5 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: search.h,v 1.9 1995/08/08 21:14:45 jtc Exp $	*/
 
 /*
@@ -33,26 +33,26 @@ typedef enum {
 } VISIT;
 
 __BEGIN_DECLS
-extern void	*bsearch __P((const void *, const void *, size_t, size_t,
-			      int (*)(const void *, const void *)));
+extern void	*bsearch(const void *, const void *, size_t, size_t,
+		    int (*)(const void *, const void *));
 extern int	 hcreate(unsigned int);
 extern void	 hdestroy(void);
 extern ENTRY	*hsearch(ENTRY, ACTION);
 
-extern void	*lfind __P((const void *, const void *, size_t *, size_t,
-			      int (*)(const void *, const void *)));
-extern void	*lsearch __P((const void *, const void *, size_t *, size_t,
-			      int (*)(const void *, const void *)));
+extern void	*lfind(const void *, const void *, size_t *, size_t,
+		    int (*)(const void *, const void *));
+extern void	*lsearch(const void *, const void *, size_t *, size_t,
+		    int (*)(const void *, const void *));
 extern void	 insque(void *, void *);
 extern void	 remque(void *);
 
-extern void	*tdelete __P((const void *, void **,
-			      int (*)(const void *, const void *)));
-extern void	*tfind __P((const void *, void * const *,
-			      int (*)(const void *, const void *)));
-extern void	*tsearch __P((const void *, void **, 
-			      int (*)(const void *, const void *)));
-extern void      twalk __P((const void *, void (*)(const void *, VISIT, int)));
+extern void	*tdelete(const void *, void **,
+		    int (*)(const void *, const void *));
+extern void	*tfind(const void *, void * const *,
+		    int (*)(const void *, const void *));
+extern void	*tsearch(const void *, void **, 
+		    int (*)(const void *, const void *));
+extern void      twalk(const void *, void (*)(const void *, VISIT, int));
 __END_DECLS
 
 #endif
diff --git a/include/stdio.h b/include/stdio.h
index 4bf6c0242c8..d6f64a65ad8 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.20 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.21 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -342,11 +342,11 @@ __END_DECLS
  * Stdio function-access interface.
  */
 __BEGIN_DECLS
-FILE	*funopen __P((const void *,
+FILE	*funopen(const void *,
 		int (*)(void *, char *, int),
 		int (*)(void *, const char *, int),
 		fpos_t (*)(void *, fpos_t, int),
-		int (*)(void *)));
+		int (*)(void *));
 __END_DECLS
 #define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
diff --git a/include/stdlib.h b/include/stdlib.h
index 32b91157ffb..b5b558eedce 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdlib.h,v 1.16 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: stdlib.h,v 1.17 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $	*/
 
 /*-
@@ -95,12 +95,12 @@ typedef struct {
 __BEGIN_DECLS
 __dead void	 abort(void);
 int	 abs(int);
-int	 atexit __P((void (*)(void)));
+int	 atexit(void (*)(void));
 double	 atof(const char *);
 int	 atoi(const char *);
 long	 atol(const char *);
-void	*bsearch __P((const void *, const void *, size_t,
-	    size_t, int (*)(const void *, const void *)));
+void	*bsearch(const void *, const void *, size_t, size_t,
+	    int (*)(const void *, const void *));
 void	*calloc(size_t, size_t);
 div_t	 div(int, int);
 __dead void	 exit(int);
@@ -109,8 +109,7 @@ char	*getenv(const char *);
 long	 labs(long);
 ldiv_t	 ldiv(long, long);
 void	*malloc(size_t);
-void	 qsort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
+void	 qsort(void *, size_t, size_t, int (*)(const void *, const void *));
 int	 rand(void);
 int	 rand_r(unsigned int *);
 void	*realloc(void *, size_t);
@@ -166,14 +165,12 @@ extern	 int optreset;
 int	 getsubopt(char **, char * const *, char **);
 extern	 char *suboptarg;		/* getsubopt(3) external variable */
 
-int	 heapsort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
-int	 mergesort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
-int	 radixsort __P((const unsigned char **, int, const unsigned char *,
-	    unsigned));
-int	 sradixsort __P((const unsigned char **, int, const unsigned char *,
-	    unsigned));
+int	 heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
+int	 mergesort(void *, size_t, size_t, int (*)(const void *, const void *));
+int	 radixsort(const unsigned char **, int, const unsigned char *,
+	    unsigned);
+int	 sradixsort(const unsigned char **, int, const unsigned char *,
+	    unsigned);
 
 char	*initstate(unsigned int, char *, size_t);
 long	 random(void);
diff --git a/include/unistd.h b/include/unistd.h
index bae73c5b05b..394b5221ca5 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.36 2002/02/16 21:27:17 millert Exp $ */
+/*	$OpenBSD: unistd.h,v 1.37 2002/02/17 19:42:21 millert Exp $ */
 /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
 
 /*-
@@ -159,12 +159,12 @@ int	 nice(int);
 void	 psignal(unsigned int, const char *);
 extern __const char *__const sys_siglist[];
 int	 profil(char *, size_t, unsigned long, unsigned int);
-int	 rcmd __P((char **, int, const char *,
-		const char *, const char *, int *));
-int	 rcmd_af __P((char **, int, const char *,
-		const char *, const char *, int *, int));
-int	 rcmdsh __P((char **, int, const char *,
-		const char *, const char *, char *));
+int	 rcmd(char **, int, const char *,
+	    const char *, const char *, int *);
+int	 rcmd_af(char **, int, const char *,
+	    const char *, const char *, int *, int);
+int	 rcmdsh(char **, int, const char *,
+	    const char *, const char *, char *);
 char	*re_comp(const char *);
 int	 re_exec(const char *);
 int	 readlink(const char *, char *, size_t);
diff --git a/lib/csu/sparc64/crt0.c b/lib/csu/sparc64/crt0.c
index bc0b88d99fa..5c776bc708f 100644
--- a/lib/csu/sparc64/crt0.c
+++ b/lib/csu/sparc64/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.3 2002/02/16 21:27:20 millert Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.4 2002/02/17 19:42:22 millert Exp $	*/
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -59,7 +59,7 @@ __start:
 ");
 
 
-void ___start __P((char **, void (*)(void), const void *));
+void ___start(char **, void (*)(void), const void *);
 
 void
 ___start(char **sp, void (*cleanup)(void), const void *obj)
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
index e985a9aa0ba..4c083ecdd51 100644
--- a/lib/libc/db/btree/extern.h
+++ b/lib/libc/db/btree/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.6 2002/02/17 19:42:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -54,8 +54,8 @@ int	 __bt_ret(BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
 EPG	*__bt_search(BTREE *, const DBT *, int *);
 int	 __bt_seq(const DB *, DBT *, DBT *, u_int);
 void	 __bt_setcur(BTREE *, pgno_t, u_int);
-int	 __bt_split __P((BTREE *, PAGE *,
-	    const DBT *, const DBT *, int, size_t, u_int32_t));
+int	 __bt_split(BTREE *, PAGE *,
+	    const DBT *, const DBT *, int, size_t, u_int32_t);
 int	 __bt_sync(const DB *, u_int);
 
 int	 __ovfl_delete(BTREE *, void *);
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
index 03ef3964fde..8ac029b6726 100644
--- a/lib/libc/db/hash/extern.h
+++ b/lib/libc/db/hash/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.6 2002/02/17 19:42:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -41,8 +41,8 @@ int	 __big_delete(HTAB *, BUFHEAD *);
 int	 __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *);
 int	 __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int);
 int	 __big_return(HTAB *, BUFHEAD *, int, DBT *, int);
-int	 __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
-		int, u_int32_t, SPLIT_RETURN *));
+int	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
+	    int, u_int32_t, SPLIT_RETURN *);
 int	 __buf_free(HTAB *, int, int);
 void	 __buf_init(HTAB *, int);
 u_int32_t	 __call_hash(HTAB *, char *, int);
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index a4976fc0b05..235cba4d130 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $	*/
+/*	$OpenBSD: getnetgrent.c,v 1.12 2002/02/17 19:42:22 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $";
+static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.12 2002/02/17 19:42:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -72,15 +72,14 @@ static int		getstring(char **, int, char **);
 static struct netgroup	*getnetgroup(char **);
 static int		 lookup(const char *, char *, char **, int);
 static void		 addgroup(char *, struct stringlist *, char *);
-static int		 in_check __P((const char *, const char *,
-				       const char *, struct netgroup *));
-static int		 in_find __P((char *, struct stringlist *,
-				      char *, const char *,
-				      const char *, const char *));
-static char		*in_lookup1 __P((const char *, const char *,
-					 const char *, int));
-static int		 in_lookup __P((const char *, const char *,
-					const char *, const char *, int));
+static int		 in_check(const char *, const char *,
+			    const char *, struct netgroup *);
+static int		 in_find(char *, struct stringlist *,
+			    char *, const char *, const char *, const char *);
+static char		*in_lookup1(const char *, const char *,
+			    const char *, int);
+static int		 in_lookup(const char *, const char *,
+			    const char *, const char *, int);
 
 /*
  * _ng_sl_init(): Initialize a string list
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 3048ee8318f..aa918f41a8a 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.17 2002/02/16 21:27:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.18 2002/02/17 19:42:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -138,10 +138,10 @@ static Char	*g_strchr(Char *, int);
 static int	 g_stat(Char *, struct stat *, glob_t *);
 static int	 glob0(const Char *, glob_t *);
 static int	 glob1(Char *, Char *, glob_t *, size_t *);
-static int	 glob2 __P((Char *, Char *, Char *, Char *, Char *, Char *,
-		    glob_t *, size_t *));
-static int	 glob3 __P((Char *, Char *, Char *, Char *, Char *, Char *,
-		    Char *, Char *, glob_t *, size_t *));
+static int	 glob2(Char *, Char *, Char *, Char *, Char *, Char *,
+		    glob_t *, size_t *);
+static int	 glob3(Char *, Char *, Char *, Char *, Char *, Char *,
+		    Char *, Char *, glob_t *, size_t *);
 static int	 globextend(const Char *, glob_t *, size_t *);
 static const Char *
 		 globtilde(const Char *, Char *, size_t, glob_t *);
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 72183d260ba..d16900b4a0e 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getaddrinfo.c,v 1.32 2002/02/16 21:27:23 millert Exp $	*/
+/*	$OpenBSD: getaddrinfo.c,v 1.33 2002/02/17 19:42:23 millert Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $	*/
 
 /*
@@ -200,18 +200,18 @@ struct res_target {
 };
 
 static int str_isnumber(const char *);
-static int explore_fqdn __P((const struct addrinfo *, const char *,
-	const char *, struct addrinfo **));
-static int explore_null __P((const struct addrinfo *,
-	const char *, struct addrinfo **));
-static int explore_numeric __P((const struct addrinfo *, const char *,
-	const char *, struct addrinfo **));
-static int explore_numeric_scope __P((const struct addrinfo *, const char *,
-	const char *, struct addrinfo **));
-static int get_canonname __P((const struct addrinfo *,
-	struct addrinfo *, const char *));
-static struct addrinfo *get_ai __P((const struct addrinfo *,
-	const struct afd *, const char *));
+static int explore_fqdn(const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int explore_null(const struct addrinfo *,
+	const char *, struct addrinfo **);
+static int explore_numeric(const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int explore_numeric_scope(const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int get_canonname(const struct addrinfo *,
+	struct addrinfo *, const char *);
+static struct addrinfo *get_ai(const struct addrinfo *,
+	const struct afd *, const char *);
 static int get_portmatch(const struct addrinfo *, const char *);
 static int get_port(struct addrinfo *, const char *, int);
 static const struct afd *find_afd(int);
@@ -225,23 +225,21 @@ static int ip6_str2scopeid(char *, struct sockaddr_in6 *);
 static void _sethtent(void);
 static void _endhtent(void);
 static struct addrinfo * _gethtent(const char *, const struct addrinfo *);
-static struct addrinfo *_files_getaddrinfo __P((const char *,
-	const struct addrinfo *));
+static struct addrinfo *_files_getaddrinfo(const char *,
+	const struct addrinfo *);
 
 #ifdef YP
 static struct addrinfo *_yphostent(char *, const struct addrinfo *);
-static struct addrinfo *_yp_getaddrinfo __P((const char *,
-	const struct addrinfo *));
+static struct addrinfo *_yp_getaddrinfo(const char *,
+	const struct addrinfo *);
 #endif
 
-static struct addrinfo *getanswer __P((const querybuf *, int, const char *, int,
-	const struct addrinfo *));
+static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
+	const struct addrinfo *);
 static int res_queryN(const char *, struct res_target *);
 static int res_searchN(const char *, struct res_target *);
-static int res_querydomainN __P((const char *, const char *,
-	struct res_target *));
-static struct addrinfo *_dns_getaddrinfo __P((const char *,
-	const struct addrinfo *));
+static int res_querydomainN(const char *, const char *, struct res_target *);
+static struct addrinfo *_dns_getaddrinfo(const char *, const struct addrinfo *);
 
 
 /* XXX macros that make external reference is BAD. */
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index d4e3c5e6f00..9061caf0c23 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.44 2002/02/16 21:27:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.45 2002/02/17 19:42:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -126,8 +126,7 @@ typedef union {
 	char ac;
 } align;
 
-static struct hostent *getanswer __P((const querybuf *, int, const char *,
-				      int));
+static struct hostent *getanswer(const querybuf *, int, const char *, int);
 
 extern int h_errno;
 
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index c19603f2d17..15dc9dcdea2 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnameinfo.c,v 1.22 2002/02/16 21:27:23 millert Exp $	*/
+/*	$OpenBSD: getnameinfo.c,v 1.23 2002/02/17 19:42:23 millert Exp $	*/
 /*	$KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $	*/
 
 /*
@@ -81,8 +81,8 @@ struct sockinet {
 };
 
 #ifdef INET6
-static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
-				 size_t, int));
+static int ip6_parsenumeric(const struct sockaddr *, const char *, char *,
+    size_t, int);
 static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
 #endif
 
diff --git a/lib/libc/net/inet_net_ntop.c b/lib/libc/net/inet_net_ntop.c
index 943ec44550f..f5cb588d107 100644
--- a/lib/libc/net/inet_net_ntop.c
+++ b/lib/libc/net/inet_net_ntop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 downsj Exp $	*/
+/*	$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:23 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -21,7 +21,7 @@
 #if 0
 static const char rcsid[] = "$From: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp $";
 #else
-static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 downsj Exp $";
+static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:23 millert Exp $";
 #endif
 #endif
 
@@ -35,8 +35,7 @@ static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30
 #include <string.h>
 #include <stdlib.h>
 
-static char *	inet_net_ntop_ipv4 __P((const u_char *src, int bits,
-					char *dst, size_t size));
+static char *inet_net_ntop_ipv4(const u_char *, int, char *, size_t);
 
 /*
  * char *
diff --git a/lib/libc/net/inet_net_pton.c b/lib/libc/net/inet_net_pton.c
index b529e836645..932531eb5d1 100644
--- a/lib/libc/net/inet_net_pton.c
+++ b/lib/libc/net/inet_net_pton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 downsj Exp $	*/
+/*	$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:23 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -21,7 +21,7 @@
 #if 0
 static const char rcsid[] = "$From: inet_net_pton.c,v 8.3 1996/11/11 06:36:52 vixie Exp $";
 #else
-static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 downsj Exp $";
+static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:23 millert Exp $";
 #endif
 #endif
 
@@ -37,8 +37,7 @@ static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30
 #include <string.h>
 #include <stdlib.h>
 
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
-					size_t size));
+static int	inet_net_pton_ipv4(const char *, u_char *, size_t);
 
 /*
  * static int
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 95d481a7f64..143b667ba8e 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rcmd.c,v 1.40 2002/02/16 21:27:23 millert Exp $";
+static char *rcsid = "$OpenBSD: rcmd.c,v 1.41 2002/02/17 19:42:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -58,8 +58,8 @@ static char *rcsid = "$OpenBSD: rcmd.c,v 1.40 2002/02/16 21:27:23 millert Exp $"
 #include <netgroup.h>
 
 int	__ivaliduser(FILE *, in_addr_t, const char *, const char *);
-int	__ivaliduser_sa __P((FILE *, struct sockaddr *, socklen_t,
-		const char *, const char *));
+int	__ivaliduser_sa(FILE *, struct sockaddr *, socklen_t,
+	    const char *, const char *);
 static int __icheckhost(struct sockaddr *, socklen_t, const char *);
 static char *__gethostloop(struct sockaddr *, socklen_t);
 
diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c
index f7a0358967e..948923cf37d 100644
--- a/lib/libc/net/res_comp.c
+++ b/lib/libc/net/res_comp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $	*/
+/*	$OpenBSD: res_comp.c,v 1.9 2002/02/17 19:42:23 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_comp.c,v 8.11 1996/12/02 09:17:22 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_comp.c,v 1.9 2002/02/17 19:42:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -76,8 +76,7 @@ static char rcsid[] = "$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Ex
 #include <unistd.h>
 #include <string.h>
 
-static int	dn_find __P((u_char *exp_dn, u_char *msg,
-			     u_char **dnptrs, u_char **lastdnptr));
+static int dn_find(u_char *, u_char *, u_char **, u_char **);
 
 /*
  * Expand compressed domain name 'comp_dn' to full domain name.
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 8efe61030ef..70d5c564471 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.h,v 1.3 2002/02/16 21:27:24 millert Exp $	*/
+/*	$OpenBSD: local.h,v 1.4 2002/02/17 19:42:23 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -53,7 +53,7 @@ void	_cleanup(void);
 void	(*__cleanup)(void);
 void	__smakebuf(FILE *);
 int	__swhatbuf(FILE *, size_t *, int *);
-int	_fwalk __P((int (*)(FILE *)));
+int	_fwalk(int (*)(FILE *));
 int	__swsetup(FILE *);
 int	__sflags(const char *, int *);
 
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 086547819ea..326a6e92746 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: vfprintf.c,v 1.15 2002/02/16 21:27:24 millert Exp $";
+static char *rcsid = "$OpenBSD: vfprintf.c,v 1.16 2002/02/17 19:42:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -60,10 +60,8 @@ static char *rcsid = "$OpenBSD: vfprintf.c,v 1.15 2002/02/16 21:27:24 millert Ex
 #include "local.h"
 #include "fvwrite.h"
 
-static void __find_arguments __P((const char *fmt0, va_list ap,
-	va_list **argtable));
-static int __grow_type_table __P((unsigned char **typetable,
-	int *tablesize));
+static void __find_arguments(const char *fmt0, va_list ap, va_list **argtable);
+static int __grow_type_table(unsigned char **typetable, int *tablesize);
 
 /*
  * Flush out all the vectors defined by the given uio,
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 345eb2fd8ba..4ae6488af23 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $";
+static char *rcsid = "$OpenBSD: merge.c,v 1.5 2002/02/17 19:42:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -58,8 +58,8 @@ static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $"
 #include <stdlib.h>
 #include <string.h>
 
-static void setup __P((u_char *, u_char *, size_t, size_t, int (*)()));
-static void insertionsort __P((u_char *, size_t, size_t, int (*)()));
+static void setup(u_char *, u_char *, size_t, size_t, int (*)());
+static void insertionsort(u_char *, size_t, size_t, int (*)());
 
 #define ISIZE sizeof(int)
 #define PSIZE sizeof(u_char *)
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index d16ed7b0bd7..9b8bb5801ba 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -32,13 +32,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: qsort.c,v 1.6 2002/02/16 21:27:24 millert Exp $";
+static char *rcsid = "$OpenBSD: qsort.c,v 1.7 2002/02/17 19:42:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <stdlib.h>
 
-static __inline char	*med3 __P((char *, char *, char *, int (*)()));
+static __inline char	*med3(char *, char *, char *, int (*)());
 static __inline void	 swapfunc(char *, char *, int, int);
 
 #define min(a, b)	(a) < (b) ? a : b
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 40d7c0789f6..e03b4797153 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: radixsort.c,v 1.4 2002/02/16 21:27:24 millert Exp $";
+static char *rcsid = "$OpenBSD: radixsort.c,v 1.5 2002/02/17 19:42:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -63,8 +63,8 @@ typedef struct {
 static __inline void simplesort
 (const u_char **, int, int, const u_char *, u_int);
 static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_b __P((const u_char **,
-	    const u_char **, int, int, const u_char *, u_int));
+static void r_sort_b(const u_char **,
+	    const u_char **, int, int, const u_char *, u_int);
 
 #define	THRESHOLD	20		/* Divert to simplesort(). */
 #define	SIZE		512		/* Default stack size. */
diff --git a/lib/libc/yp/ypinternal.h b/lib/libc/yp/ypinternal.h
index eb842d71935..ee6cecd25b7 100644
--- a/lib/libc/yp/ypinternal.h
+++ b/lib/libc/yp/ypinternal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypinternal.h,v 1.3 2002/02/16 21:27:25 millert Exp $	 */
+/*	$OpenBSD: ypinternal.h,v 1.4 2002/02/17 19:42:24 millert Exp $	 */
 
 /*
  * Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
@@ -61,10 +61,8 @@ int _yp_check(char **);
 
 #ifdef YPMATCHCACHE
 
-static bool_t ypmatch_add __P((const char *, const char *,
-    u_int, char *, u_int));
-static bool_t ypmatch_find __P((const char *, const char *,
-    u_int, char **, u_int *));
+static bool_t ypmatch_add(const char *, const char *, u_int, char *, u_int);
+static bool_t ypmatch_find(const char *, const char *, u_int, char **, u_int *);
 
 static struct ypmatch_ent {
 	struct ypmatch_ent 	*next;
diff --git a/lib/libc_r/include/pthread.h b/lib/libc_r/include/pthread.h
index c81cf953901..4a3f470c741 100644
--- a/lib/libc_r/include/pthread.h
+++ b/lib/libc_r/include/pthread.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $	*/
+/*	$OpenBSD: pthread.h,v 1.16 2002/02/17 19:42:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
@@ -207,42 +207,39 @@ __BEGIN_DECLS
 int		pthread_attr_destroy(pthread_attr_t *);
 int		pthread_attr_getstacksize(pthread_attr_t *, size_t *);
 int		pthread_attr_getstackaddr(pthread_attr_t *, void **);
-int		pthread_attr_getdetachstate __P((const pthread_attr_t *,
-			int *));
+int		pthread_attr_getdetachstate(const pthread_attr_t *, int *);
 int		pthread_attr_init(pthread_attr_t *);
 int		pthread_attr_setstacksize(pthread_attr_t *, size_t);
 int		pthread_attr_setstackaddr(pthread_attr_t *, void *);
 int		pthread_attr_setdetachstate(pthread_attr_t *, int);
 void		pthread_cleanup_pop(int execute);
-void		pthread_cleanup_push __P((void (*routine) (void *),
-			void *routine_arg));
+void		pthread_cleanup_push(void (*routine)(void *),
+		    void *routine_arg);
 int		pthread_condattr_destroy(pthread_condattr_t *attr);
 int		pthread_condattr_init(pthread_condattr_t *attr);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_condattr_getpshared __P((const pthread_condattr_t *attr,
-			int *pshared));
-int		pthread_condattr_setpshared __P((pthread_condattr_t *attr,
-			int pshared));
+int		pthread_condattr_getpshared(const pthread_condattr_t *attr,
+		    int *pshared);
+int		pthread_condattr_setpshared(pthread_condattr_t *attr,
+		    int pshared);
 #endif
 
 int		pthread_cond_broadcast(pthread_cond_t *);
 int		pthread_cond_destroy(pthread_cond_t *);
-int		pthread_cond_init __P((pthread_cond_t *,
-			const pthread_condattr_t *));
+int		pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *);
 int		pthread_cond_signal(pthread_cond_t *);
-int		pthread_cond_timedwait __P((pthread_cond_t *,
-			pthread_mutex_t *, const struct timespec * abstime));
+int		pthread_cond_timedwait(pthread_cond_t *,
+		    pthread_mutex_t *, const struct timespec * abstime);
 int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
-int		pthread_create __P((pthread_t *, const pthread_attr_t *,
-			void *(*start_routine) (void *), void *));
+int		pthread_create(pthread_t *, const pthread_attr_t *,
+		    void *(*start_routine) (void *), void *);
 int		pthread_detach(pthread_t);
 int		pthread_equal(pthread_t, pthread_t);
 __dead void	pthread_exit(void *) __attribute__((__noreturn__));
 void		*pthread_getspecific(pthread_key_t);
 int		pthread_join(pthread_t, void **);
-int		pthread_key_create __P((pthread_key_t *,
-			void (*routine) (void *)));
+int		pthread_key_create(pthread_key_t *, void (*routine)(void *));
 int		pthread_key_delete(pthread_key_t);
 int		pthread_kill(struct pthread *, int);
 int		pthread_mutexattr_init(pthread_mutexattr_t *);
@@ -250,26 +247,24 @@ int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
 int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
 int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 int		pthread_mutex_destroy(pthread_mutex_t *);
-int		pthread_mutex_init __P((pthread_mutex_t *,
-			const pthread_mutexattr_t *));
+int		pthread_mutex_init(pthread_mutex_t *,
+		    const pthread_mutexattr_t *);
 int		pthread_mutex_lock(pthread_mutex_t *);
 int		pthread_mutex_trylock(pthread_mutex_t *);
 int		pthread_mutex_unlock(pthread_mutex_t *);
-int		pthread_once __P((pthread_once_t *,
-			void (*) (void)));
+int		pthread_once(pthread_once_t *, void (*)(void));
 int		pthread_rwlock_destroy(pthread_rwlock_t *);
-int		pthread_rwlock_init __P((pthread_rwlock_t *,
-			const pthread_rwlockattr_t *));
+int		pthread_rwlock_init(pthread_rwlock_t *,
+		    const pthread_rwlockattr_t *);
 int		pthread_rwlock_rdlock(pthread_rwlock_t *);
 int		pthread_rwlock_tryrdlock(pthread_rwlock_t *);
 int		pthread_rwlock_trywrlock(pthread_rwlock_t *);
 int		pthread_rwlock_unlock(pthread_rwlock_t *);
 int		pthread_rwlock_wrlock(pthread_rwlock_t *);
 int		pthread_rwlockattr_init(pthread_rwlockattr_t *);
-int		pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *,
-			int *));
-int		pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *,
-			int));
+int		pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
+		    int *);
+int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
 int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
 pthread_t	pthread_self(void);
 int		pthread_setspecific(pthread_key_t, const void *);
@@ -285,51 +280,50 @@ int		pthread_setprio(pthread_t, int);
 void		pthread_yield(void);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_mutexattr_getpshared __P((pthread_mutexattr_t *,
-			int *pshared));
-int		pthread_mutexattr_setpshared __P((pthread_mutexattr_t *,
-			int pshared));
+int		pthread_mutexattr_getpshared(pthread_mutexattr_t *,
+		    int *pshared);
+int		pthread_mutexattr_setpshared(pthread_mutexattr_t *,
+		    int pshared);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT)
-int		pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *,
-			int *prioceiling));
-int		pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *,
-			int prioceiling));
+int		pthread_mutexattr_getprioceiling(pthread_mutexattr_t *,
+		    int *prioceiling);
+int		pthread_mutexattr_setprioceiling(pthread_mutexattr_t *,
+		    int prioceiling);
 int		pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
-int		pthread_mutex_setprioceiling __P((pthread_mutex_t *, int,
-			int *));
+int		pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT) || defined (_POSIX_THREAD_PRIO_INHERIT)
-int		pthread_mutexattr_getprotocol __P((pthread_mutexattr_t *,
-			int *protocol));
-int		pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *,
-			int protocol));
+int		pthread_mutexattr_getprotocol(pthread_mutexattr_t *,
+		    int *protocol);
+int		pthread_mutexattr_setprotocol(pthread_mutexattr_t *,
+		    int protocol);
 #endif
 
-int		pthread_getschedparam __P((pthread_t pthread, int *policy,
-			struct sched_param * param));
-int		pthread_setschedparam __P((pthread_t pthread, int policy,
-			const struct sched_param * param));
+int		pthread_getschedparam(pthread_t pthread, int *policy,
+		    struct sched_param * param);
+int		pthread_setschedparam(pthread_t pthread, int policy,
+		    const struct sched_param * param);
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
-int		pthread_attr_getschedparam __P((const pthread_attr_t *,
-			struct sched_param *));
+int		pthread_attr_getschedparam(const pthread_attr_t *,
+		    struct sched_param *);
 int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
 int		pthread_attr_getscope(const pthread_attr_t *, int *);
 int		pthread_attr_setinheritsched(pthread_attr_t *, int);
-int		pthread_attr_setschedparam __P((pthread_attr_t *,
-			const struct sched_param *));
+int		pthread_attr_setschedparam(pthread_attr_t *,
+		    const struct sched_param *);
 int		pthread_attr_setschedpolicy(pthread_attr_t *, int);
 int		pthread_attr_setscope(pthread_attr_t *, int);
 #endif
 
 int		pthread_attr_setfloatstate(pthread_attr_t *, int);
 int		pthread_attr_getfloatstate(pthread_attr_t *, int *);
-int		pthread_attr_setcleanup __P((pthread_attr_t *,
-			void (*routine) (void *), void *));
+int		pthread_attr_setcleanup(pthread_attr_t *,
+		    void (*routine)(void *), void *);
 
 
 #ifdef notyet
@@ -339,10 +333,8 @@ int		pthread_attr_setcleanup __P((pthread_attr_t *,
 #define PTHREAD_PRIO_INHERIT
 #define PTHREAD_PRIO_NONE
 #define PTHREAD_PRIO_PROTECT
-int		pthread_attr_getguardsize __P((const pthread_attr_t *, 
-			size_t *));
-int		pthread_attr_setguardsize __P((const pthread_attr_t *, 
-			size_t));
+int		pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
+int		pthread_attr_setguardsize(const pthread_attr_t *, size_t);
 int		pthread_getconcurrency(void);
 int		pthread_setconcurrency(int);
 #endif	/* susv2 */
diff --git a/lib/libcom_err/com_err.h b/lib/libcom_err/com_err.h
index af9ffff8f54..577a6dee6e5 100644
--- a/lib/libcom_err/com_err.h
+++ b/lib/libcom_err/com_err.h
@@ -47,14 +47,6 @@
 #include <stdarg.h>
 #endif
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(X) X
-#else
-#define __P(X) ()
-#endif
-#endif
-
 
 /*
  * For compatibility with MIT's com_err the com_right.h include
diff --git a/lib/libcompat/4.3/lsearch.c b/lib/libcompat/4.3/lsearch.c
index 9cc27856bb3..23ad2c40ca6 100644
--- a/lib/libcompat/4.3/lsearch.c
+++ b/lib/libcompat/4.3/lsearch.c
@@ -43,8 +43,8 @@ static char sccsid[] = "@(#)lsearch.c	8.1 (Berkeley) 6/4/93";
 #include <search.h>
 
 typedef int (*cmp_fn_t)(const void *, const void *);
-static void *linear_base __P((const void *, const void *, size_t *, size_t,
-			     cmp_fn_t, int));
+static void *linear_base(const void *, const void *, size_t *, size_t,
+    cmp_fn_t, int);
 
 void *
 lsearch(key, base, nelp, width, compar)
@@ -52,6 +52,7 @@ lsearch(key, base, nelp, width, compar)
 	size_t *nelp, width;
 	cmp_fn_t compar;
 {
+
 	return(linear_base(key, base, nelp, width, compar, 1));
 }
 
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
index 91cdf7f253e..56711d105c2 100644
--- a/lib/libedit/chared.h
+++ b/lib/libedit/chared.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chared.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: chared.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: chared.h,v 1.2 1997/01/11 06:47:49 lukem Exp $	*/
 
 /*-
@@ -142,12 +142,10 @@ protected void  cv_delfini(EditLine *);
 protected char *cv__endword(char *, char *, int);
 protected int   ce__isword(int);
 protected void  cv_undo(EditLine *, int, int, char *);
-protected char *cv_next_word	__P((EditLine*, char *, char *, int, 
-				     int (*)(int)));
-protected char *cv_prev_word	__P((EditLine*, char *, char *, int,
-				     int (*)(int)));
-protected char *c__next_word	__P((char *, char *, int, int (*)(int)));
-protected char *c__prev_word	__P((char *, char *, int, int (*)(int)));
+protected char *cv_next_word(EditLine*, char *, char *, int, int (*)(int));
+protected char *cv_prev_word(EditLine*, char *, char *, int, int (*)(int));
+protected char *c__next_word(char *, char *, int, int (*)(int));
+protected char *c__prev_word(char *, char *, int, int (*)(int));
 protected void  c_insert(EditLine *, int);
 protected void  c_delbefore(EditLine *, int);
 protected void  c_delafter(EditLine *, int);
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index e108095f350..21a27356913 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: key.c,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: key.c,v 1.2 1997/01/11 06:47:58 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: key.c,v 1.4 2002/02/16 21:27:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: key.c,v 1.5 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -85,15 +85,13 @@ struct key_node_t {
     struct key_node_t *sibling;	/* ptr to another key with same prefix 	*/
 };
 
-private	int            node_trav	__P((EditLine *, key_node_t *, char *, 
-					     key_value_t *));
-private	int            node__try	__P((key_node_t *, char *, 
-					     key_value_t *, int));
+private	int            node_trav(EditLine *, key_node_t *, char *, 
+			    key_value_t *);
+private	int            node__try(key_node_t *, char *, key_value_t *, int);
 private	key_node_t    *node__get(int);
 private	void	       node__put(key_node_t *);
 private	int	       node__delete(key_node_t **, char *);
-private	int	       node_lookup 	__P((EditLine *, char *, key_node_t *,
-					     int));
+private	int	       node_lookup (EditLine *, char *, key_node_t *, int);
 private	int	       node_enum(EditLine *, key_node_t *, int);
 private	int	       key__decode_char(char *, int, int);
 
diff --git a/lib/libedit/key.h b/lib/libedit/key.h
index 256d48b72a7..60c3d13c092 100644
--- a/lib/libedit/key.h
+++ b/lib/libedit/key.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: key.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: key.h,v 1.2 1997/01/11 06:47:59 lukem Exp $	*/
 
 /*-
@@ -68,16 +68,12 @@ protected void 		key_end(EditLine *);
 protected key_value_t *	key_map_cmd(EditLine *, int);
 protected key_value_t *	key_map_str(EditLine *, char *);
 protected void		key_reset(EditLine *);
-protected int 		key_get		__P((EditLine *, char *, 
-					     key_value_t *));
-protected void		key_add		__P((EditLine *, char *, key_value_t *,
-					     int));
-protected void		key_clear	__P((EditLine *, el_action_t *,
-					     char *));
+protected int 		key_get(EditLine *, char *, key_value_t *);
+protected void		key_add(EditLine *, char *, key_value_t *, int);
+protected void		key_clear(EditLine *, el_action_t *, char *);
 protected int		key_delete(EditLine *, char *);
 protected void		key_print(EditLine *, char *);
-protected void	        key_kprint	__P((EditLine *, char *, 
-					     key_value_t *, int));
+protected void	        key_kprint(EditLine *, char *, key_value_t *, int);
 protected char 	       *key__decode_str(char *, char *, char *);
 
 #endif /* _h_el_key */
diff --git a/lib/libedit/map.h b/lib/libedit/map.h
index c63f11c60a3..c81d5daf907 100644
--- a/lib/libedit/map.h
+++ b/lib/libedit/map.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: map.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: map.h,v 1.2 1997/01/11 06:48:01 lukem Exp $	*/
 
 /*-
@@ -74,7 +74,6 @@ protected void	map_end(EditLine *);
 protected void	map_init_vi(EditLine *);
 protected void	map_init_emacs(EditLine *);
 protected int	map_set_editor(EditLine *, char *);
-protected int	map_addfunc		__P((EditLine *, const char *, 
-					     const char *, el_func_t));
+protected int	map_addfunc(EditLine *, const char *, const char *, el_func_t);
 
 #endif /* _h_el_map */
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index df6fe26fe90..d09711bed1d 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: refresh.c,v 1.6 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: refresh.c,v 1.2 1997/01/11 06:48:07 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: refresh.c,v 1.6 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -58,18 +58,15 @@ static char rcsid[] = "$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp
 
 private	void	re_addc(EditLine *, int);
 private	void	re_update_line(EditLine *, char *, char *, int);
-private	void	re_insert		__P((EditLine *, char *, int, int, 
-					     char *, int));
-private	void	re_delete		__P((EditLine *, char *, int, int, 
-					     int));
+private	void	re_insert(EditLine *, char *, int, int, char *, int);
+private	void	re_delete(EditLine *, char *, int, int, int);
 private	void	re_fastputc(EditLine *, int);
 
 private	void	re__strncopy(char *, char *, size_t);
 private	void	re__copy_and_pad(char *, char *, size_t);
 
 #ifdef DEBUG_REFRESH
-private	void	re_printstr		__P((EditLine *, char *, char *, 
-					     char *));
+private	void	re_printstr(EditLine *, char *, char *, char *);
 # define __F el->el_errfile
 # define RE_DEBUG(a, b, c)	do 				\
 				    if (a) {			\
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 2ecbc08bb41..c9c13b4bc78 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: term.c,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: term.c,v 1.6 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: term.c,v 1.8 1997/01/23 14:02:49 mrg Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: term.c,v 1.5 2002/02/16 21:27:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: term.c,v 1.6 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -254,8 +254,7 @@ private struct termcapval {
 private	void	term_rebuffer_display(EditLine *);
 private	void	term_free_display(EditLine *);
 private	void	term_alloc_display(EditLine *);
-private	void	term_alloc		__P((EditLine *,
-					     struct termcapstr *, char *)); 
+private	void	term_alloc(EditLine *, struct termcapstr *, char *); 
 private void	term_init_arrow(EditLine *);
 private void	term_reset_arrow(EditLine *);
 
diff --git a/lib/libedit/term.h b/lib/libedit/term.h
index 5c251653d94..3b2bcd8c716 100644
--- a/lib/libedit/term.h
+++ b/lib/libedit/term.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: term.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: term.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: term.h,v 1.4 1997/01/11 06:48:14 lukem Exp $	*/
 
 /*-
@@ -95,8 +95,7 @@ protected int  term_init(EditLine *);
 protected void term_bind_arrow(EditLine *);
 protected void term_print_arrow(EditLine *, char *);
 protected int  term_clear_arrow(EditLine *, char *);
-protected int  term_set_arrow		__P((EditLine *, char *, 
-					     key_value_t *, int));
+protected int  term_set_arrow(EditLine *, char *, key_value_t *, int);
 protected void term_end(EditLine *);
 protected int  term_set(EditLine *, char *);
 protected int  term_settc(EditLine *, int, char **);
diff --git a/lib/libedit/termcap.h b/lib/libedit/termcap.h
index f7190a6d865..a590c2d0d9e 100644
--- a/lib/libedit/termcap.h
+++ b/lib/libedit/termcap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: termcap.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: termcap.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: termcap.h,v 1.2 1997/01/11 06:48:14 lukem Exp $	*/
 
 /*-
@@ -50,6 +50,6 @@ char *tgetstr(char *, char **);
 int   tgetflag(char *);
 int   tgetnum(char *);
 char *tgoto(char *, int, int);
-char *tputs	__P((char *, int, void (*)(int)));
+char *tputs(char *, int, void (*)(int));
 
 #endif /* _h_termcap */
diff --git a/lib/libedit/tokenizer.h b/lib/libedit/tokenizer.h
index 2a5c4d2deb3..75a38b1a875 100644
--- a/lib/libedit/tokenizer.h
+++ b/lib/libedit/tokenizer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tokenizer.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: tokenizer.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: tokenizer.h,v 1.2 1997/01/11 06:48:16 lukem Exp $	*/
 
 /*-
@@ -50,7 +50,6 @@ typedef struct tokenizer Tokenizer;
 Tokenizer 	*tok_init(const char *);
 void		 tok_reset(Tokenizer *);
 void		 tok_end(Tokenizer *);
-int		 tok_line	__P((Tokenizer *, const char *, 
-				     int *, char ***));
+int		 tok_line(Tokenizer *, const char *, int *, char ***);
 
 #endif /* _h_tokenizer */
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 73865047e5f..a1b256bcf5e 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $ */
+/*	$OpenBSD: kvm.c,v 1.28 2002/02/17 19:42:25 millert Exp $ */
 /*	$NetBSD: kvm.c,v 1.43 1996/05/05 04:31:59 gwr Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm.c	8.2 (Berkeley) 2/13/94";
 #else
-static char *rcsid = "$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $";
+static char *rcsid = "$OpenBSD: kvm.c,v 1.28 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -74,8 +74,8 @@ static char *rcsid = "$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $";
 
 static int	kvm_dbopen(kvm_t *, const char *);
 static int	_kvm_get_header(kvm_t *);
-static kvm_t	*_kvm_open __P((kvm_t *, const char *, const char *,
-		    const char *, int, char *));
+static kvm_t	*_kvm_open(kvm_t *, const char *, const char *, const char *,
+		    int, char *);
 static int	clear_gap(kvm_t *, FILE *, int);
 
 char *
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 40f055fd658..8725ae2e4f2 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: kvm_proc.c,v 1.14 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #else
-static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Exp $";
+static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.14 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -117,16 +117,14 @@ static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Ex
 #define KREAD(kd, addr, obj) \
 	(kvm_read(kd, addr, (void *)(obj), sizeof(*obj)) != sizeof(*obj))
 
-ssize_t		kvm_uread __P((kvm_t *, const struct proc *, u_long, char *,
-		    size_t));
+ssize_t		kvm_uread(kvm_t *, const struct proc *, u_long, char *, size_t);
 
-static char	**kvm_argv __P((kvm_t *, const struct proc *, u_long, int,
-		    int));
+static char	**kvm_argv(kvm_t *, const struct proc *, u_long, int, int);
 static int	kvm_deadprocs(kvm_t *, int, int, u_long, u_long, int);
-static char	**kvm_doargv __P((kvm_t *, const struct kinfo_proc *, int,
-		    void (*)(struct ps_strings *, u_long *, int *)));
-static int	kvm_proclist __P((kvm_t *, int, int, struct proc *,
-		    struct kinfo_proc *, int));
+static char	**kvm_doargv(kvm_t *, const struct kinfo_proc *, int,
+		    void (*)(struct ps_strings *, u_long *, int *));
+static int	kvm_proclist(kvm_t *, int, int, struct proc *,
+		    struct kinfo_proc *, int);
 static int	proc_verify(kvm_t *, u_long, const struct proc *);
 static void	ps_str_a(struct ps_strings *, u_long *, int *);
 static void	ps_str_e(struct ps_strings *, u_long *, int *);
diff --git a/lib/libocurses/curses.h b/lib/libocurses/curses.h
index 3914699e45c..24151eae00a 100644
--- a/lib/libocurses/curses.h
+++ b/lib/libocurses/curses.h
@@ -334,7 +334,7 @@ int	 tgetnum(char *);
 int	 tgetflag(char *);
 char	*tgetstr(char *, char **);
 char	*tgoto(char *, int, int);
-void	 tputs __P((char *, int, void (*)(int)));
+void	 tputs(char *, int, void (*)(int));
 __END_DECLS
 
 #endif /* !_OCURSES_H_ */
diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h
index c81cf953901..4a3f470c741 100644
--- a/lib/libpthread/include/pthread.h
+++ b/lib/libpthread/include/pthread.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $	*/
+/*	$OpenBSD: pthread.h,v 1.16 2002/02/17 19:42:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
@@ -207,42 +207,39 @@ __BEGIN_DECLS
 int		pthread_attr_destroy(pthread_attr_t *);
 int		pthread_attr_getstacksize(pthread_attr_t *, size_t *);
 int		pthread_attr_getstackaddr(pthread_attr_t *, void **);
-int		pthread_attr_getdetachstate __P((const pthread_attr_t *,
-			int *));
+int		pthread_attr_getdetachstate(const pthread_attr_t *, int *);
 int		pthread_attr_init(pthread_attr_t *);
 int		pthread_attr_setstacksize(pthread_attr_t *, size_t);
 int		pthread_attr_setstackaddr(pthread_attr_t *, void *);
 int		pthread_attr_setdetachstate(pthread_attr_t *, int);
 void		pthread_cleanup_pop(int execute);
-void		pthread_cleanup_push __P((void (*routine) (void *),
-			void *routine_arg));
+void		pthread_cleanup_push(void (*routine)(void *),
+		    void *routine_arg);
 int		pthread_condattr_destroy(pthread_condattr_t *attr);
 int		pthread_condattr_init(pthread_condattr_t *attr);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_condattr_getpshared __P((const pthread_condattr_t *attr,
-			int *pshared));
-int		pthread_condattr_setpshared __P((pthread_condattr_t *attr,
-			int pshared));
+int		pthread_condattr_getpshared(const pthread_condattr_t *attr,
+		    int *pshared);
+int		pthread_condattr_setpshared(pthread_condattr_t *attr,
+		    int pshared);
 #endif
 
 int		pthread_cond_broadcast(pthread_cond_t *);
 int		pthread_cond_destroy(pthread_cond_t *);
-int		pthread_cond_init __P((pthread_cond_t *,
-			const pthread_condattr_t *));
+int		pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *);
 int		pthread_cond_signal(pthread_cond_t *);
-int		pthread_cond_timedwait __P((pthread_cond_t *,
-			pthread_mutex_t *, const struct timespec * abstime));
+int		pthread_cond_timedwait(pthread_cond_t *,
+		    pthread_mutex_t *, const struct timespec * abstime);
 int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
-int		pthread_create __P((pthread_t *, const pthread_attr_t *,
-			void *(*start_routine) (void *), void *));
+int		pthread_create(pthread_t *, const pthread_attr_t *,
+		    void *(*start_routine) (void *), void *);
 int		pthread_detach(pthread_t);
 int		pthread_equal(pthread_t, pthread_t);
 __dead void	pthread_exit(void *) __attribute__((__noreturn__));
 void		*pthread_getspecific(pthread_key_t);
 int		pthread_join(pthread_t, void **);
-int		pthread_key_create __P((pthread_key_t *,
-			void (*routine) (void *)));
+int		pthread_key_create(pthread_key_t *, void (*routine)(void *));
 int		pthread_key_delete(pthread_key_t);
 int		pthread_kill(struct pthread *, int);
 int		pthread_mutexattr_init(pthread_mutexattr_t *);
@@ -250,26 +247,24 @@ int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
 int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
 int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 int		pthread_mutex_destroy(pthread_mutex_t *);
-int		pthread_mutex_init __P((pthread_mutex_t *,
-			const pthread_mutexattr_t *));
+int		pthread_mutex_init(pthread_mutex_t *,
+		    const pthread_mutexattr_t *);
 int		pthread_mutex_lock(pthread_mutex_t *);
 int		pthread_mutex_trylock(pthread_mutex_t *);
 int		pthread_mutex_unlock(pthread_mutex_t *);
-int		pthread_once __P((pthread_once_t *,
-			void (*) (void)));
+int		pthread_once(pthread_once_t *, void (*)(void));
 int		pthread_rwlock_destroy(pthread_rwlock_t *);
-int		pthread_rwlock_init __P((pthread_rwlock_t *,
-			const pthread_rwlockattr_t *));
+int		pthread_rwlock_init(pthread_rwlock_t *,
+		    const pthread_rwlockattr_t *);
 int		pthread_rwlock_rdlock(pthread_rwlock_t *);
 int		pthread_rwlock_tryrdlock(pthread_rwlock_t *);
 int		pthread_rwlock_trywrlock(pthread_rwlock_t *);
 int		pthread_rwlock_unlock(pthread_rwlock_t *);
 int		pthread_rwlock_wrlock(pthread_rwlock_t *);
 int		pthread_rwlockattr_init(pthread_rwlockattr_t *);
-int		pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *,
-			int *));
-int		pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *,
-			int));
+int		pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
+		    int *);
+int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
 int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
 pthread_t	pthread_self(void);
 int		pthread_setspecific(pthread_key_t, const void *);
@@ -285,51 +280,50 @@ int		pthread_setprio(pthread_t, int);
 void		pthread_yield(void);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_mutexattr_getpshared __P((pthread_mutexattr_t *,
-			int *pshared));
-int		pthread_mutexattr_setpshared __P((pthread_mutexattr_t *,
-			int pshared));
+int		pthread_mutexattr_getpshared(pthread_mutexattr_t *,
+		    int *pshared);
+int		pthread_mutexattr_setpshared(pthread_mutexattr_t *,
+		    int pshared);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT)
-int		pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *,
-			int *prioceiling));
-int		pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *,
-			int prioceiling));
+int		pthread_mutexattr_getprioceiling(pthread_mutexattr_t *,
+		    int *prioceiling);
+int		pthread_mutexattr_setprioceiling(pthread_mutexattr_t *,
+		    int prioceiling);
 int		pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
-int		pthread_mutex_setprioceiling __P((pthread_mutex_t *, int,
-			int *));
+int		pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT) || defined (_POSIX_THREAD_PRIO_INHERIT)
-int		pthread_mutexattr_getprotocol __P((pthread_mutexattr_t *,
-			int *protocol));
-int		pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *,
-			int protocol));
+int		pthread_mutexattr_getprotocol(pthread_mutexattr_t *,
+		    int *protocol);
+int		pthread_mutexattr_setprotocol(pthread_mutexattr_t *,
+		    int protocol);
 #endif
 
-int		pthread_getschedparam __P((pthread_t pthread, int *policy,
-			struct sched_param * param));
-int		pthread_setschedparam __P((pthread_t pthread, int policy,
-			const struct sched_param * param));
+int		pthread_getschedparam(pthread_t pthread, int *policy,
+		    struct sched_param * param);
+int		pthread_setschedparam(pthread_t pthread, int policy,
+		    const struct sched_param * param);
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
-int		pthread_attr_getschedparam __P((const pthread_attr_t *,
-			struct sched_param *));
+int		pthread_attr_getschedparam(const pthread_attr_t *,
+		    struct sched_param *);
 int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
 int		pthread_attr_getscope(const pthread_attr_t *, int *);
 int		pthread_attr_setinheritsched(pthread_attr_t *, int);
-int		pthread_attr_setschedparam __P((pthread_attr_t *,
-			const struct sched_param *));
+int		pthread_attr_setschedparam(pthread_attr_t *,
+		    const struct sched_param *);
 int		pthread_attr_setschedpolicy(pthread_attr_t *, int);
 int		pthread_attr_setscope(pthread_attr_t *, int);
 #endif
 
 int		pthread_attr_setfloatstate(pthread_attr_t *, int);
 int		pthread_attr_getfloatstate(pthread_attr_t *, int *);
-int		pthread_attr_setcleanup __P((pthread_attr_t *,
-			void (*routine) (void *), void *));
+int		pthread_attr_setcleanup(pthread_attr_t *,
+		    void (*routine)(void *), void *);
 
 
 #ifdef notyet
@@ -339,10 +333,8 @@ int		pthread_attr_setcleanup __P((pthread_attr_t *,
 #define PTHREAD_PRIO_INHERIT
 #define PTHREAD_PRIO_NONE
 #define PTHREAD_PRIO_PROTECT
-int		pthread_attr_getguardsize __P((const pthread_attr_t *, 
-			size_t *));
-int		pthread_attr_setguardsize __P((const pthread_attr_t *, 
-			size_t));
+int		pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
+int		pthread_attr_setguardsize(const pthread_attr_t *, size_t);
 int		pthread_getconcurrency(void);
 int		pthread_setconcurrency(int);
 #endif	/* susv2 */
diff --git a/lib/libutil/scsi.h b/lib/libutil/scsi.h
index 08b8a9b9b48..3551ce54eee 100644
--- a/lib/libutil/scsi.h
+++ b/lib/libutil/scsi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi.h,v 1.2 2002/02/16 21:27:29 millert Exp $	*/
+/*	$OpenBSD: scsi.h,v 1.3 2002/02/17 19:42:26 millert Exp $	*/
 
 /* Copyright (c) 1994 HD Associates (hd@world.std.com)
  * All rights reserved.
@@ -54,26 +54,23 @@ scsireq_t *scsireq_reset(scsireq_t *);
 scsireq_t *scsireq_new(void);
 
 int scsireq_buff_decode(u_char *, size_t, char *, ...);
-int scsireq_buff_decode_visit __P((u_char *, size_t, char *,
-void (*a)(void *, int, void *, int, char *), void *));
+int scsireq_buff_decode_visit(u_char *, size_t, char *,
+    void (*a)(void *, int, void *, int, char *), void *);
 
 int scsireq_decode(scsireq_t *, char *, ...);
-int scsireq_decode_visit __P((scsireq_t *, char *,
-void (*) (void *, int, void *, int, char *), void *));
+int scsireq_decode_visit(scsireq_t *, char *,
+    void (*)(void *, int, void *, int, char *), void *);
 
 int scsireq_encode(scsireq_t *, char *, ...);
-int scsireq_encode_visit __P((scsireq_t *, char *,
-	int (*)(void *, char *), void *));
-int scsireq_buff_encode_visit __P((u_char *, size_t, char *,
-	int (*)(void *, char *), void *));
-
-scsireq_t *scsireq_build __P((scsireq_t *,
-	u_long, caddr_t, u_long,
-	char *, ...));
-
-scsireq_t *scsireq_build_visit __P((scsireq_t *,
-	u_long, caddr_t, u_long, char *,
-	int (*)(void *, char *), void *));
+int scsireq_encode_visit(scsireq_t *, char *,
+    int (*)(void *, char *), void *);
+int scsireq_buff_encode_visit(u_char *, size_t, char *,
+    int (*)(void *, char *), void *);
+
+scsireq_t *scsireq_build(scsireq_t *, u_long, caddr_t, u_long, char *, ...);
+
+scsireq_t *scsireq_build_visit(scsireq_t *, u_long, caddr_t, u_long, char *,
+    int (*)(void *, char *), void *);
 
 int scsireq_enter(int, scsireq_t *);
 
diff --git a/lib/libutil/util.h b/lib/libutil/util.h
index 33bf13560a9..dee86c93f15 100644
--- a/lib/libutil/util.h
+++ b/lib/libutil/util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.19 2002/02/16 21:27:29 millert Exp $	*/
+/*	$OpenBSD: util.h,v 1.20 2002/02/17 19:42:26 millert Exp $	*/
 /*	$NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $	*/
 
 /*-
@@ -100,10 +100,10 @@ void	pw_copy(int, int, struct passwd *);
 void	pw_getconf(char *, size_t, const char *, const char *);
 int	pw_scan(char *, struct passwd *, int *);
 void	pw_error(const char *, int, int);
-int	openpty __P((int *, int *, char *, struct termios *,
-	    struct winsize *));
-int	opendisk __P((const char *path, int flags, char *buf, size_t buflen,
-	    int iscooked));
+int	openpty(int *, int *, char *, struct termios *,
+	    struct winsize *);
+int	opendisk(const char *path, int flags, char *buf, size_t buflen,
+	    int iscooked);
 pid_t	forkpty(int *, char *, struct termios *, struct winsize *);
 int	getmaxpartitions(void);
 int	getrawpartition(void);
diff --git a/libexec/identd/identd.h b/libexec/identd/identd.h
index 73f2c5e20b6..c652a126145 100644
--- a/libexec/identd/identd.h
+++ b/libexec/identd/identd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: identd.h,v 1.10 2002/02/16 21:27:30 millert Exp $*/
+/*	$OpenBSD: identd.h,v 1.11 2002/02/17 19:42:26 millert Exp $*/
 
 /*
 **
@@ -45,7 +45,7 @@ char	*gethost4(struct sockaddr_in *);
 char	*gethost4_addr(struct in_addr *);
 char	*gethost6(struct sockaddr_in6 *);
 int	k_getuid(struct in_addr *, int, struct in_addr *, int, uid_t *);
-int	k_getuid6 __P((struct sockaddr_in6 *, int, struct sockaddr_in6 *,
-	int, uid_t *));
+int	k_getuid6(struct sockaddr_in6 *, int, struct sockaddr_in6 *,
+	    int, uid_t *);
 
 #endif
diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h
index 367579f6bec..a1371d55119 100644
--- a/libexec/ld.so/alpha/syscall.h
+++ b/libexec/ld.so/alpha/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.2 2002/02/16 21:27:30 millert Exp $ */
+/*	$OpenBSD: syscall.h,v 1.3 2002/02/17 19:42:26 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -48,8 +48,7 @@ int	_dl_getegid(void);
 int	_dl_geteuid(void);
 int	_dl_getgid(void);
 int	_dl_getuid(void);
-long	_dl_mmap __P((void *, unsigned int, unsigned int, unsigned int, int,
-		      off_t));
+long	_dl_mmap(void *, unsigned int, unsigned int, unsigned int, int, off_t);
 int	_dl_mprotect(const void *, int, int);
 int	_dl_munmap(const void*, unsigned int);
 int	_dl_open(const char*, unsigned int);
diff --git a/libexec/ld.so/dl_printf.c b/libexec/ld.so/dl_printf.c
index db3e38d479b..11c8e03ff3b 100644
--- a/libexec/ld.so/dl_printf.c
+++ b/libexec/ld.so/dl_printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl_printf.c,v 1.3 2002/02/16 21:27:30 millert Exp $	*/
+/*	$OpenBSD: dl_printf.c,v 1.4 2002/02/17 19:42:26 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -67,8 +67,8 @@
 #endif
 #include "syscall.h"
 
-static void kprintn __P((void (*)(int), u_long, int));
-static void kdoprnt __P((void (*)(int), const char *, va_list));
+static void kprintn(void (*)(int), u_long, int);
+static void kdoprnt(void (*)(int), const char *, va_list);
 
 static void putchar(int);
 static void sputchar(int);
diff --git a/libexec/lfs_cleanerd/clean.h b/libexec/lfs_cleanerd/clean.h
index 492c56c8f8f..d8692e2ef3c 100644
--- a/libexec/lfs_cleanerd/clean.h
+++ b/libexec/lfs_cleanerd/clean.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clean.h,v 1.3 2002/02/16 21:27:30 millert Exp $	*/
+/*	$OpenBSD: clean.h,v 1.4 2002/02/17 19:42:26 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -115,8 +115,8 @@ int 	 lfs_segmapv(FS_INFO *, int, caddr_t, BLOCK_INFO **, int *);
 int	 mmap_segment(FS_INFO *, int, caddr_t *, int);
 void	 munmap_segment(FS_INFO *, caddr_t, int);
 void	 reread_fs_info(FS_INFO *, int);
-void	 toss __P((void *, int *, size_t,
-	      int (*)(const void *, const void *, const void *), void *));
+void	 toss(void *, int *, size_t,
+	      int (*)(const void *, const void *, const void *), void *);
 
 /*
  * USEFUL DEBUGGING FUNCTIONS:
diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c
index 47314cad476..fbf10090da5 100644
--- a/libexec/lfs_cleanerd/cleanerd.c
+++ b/libexec/lfs_cleanerd/cleanerd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cleanerd.c,v 1.7 2002/02/16 21:27:30 millert Exp $	*/
+/*	$OpenBSD: cleanerd.c,v 1.8 2002/02/17 19:42:26 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)cleanerd.c	8.5 (Berkeley) 6/10/95";*/
-static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.7 2002/02/16 21:27:30 millert Exp $";
+static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.8 2002/02/17 19:42:26 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -93,9 +93,9 @@ int	 lfs_markv(fsid_t *, BLOCK_INFO *, int);
 
 /* function prototypes */
 int	 bi_tossold(const void *, const void *, const void *);
-int	 choose_segments __P((FS_INFO *, struct seglist *, 
-	     int (*)(FS_INFO *, SEGUSE *)));
-void	 clean_fs __P((FS_INFO	*, int (*)(FS_INFO *, SEGUSE *), int, long));
+int	 choose_segments(FS_INFO *, struct seglist *, 
+	     int (*)(FS_INFO *, SEGUSE *));
+void	 clean_fs((FS_INFO *, int (*)(FS_INFO *, SEGUSE *), int, long);
 int	 clean_loop(FS_INFO *, int, long);
 int	 clean_segment(FS_INFO *, int);
 int	 cost_benefit(FS_INFO *, SEGUSE *);
diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c
index 9a193d9e8c2..51e4b0202a1 100644
--- a/libexec/lfs_cleanerd/library.c
+++ b/libexec/lfs_cleanerd/library.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: library.c,v 1.5 2002/02/16 21:27:30 millert Exp $	*/
+/*	$OpenBSD: library.c,v 1.6 2002/02/17 19:42:26 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)library.c	8.3 (Berkeley) 5/24/95";*/
-static char rcsid[] = "$OpenBSD: library.c,v 1.5 2002/02/16 21:27:30 millert Exp $";
+static char rcsid[] = "$OpenBSD: library.c,v 1.6 2002/02/17 19:42:26 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -56,10 +56,9 @@ static char rcsid[] = "$OpenBSD: library.c,v 1.5 2002/02/16 21:27:30 millert Exp
 
 #include "clean.h"
 
-void	 add_blocks __P((FS_INFO *, BLOCK_INFO *, int *, SEGSUM *, caddr_t,
-	     daddr_t, daddr_t));
-void	 add_inodes __P((FS_INFO *, BLOCK_INFO *, int *, SEGSUM *, caddr_t,
-	     daddr_t));
+void	 add_blocks(FS_INFO *, BLOCK_INFO *, int *, SEGSUM *, caddr_t,
+	     daddr_t, daddr_t);
+void	 add_inodes(FS_INFO *, BLOCK_INFO *, int *, SEGSUM *, caddr_t, daddr_t);
 int	 bi_compare(const void *, const void *);
 int	 bi_toss(const void *, const void *, const void *);
 void	 get_ifile(FS_INFO *, int);
diff --git a/lkm/union/union_lkm.c b/lkm/union/union_lkm.c
index d1f6dbc900c..0d1cc86f3d8 100644
--- a/lkm/union/union_lkm.c
+++ b/lkm/union/union_lkm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: union_lkm.c,v 1.2 2002/02/16 21:27:31 millert Exp $	*/
+/*	$OpenBSD: union_lkm.c,v 1.3 2002/02/17 19:42:26 millert Exp $	*/
 
 /*
  * union_lkm.c (was: kernfsmod.c)
@@ -56,10 +56,10 @@
 extern struct vfsops union_vfsops;
 extern struct vnodeopv_desc union_vnodeop_opv_desc;
 
-extern int (*union_check_p) __P((off_t, struct proc *, struct vnode *, 
-				 struct file *, struct uio, int *));
-extern int union_check __P((off_t, struct proc *, struct vnode *, 
-			    struct file *, struct uio, int *));
+extern int (*union_check_p)(off_t, struct proc *, struct vnode *, 
+	    struct file *, struct uio, int *);
+extern int union_check(off_t, struct proc *, struct vnode *, struct file *,
+	    struct uio, int *);
 static int union_load(struct lkm_table *, int);
 
 /*
diff --git a/regress/lib/libc_r/include/test.h b/regress/lib/libc_r/include/test.h
index 32798c2d1df..58fdc8fb554 100644
--- a/regress/lib/libc_r/include/test.h
+++ b/regress/lib/libc_r/include/test.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test.h,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
+/*	$OpenBSD: test.h,v 1.4 2002/02/17 19:42:27 millert Exp $	*/
 
 #ifndef _h_test_
 #define _h_test_
@@ -12,10 +12,10 @@
 int	_thread_sys_write(int, const char*, size_t);
 __dead void _thread_sys__exit(int) __attribute__((__noreturn__));
 
-static __dead void __vpanic __P((const char *, const char *, const char *, 
-	int, const char *, va_list)) __attribute__((__noreturn__));
-static __dead void __panic __P((const char *, const char *, const char *,
-	int, const char *, ...)) __attribute__((__noreturn__));
+static __dead void __vpanic(const char *, const char *, const char *, 
+	int, const char *, va_list) __attribute__((__noreturn__));
+static __dead void __panic(const char *, const char *, const char *,
+	int, const char *, ...) __attribute__((__noreturn__));
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
diff --git a/regress/lib/libpthread/include/test.h b/regress/lib/libpthread/include/test.h
index 32798c2d1df..58fdc8fb554 100644
--- a/regress/lib/libpthread/include/test.h
+++ b/regress/lib/libpthread/include/test.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test.h,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
+/*	$OpenBSD: test.h,v 1.4 2002/02/17 19:42:27 millert Exp $	*/
 
 #ifndef _h_test_
 #define _h_test_
@@ -12,10 +12,10 @@
 int	_thread_sys_write(int, const char*, size_t);
 __dead void _thread_sys__exit(int) __attribute__((__noreturn__));
 
-static __dead void __vpanic __P((const char *, const char *, const char *, 
-	int, const char *, va_list)) __attribute__((__noreturn__));
-static __dead void __panic __P((const char *, const char *, const char *,
-	int, const char *, ...)) __attribute__((__noreturn__));
+static __dead void __vpanic(const char *, const char *, const char *, 
+	int, const char *, va_list) __attribute__((__noreturn__));
+static __dead void __panic(const char *, const char *, const char *,
+	int, const char *, ...) __attribute__((__noreturn__));
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
diff --git a/regress/sys/kern/sysvmsg/msgtest.c b/regress/sys/kern/sysvmsg/msgtest.c
index a76203a63af..6750a40765f 100644
--- a/regress/sys/kern/sysvmsg/msgtest.c
+++ b/regress/sys/kern/sysvmsg/msgtest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msgtest.c,v 1.1 2002/02/16 13:58:18 art Exp $	*/
+/*	$OpenBSD: msgtest.c,v 1.2 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: msgtest.c,v 1.6 2001/02/19 22:44:41 cgd Exp $	*/
 
 /*-
@@ -56,12 +56,12 @@
 #include <time.h>
 #include <unistd.h>
 
-int	main __P((int, char *[]));
-void	print_msqid_ds __P((struct msqid_ds *, mode_t));
-void	sigsys_handler __P((int));
-void	sigchld_handler __P((int));
-void	cleanup __P((void));
-void	receiver __P((void));
+int	main(int, char *[]);
+void	print_msqid_ds(struct msqid_ds *, mode_t);
+void	sigsys_handler(int);
+void	sigchld_handler(int);
+void	cleanup(void);
+void	receiver(void);
 
 #define	MESSAGE_TEXT_LEN	256
 
diff --git a/regress/sys/kern/sysvsem/semtest.c b/regress/sys/kern/sysvsem/semtest.c
index dbe3e146491..4a8db7bfa7b 100644
--- a/regress/sys/kern/sysvsem/semtest.c
+++ b/regress/sys/kern/sysvsem/semtest.c
@@ -55,12 +55,12 @@
 #include <time.h>
 #include <unistd.h>
 
-int	main __P((int, char *[]));
-void	print_semid_ds __P((struct semid_ds *, mode_t));
-void	sigsys_handler __P((int));
-void	sigchld_handler __P((int));
-void	cleanup __P((void));
-void	waiter __P((void));
+int	main(int, char *[]);
+void	print_semid_ds(struct semid_ds *, mode_t);
+void	sigsys_handler(int);
+void	sigchld_handler(int);
+void	cleanup(void);
+void	waiter(void);
 
 int	sender_semid = -1;
 pid_t	child_pid;
diff --git a/regress/sys/kern/sysvshm/shmtest.c b/regress/sys/kern/sysvshm/shmtest.c
index 7b633b9fe2e..d513a17eac3 100644
--- a/regress/sys/kern/sysvshm/shmtest.c
+++ b/regress/sys/kern/sysvshm/shmtest.c
@@ -55,12 +55,12 @@
 #include <time.h>
 #include <unistd.h>
 
-int	main __P((int, char *[]));
-void	print_shmid_ds __P((struct shmid_ds *, mode_t));
-void	sigsys_handler __P((int));
-void	sigchld_handler __P((int));
-void	cleanup __P((void));
-void	receiver __P((void));
+int	main(int, char *[]);
+void	print_shmid_ds(struct shmid_ds *, mode_t);
+void	sigsys_handler(int);
+void	sigchld_handler(int);
+void	cleanup(void);
+void	receiver(void);
 
 const char *m_str = "The quick brown fox jumped over the lazy dog.";
 
diff --git a/regress/sys/uvm/misc/misc.c b/regress/sys/uvm/misc/misc.c
index 16d9b469c16..9fff553312b 100644
--- a/regress/sys/uvm/misc/misc.c
+++ b/regress/sys/uvm/misc/misc.c
@@ -55,10 +55,10 @@
 #include <unistd.h>
 #include <string.h>	/* for memset declaration (?) */
 
-int	main __P((int, char *[]));
-void	usage __P((void));
+int	main(int, char *[]);
+void	usage(void);
 
-int	check_residency __P((void *, int));
+int	check_residency(void *, int);
 
 int	pgsize;
 int	verbose;
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 6cd1552c6dc..75b68b8cb00 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.h,v 1.9 2002/02/16 21:27:33 millert Exp $	*/
+/*	$OpenBSD: dump.h,v 1.10 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: dump.h,v 1.11 1997/06/05 11:13:20 lukem Exp $	*/
 
 /*-
@@ -90,10 +90,6 @@ long	dev_bsize;	/* block size of underlying disk device */
 int	dev_bshift;	/* log2(dev_bsize) */
 int	tp_bshift;	/* log2(TP_BSIZE) */
 
-#ifndef __P
-#include <sys/cdefs.h>
-#endif
-
 /* operator interface functions */
 void	broadcast(char *message);
 time_t	do_stats(void);
@@ -109,8 +105,8 @@ void	timeest(void);
 struct	dinode;
 long	blockest(struct dinode *dp);
 void	mapfileino(ino_t, u_int64_t *, int *);
-int	mapfiles __P((ino_t maxino, u_int64_t *tapesize, char *disk,
-		    char * const *dirv));
+int	mapfiles(ino_t maxino, u_int64_t *tapesize, char *disk,
+	    char * const *dirv);
 int	mapdirs(ino_t maxino, u_int64_t *tapesize);
 
 /* file dumping routines */
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 929cc65d5c1..762f39c010c 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tape.c,v 1.13 2002/02/16 21:27:33 millert Exp $	*/
+/*	$OpenBSD: tape.c,v 1.14 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.2 (Berkeley) 3/17/94";
 #else
-static char rcsid[] = "$OpenBSD: tape.c,v 1.13 2002/02/16 21:27:33 millert Exp $";
+static char rcsid[] = "$OpenBSD: tape.c,v 1.14 2002/02/17 19:42:27 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -85,7 +85,7 @@ extern	int cartridge;
 extern	char *host;
 char	*nexttape;
 
-static	ssize_t atomic __P((ssize_t (*)(), int, char *, int));
+static	ssize_t atomic(ssize_t (*)(), int, char *, int);
 static	void doslave(int, int);
 static	void enslave(void);
 static	void flushtape(void);
diff --git a/sbin/fdisk/misc.h b/sbin/fdisk/misc.h
index 248afc00cd6..8f1ea15cc5c 100644
--- a/sbin/fdisk/misc.h
+++ b/sbin/fdisk/misc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.h,v 1.7 2002/02/16 21:27:34 millert Exp $	*/
+/*	$OpenBSD: misc.h,v 1.8 2002/02/17 19:42:27 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -62,7 +62,7 @@ static const struct unit_type {
 /* Prototypes */
 int unit_lookup(char *);
 int ask_cmd(cmd_t *);
-int ask_num __P((const char *, int, int, int, int, void (*help)(void)));
+int ask_num(const char *, int, int, int, int, void (*help)(void));
 int ask_yn(const char *);
 u_int16_t getshort(void *);
 u_int32_t getlong(void *);
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 06db7f96338..46412d47c5c 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsck.c,v 1.8 2002/02/16 21:27:34 millert Exp $	*/
+/*	$OpenBSD: fsck.c,v 1.9 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: fsck.c,v 1.7 1996/10/03 20:06:30 christos Exp $	*/
 
 /*
@@ -76,8 +76,7 @@ static int flags = 0;
 
 int main(int, char *[]);
 
-static int checkfs __P((const char *, const char *, const char *, void *,
-    pid_t *));
+static int checkfs(const char *, const char *, const char *, void *, pid_t *);
 static int selected(const char *);
 static void addoption(char *);
 static const char *getoptions(const char *);
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index 038223c42ba..6c08f0fef6b 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsutil.h,v 1.2 2002/02/16 21:27:34 millert Exp $	*/
+/*	$OpenBSD: fsutil.h,v 1.3 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: fsutil.h,v 1.3 1996/10/03 20:06:31 christos Exp $	*/
 
 /*
@@ -54,5 +54,5 @@ char *estrdup(const char *);
 #define	CHECK_DEBUG	4
 
 struct fstab;
-int checkfstab __P((int, int, void *(*)(struct fstab *), 
-    int (*) (const char *, const char *, const char *, void *, pid_t *)));
+int checkfstab(int, int, void *(*)(struct fstab *), 
+    int (*) (const char *, const char *, const char *, void *, pid_t *));
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 137730c5c1e..d19b4174a29 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: preen.c,v 1.7 2002/02/16 21:27:34 millert Exp $	*/
+/*	$OpenBSD: preen.c,v 1.8 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: preen.c,v 1.15 1996/09/28 19:21:42 christos Exp $	*/
 
 /*
@@ -80,16 +80,16 @@ static int nrun = 0, ndisks = 0;
 
 static struct diskentry *finddisk(const char *);
 static void addpart(const char *, const char *, const char *, void *);
-static int startdisk __P((struct diskentry *, 
-    int (*)(const char *, const char *, const char *, void *, pid_t *)));
+static int startdisk(struct diskentry *, 
+    int (*)(const char *, const char *, const char *, void *, pid_t *));
 static void printpart(void);
 
 int
 checkfstab(flags, maxrun, docheck, checkit)
 	int flags, maxrun;
 	void *(*docheck)(struct fstab *);
-	int (*checkit) __P((const char *, const char *, const char *, void *,
-	    pid_t *));
+	int (*checkit)(const char *, const char *, const char *, void *,
+	    pid_t *);
 {
 	struct fstab *fs;
 	struct diskentry *d, *nextdisk;
@@ -324,8 +324,8 @@ addpart(type, devname, mntpt, auxarg)
 static int
 startdisk(d, checkit)
 	struct diskentry *d;
-	int (*checkit) __P((const char *, const char *, const char *, void *,
-	    pid_t *));
+	int (*checkit)(const char *, const char *, const char *, void *,
+	    pid_t *);
 {
 	struct partentry *p = d->d_part.tqh_first;
 	int rv;
diff --git a/sbin/fsck_ext2fs/preen.c b/sbin/fsck_ext2fs/preen.c
index e6a3ee7e6be..a235d4205e7 100644
--- a/sbin/fsck_ext2fs/preen.c
+++ b/sbin/fsck_ext2fs/preen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: preen.c,v 1.5 2002/02/16 21:27:34 millert Exp $	*/
+/*	$OpenBSD: preen.c,v 1.6 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: preen.c,v 1.2 1997/09/14 14:27:30 lukem Exp $	*/
 
 /*
@@ -64,7 +64,7 @@ char	hotroot;
 
 char	*rawname(), *unrawname(), *blockcheck();
 void addpart(char *, char *, long);
-int startdisk __P((struct disk *, int (*)() ));
+int startdisk(struct disk *, int (*)());
 
 int
 checkfstab(preen, maxrun, docheck, chkit)
diff --git a/sbin/fsck_msdos/dir.c b/sbin/fsck_msdos/dir.c
index 97002f579c3..42f7fc48435 100644
--- a/sbin/fsck_msdos/dir.c
+++ b/sbin/fsck_msdos/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.14 2002/02/16 21:27:34 millert Exp $	*/
+/*	$OpenBSD: dir.c,v 1.15 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: dir.c,v 1.11 1997/10/17 11:19:35 ws Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: dir.c,v 1.14 2002/02/16 21:27:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: dir.c,v 1.15 2002/02/17 19:42:27 millert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -97,14 +97,14 @@ static struct dirTodoNode *newDirTodo(void);
 static void freeDirTodo(struct dirTodoNode *);
 static char *fullpath(struct dosDirEntry *);
 static u_char calcShortSum(u_char *);
-static int delete __P((int, struct bootblock *, struct fatEntry *, cl_t, int,
-    cl_t, int, int));
-static int removede __P((int, struct bootblock *, struct fatEntry *, u_char *,
-    u_char *, cl_t, cl_t, cl_t, char *, int));
-static int checksize __P((struct bootblock *, struct fatEntry *, u_char *,
-    struct dosDirEntry *));
-static int readDosDirSection __P((int, struct bootblock *, struct fatEntry *,
-    struct dosDirEntry *));
+static int delete(int, struct bootblock *, struct fatEntry *, cl_t, int,
+    cl_t, int, int);
+static int removede(int, struct bootblock *, struct fatEntry *, u_char *,
+    u_char *, cl_t, cl_t, cl_t, char *, int);
+static int checksize(struct bootblock *, struct fatEntry *, u_char *,
+    struct dosDirEntry *);
+static int readDosDirSection(int, struct bootblock *, struct fatEntry *,
+    struct dosDirEntry *);
 
 /*
  * Manage free dosDirEntry structures.
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 39f6d6f786c..291121b166e 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.56 2002/02/16 21:27:35 millert Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.57 2002/02/17 19:42:27 millert Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -81,7 +81,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #else
-static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.56 2002/02/16 21:27:35 millert Exp $";
+static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.57 2002/02/17 19:42:27 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -303,8 +303,8 @@ const char *get_media_type_string(int);
 const char *get_media_subtype_string(int);
 int	get_media_subtype(int, const char *);
 int	get_media_options(int, const char *);
-int	lookup_media_word __P((const struct ifmedia_description *, int,
-	    const char *));
+int	lookup_media_word(const struct ifmedia_description *, int,
+	    const char *);
 void	print_media_word(int, int, int);
 void	process_media_commands(void);
 void	init_current_media(void);
diff --git a/sbin/isakmpd/sysdep/common/blf.h b/sbin/isakmpd/sysdep/common/blf.h
index 6c5cd97a37c..e945ae965da 100644
--- a/sbin/isakmpd/sysdep/common/blf.h
+++ b/sbin/isakmpd/sysdep/common/blf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: blf.h,v 1.2 2002/02/16 21:27:35 millert Exp $ */
+/* $OpenBSD: blf.h,v 1.3 2002/02/17 19:42:28 millert Exp $ */
 /*
  * Blowfish - a fast block cipher designed by Bruce Schneier
  *
@@ -34,10 +34,6 @@
 #ifndef _BLF_H_
 #define _BLF_H_
 
-#ifndef __P
-#define __P(args) args
-#endif
-
 /* Schneier states the maximum key length to be 56 bytes.
  * The way how the subkeys are initalized by the key up
  * to (N+2)*4 i.e. 72 bytes are utilized.
diff --git a/sbin/modload/modload.h b/sbin/modload/modload.h
index 2cb62243b73..e1940083881 100644
--- a/sbin/modload/modload.h
+++ b/sbin/modload/modload.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modload.h,v 1.2 2002/02/16 21:27:35 millert Exp $	*/
+/*	$OpenBSD: modload.h,v 1.3 2002/02/17 19:42:28 millert Exp $	*/
 /*	$NetBSD: modload.h,v 1.2 2001/11/08 15:33:15 christos Exp $	*/
 
 /*
@@ -36,18 +36,18 @@
 #ifndef __modload_h__
 #define __modload_h__
 
-int	elf_mod_sizes	__P((int, size_t *, int *, struct lmc_resrv *,
-			     struct stat *));
+int	elf_mod_sizes(int, size_t *, int *, struct lmc_resrv *,
+	    struct stat *);
 void	*elf_mod_load(int);
-void	elf_linkcmd	__P((char*, size_t, const char*, const char*, 
-			     const char*, const void*, const char*));
+void	elf_linkcmd(char *, size_t, const char *, const char *, 
+	    const char *, const void *, const char *);
 void	elf_mod_symload(int);
 
-int	a_out_mod_sizes __P((int, size_t *, int *, struct lmc_resrv *,
-			     struct stat *));
+int	a_out_mod_sizes(int, size_t *, int *, struct lmc_resrv *,
+	    struct stat *);
 void	*a_out_mod_load(int);
-void	a_out_linkcmd	__P((char*, size_t, const char*, const char*, 
-			     const char*, const void*, const char*));
+void	a_out_linkcmd(char *, size_t, const char *, const char *, 
+	    const char *, const void *, const char *);
 void	a_out_mod_symload(int);
 
 #ifndef USE_AOUT
@@ -62,9 +62,9 @@ void	a_out_mod_symload(int);
 #define linkcmd a_out_linkcmd
 #endif
 
-void loadbuf(void*, size_t);
+void loadbuf(void *, size_t);
 void loadspace(size_t);
-void loadsym(void*, size_t);
+void loadsym(void *, size_t);
 
 extern int debug;
 extern int verbose;
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 36f9bc80214..40176ae04eb 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.c,v 1.25 2002/02/16 21:27:35 millert Exp $	*/
+/*	$OpenBSD: mount.c,v 1.26 2002/02/17 19:42:28 millert Exp $	*/
 /*	$NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount.c	8.19 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$OpenBSD: mount.c,v 1.25 2002/02/16 21:27:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount.c,v 1.26 2002/02/17 19:42:28 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -82,8 +82,8 @@ struct statfs
 int	hasopt(const char *, const char *);
 void	maketypelist(char *);
 void	mangle(char *, int *, const char **);
-int	mountfs __P((const char *, const char *, const char *,
-			int, const char *, const char *, int));
+int	mountfs(const char *, const char *, const char *, int, const char *,
+	    const char *, int);
 void	prmount(struct statfs *);
 int	disklabelcheck(struct fstab *);
 void	usage(void);
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index e9003655d8e..92342b9c6f5 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portald.h,v 1.4 2002/02/16 21:27:36 millert Exp $	*/
+/*	$OpenBSD: portald.h,v 1.5 2002/02/17 19:42:28 millert Exp $	*/
 /*	$NetBSD: portald.h,v 1.4 1995/04/23 10:33:23 cgd Exp $	*/
 
 /*
@@ -61,20 +61,16 @@ struct qelem {
 typedef struct provider provider;
 struct provider {
 	char *pr_match;
-	int (*pr_func) __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
+	int (*pr_func)(struct portal_cred *, char *, char **, int, int *);
 };
 extern provider providers[];
 
 /*
  * Portal providers
  */
-extern int portal_exec __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
-extern int portal_file __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
-extern int portal_tcp __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
+extern int portal_exec(struct portal_cred *, char *, char **, int, int *);
+extern int portal_file(struct portal_cred *, char *, char **, int, int *);
+extern int portal_tcp(struct portal_cred *, char *, char **, int, int *);
 
 /*
  * Global functions
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 249f2677c64..109e0c27dcb 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mountd.c,v 1.42 2002/02/16 21:27:36 millert Exp $	*/
+/*	$OpenBSD: mountd.c,v 1.43 2002/02/17 19:42:28 millert Exp $	*/
 /*	$NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $	*/
 
 /*
@@ -150,18 +150,17 @@ struct fhreturn {
 
 /* Global defs */
 char	*add_expdir(struct dirlist **, char *, int);
-void	add_dlist __P((struct dirlist **, struct dirlist *,
-	    struct grouplist *, int));
+void	add_dlist(struct dirlist **, struct dirlist *, struct grouplist *, int);
 void	add_mlist(char *, char *);
 int	check_dirpath(char *);
 int	check_options(struct dirlist *);
 int	chk_host(struct dirlist *, in_addr_t, int *, int *);
 void	del_mlist(char *, char *);
 struct dirlist *dirp_search(struct dirlist *, char *);
-int	do_mount __P((struct exportlist *, struct grouplist *, int,
-	    struct ucred *, char *, int, struct statfs *));
-int	do_opt __P((char **, char **, struct exportlist *, struct grouplist *,
-	    int *, int *, struct ucred *));
+int	do_mount(struct exportlist *, struct grouplist *, int, struct ucred *,
+	    char *, int, struct statfs *);
+int	do_opt(char **, char **, struct exportlist *, struct grouplist *,
+	    int *, int *, struct ucred *);
 struct	exportlist *ex_search(fsid_t *);
 struct	exportlist *get_exp(void);
 void	free_dir(struct dirlist *);
@@ -178,8 +177,8 @@ void	get_mountlist(void);
 int	get_net(char *, struct netmsk *, int);
 void	getexp_err(struct exportlist *, struct grouplist *);
 struct grouplist *get_grp(void);
-void	hang_dirp __P((struct dirlist *, struct grouplist *,
-	    struct exportlist *, int));
+void	hang_dirp(struct dirlist *, struct grouplist *, struct exportlist *,
+	    int);
 void	mntsrv(struct svc_req *, SVCXPRT *);
 void	nextfield(char **, char **);
 void	out_of_mem(void);
diff --git a/sbin/newlfs/extern.h b/sbin/newlfs/extern.h
index b0f100b080b..553448d4701 100644
--- a/sbin/newlfs/extern.h
+++ b/sbin/newlfs/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:37 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.5 2002/02/17 19:42:28 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.2 1995/03/18 14:58:48 cgd Exp $	*/
 
 /*-
@@ -40,8 +40,8 @@ u_long	cksum(void *, size_t);
 u_short	dkcksum(struct disklabel *);
 void	fatal(const char *fmt, ...);
 u_int	log2(u_int);
-int	make_lfs __P((int, struct disklabel *, struct partition *, int,
-		int, int, int));
+int	make_lfs(int, struct disklabel *, struct partition *, int,
+	    int, int, int);
 int	mkfs(struct partition *, char *, int, int);
 
 extern char	*progname;
diff --git a/sbin/photurisd/userdefs.h b/sbin/photurisd/userdefs.h
index 0cf4f801024..bcabe3a5d70 100644
--- a/sbin/photurisd/userdefs.h
+++ b/sbin/photurisd/userdefs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: userdefs.h,v 1.3 2001/01/28 22:45:18 niklas Exp $ */
+/* $OpenBSD: userdefs.h,v 1.4 2002/02/17 19:42:28 millert Exp $ */
 /*
  * Copyright 1997-2000 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -54,7 +54,6 @@
 
 #ifdef _AIX
 #define NEED_UTYPES
-#define __P(x) x
 #define SYS_MACHINE
 #define SYS_LTYPES
 #define NEED_STRSEP
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 955b261adde..9ee45cf730d 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping6.c,v 1.41 2002/02/16 21:27:37 millert Exp $	*/
+/*	$OpenBSD: ping6.c,v 1.42 2002/02/17 19:42:29 millert Exp $	*/
 /*	$KAME: ping6.c,v 1.129 2001/06/22 13:16:02 itojun Exp $	*/
 
 /*
@@ -270,8 +270,8 @@ void	 pr_suptypes(struct icmp6_nodeinfo *, size_t);
 void	 pr_nodeaddr(struct icmp6_nodeinfo *, int);
 int	 myechoreply(const struct icmp6_hdr *);
 int	 mynireply(const struct icmp6_nodeinfo *);
-char *dnsdecode __P((const u_char **, const u_char *, const u_char *,
-	u_char *, size_t));
+char	*dnsdecode(const u_char **, const u_char *, const u_char *, u_char *,
+	    size_t);
 void	 pr_pack(u_char *, int, struct msghdr *);
 void	 pr_exthdrs(struct msghdr *);
 void	 pr_ip6opt(void *);
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index b49a0e0fc06..577d17a801f 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quotacheck.c,v 1.12 2002/02/16 21:27:37 millert Exp $	*/
+/*	$OpenBSD: quotacheck.c,v 1.13 2002/02/17 19:42:29 millert Exp $	*/
 /*	$NetBSD: quotacheck.c,v 1.12 1996/03/30 22:34:25 mark Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #else
-static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.12 2002/02/16 21:27:37 millert Exp $";
+static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.13 2002/02/17 19:42:29 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -115,8 +115,7 @@ struct fileusage *
 	 addid(u_long, int, char *);
 char	*blockcheck(char *);
 void	 bread(daddr_t, char *, long);
-int	 chkquota __P((const char *, const char *,
-			const char *, void *, pid_t *));
+int	 chkquota(const char *, const char *, const char *, void *, pid_t *);
 void	 freeinodebuf(void);
 struct dinode *
 	 getnextinode(ino_t);
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 8582ba184dc..d287ffba8b3 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:37 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.5 2002/02/17 19:42:29 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.4 1995/03/18 14:59:43 cgd Exp $	*/
 
 /*-
@@ -60,7 +60,7 @@ void		 freeentry(struct entry *);
 void		 freename(char *);
 int	 	 genliteraldir(char *, ino_t);
 char		*gentempname(struct entry *);
-void		 getfile __P((void (*)(char *, long), void (*)(char *, long)));
+void		 getfile(void (*)(char *, long), void (*)(char *, long));
 void		 getvol(long);
 void		 initsymtable(char *);
 int	 	 inodetype(ino_t);
@@ -99,7 +99,7 @@ void	 	 skipdirs(void);
 void		 skipfile(void);
 void		 skipmaps(void);
 void		 swabst(u_char *, u_char *);
-void	 	 treescan __P((char *, ino_t, long (*)(char *, ino_t, int)));
+void	 	 treescan(char *, ino_t, long (*)(char *, ino_t, int));
 ino_t		 upperbnd(ino_t);
 long		 verifyfile(char *, ino_t, int);
 void		 xtrnull(char *, long);
diff --git a/share/man/man9/audio.9 b/share/man/man9/audio.9
index 93c4e353205..69fc2de54b4 100644
--- a/share/man/man9/audio.9
+++ b/share/man/man9/audio.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: audio.9,v 1.9 2002/02/16 21:27:39 millert Exp $
+.\"	$OpenBSD: audio.9,v 1.10 2002/02/17 19:42:29 millert Exp $
 .\"	$NetBSD: audio.9,v 1.14 2000/02/11 22:56:15 kleink Exp $
 .\"
 .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -55,18 +55,18 @@ struct audio_hw_if {
 	int	(*drain)(void *);
 
 	int	(*query_encoding)(void *, struct audio_encoding *);
-	int	(*set_params)__P((void *, int, int,
-			struct audio_params *, struct audio_params *));
+	int	(*set_params)(void *, int, int,
+		    struct audio_params *, struct audio_params *);
 	int	(*round_blocksize)(void *, int);
 
 	int	(*commit_settings)(void *);
 
 	int	(*init_output)(void *, void *, int);
 	int	(*init_input)(void *, void *, int);
-	int	(*start_output)__P((void *, void *, int,
-				    void (*)(void *), void *));
-	int	(*start_input)__P((void *, void *, int,
-				   void (*)(void *), void *));
+	int	(*start_output)(void *, void *, int,
+		    void (*)(void *), void *);
+	int	(*start_input)(void *, void *, int,
+		    void (*)(void *), void *);
 	int	(*halt_output)(void *);
 	int	(*halt_input)(void *);
 
@@ -89,10 +89,10 @@ struct audio_hw_if {
 
 	int 	(*get_props)(void *);
 
-	int	(*trigger_output)__P((void *, void *, void *, int,
-			void (*)(void *), void *, struct audio_params *));
-	int	(*trigger_input)__P((void *, void *, void *, int,
-			void (*)(void *), void *, struct audio_params *));
+	int	(*trigger_output)(void *, void *, void *, int,
+		    void (*)(void *), void *, struct audio_params *);
+	int	(*trigger_input)(void *, void *, void *, int,
+		    void (*)(void *), void *, struct audio_params *);
 };
 
 struct audio_params {
diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c
index e63c0821c2f..995ab78eab9 100644
--- a/usr.bin/cdio/cdio.c
+++ b/usr.bin/cdio/cdio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdio.c,v 1.19 2002/02/16 21:27:44 millert Exp $	*/
+/*	$OpenBSD: cdio.c,v 1.20 2002/02/17 19:42:30 millert Exp $	*/
 /*
  * Compact Disc Control Utility by Serge V. Vakulenko <vak@cronyx.ru>.
  * Based on the non-X based CD player by Jean-Marc Zucconi and
@@ -122,8 +122,7 @@ int		play_prev(char *arg);
 int		play_same(char *arg);
 char            *input(int *);
 void            prtrack(struct cd_toc_entry *e, int lastflag);
-void            lba2msf __P((unsigned long lba,
-                            u_char *m, u_char *s, u_char *f));
+void            lba2msf(unsigned long lba, u_char *m, u_char *s, u_char *f);
 unsigned int    msf2lba(u_char m, u_char s, u_char f);
 int             play_blocks(int blk, int len);
 int             run(int cmd, char *arg);
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index d5da9a614cb..16621dbfe0a 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.8 2002/02/16 21:27:46 millert Exp $	*/
+/*	$OpenBSD: file.h,v 1.9 2002/02/17 19:42:30 millert Exp $	*/
 
 /*
  * file.h - definitions for file(1) program
@@ -79,17 +79,6 @@ struct magic {
 	char desc[MAXDESC];	/* description */
 };
 
-#include <stdio.h>	/* Include that here, to make sure __P gets defined */
-
-#ifndef __P
-# ifdef __STDC__ || __cplusplus
-#  define __P(a) a
-# else
-#  define __P(a) ()
-#  define const
-# endif
-#endif
-
 extern int   apprentice(char *, int);
 extern int   ascmagic(unsigned char *, int);
 extern void  ckfputs(const char *, FILE *);
diff --git a/usr.bin/file/internat.c b/usr.bin/file/internat.c
index 6ffe9e34232..efd6fcaf893 100644
--- a/usr.bin/file/internat.c
+++ b/usr.bin/file/internat.c
@@ -1,5 +1,6 @@
-/*	$OpenBSD: internat.c,v 1.1 1997/02/09 23:58:26 millert Exp $	*/
+/*	$OpenBSD: internat.c,v 1.2 2002/02/17 19:42:30 millert Exp $	*/
 
+#include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 0c57a93ba3b..7fed8964877 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softmagic.c,v 1.6 2002/02/16 21:27:46 millert Exp $	*/
+/*	$OpenBSD: softmagic.c,v 1.7 2002/02/17 19:42:30 millert Exp $	*/
 
 /*
  * softmagic - interpret variable magic from /etc/magic
@@ -37,12 +37,11 @@
 #include "file.h"
 
 #ifndef	lint
-static char *moduleid = "$OpenBSD: softmagic.c,v 1.6 2002/02/16 21:27:46 millert Exp $";
+static char *moduleid = "$OpenBSD: softmagic.c,v 1.7 2002/02/17 19:42:30 millert Exp $";
 #endif	/* lint */
 
 static int match(unsigned char *, int);
-static int mget		__P((union VALUETYPE *,
-			     unsigned char *, struct magic *, int));
+static int mget(union VALUETYPE *, unsigned char *, struct magic *, int);
 static int mcheck(union VALUETYPE *, struct magic *);
 static int32 mprint(union VALUETYPE *, struct magic *);
 static void mdebug(int32, char *, int);
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 7a86d1e38ef..446b21e57b8 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: function.c,v 1.22 2002/02/16 21:27:46 millert Exp $	*/
+/*	$OpenBSD: function.c,v 1.23 2002/02/17 19:42:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)function.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: function.c,v 1.22 2002/02/16 21:27:46 millert Exp $";
+static char rcsid[] = "$OpenBSD: function.c,v 1.23 2002/02/17 19:42:30 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -77,7 +77,7 @@ static char rcsid[] = "$OpenBSD: function.c,v 1.22 2002/02/16 21:27:46 millert E
 	}								\
 }
 
-static PLAN *palloc __P((enum ntype, int (*)(PLAN *, FTSENT *)));
+static PLAN *palloc(enum ntype, int (*)(PLAN *, FTSENT *));
 
 extern int dotfd;
 extern time_t now;
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index 6b0411ec95e..f5b7cc43b94 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.21 2002/02/16 21:27:46 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.22 2002/02/17 19:42:30 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.17 1997/08/18 10:20:19 lukem Exp $	*/
 
 /*
@@ -141,8 +141,8 @@ void	pwd(int, char **);
 void	quit(int, char **);
 void	quote(int, char **);
 void	quote1(const char *, int, char **);
-void    recvrequest __P((const char *, const char *, const char *,
-	    const char *, int, int));
+void    recvrequest(const char *, const char *, const char *,
+	    const char *, int, int);
 void	reget(int, char **);
 char   *remglob(char **, int, char **);
 off_t	remotesize(const char *, int);
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 994055f1171..d98dc88909a 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,5 +1,5 @@
 /*
- *	$OpenBSD: locate.c,v 1.11 2002/02/16 21:27:48 millert Exp $
+ *	$OpenBSD: locate.c,v 1.12 2002/02/17 19:42:31 millert Exp $
  *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: locate.c,v 1.11 2002/02/16 21:27:48 millert Exp $
+ *      $Id: locate.c,v 1.12 2002/02/17 19:42:31 millert Exp $
  */
 
 #ifndef lint
@@ -50,7 +50,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: locate.c,v 1.11 2002/02/16 21:27:48 millert Exp $";
+static char rcsid[] = "$OpenBSD: locate.c,v 1.12 2002/02/17 19:42:31 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -102,9 +102,6 @@ static char rcsid[] = "$OpenBSD: locate.c,v 1.11 2002/02/16 21:27:48 millert Exp
 
 #ifdef sun
 #include <netinet/in.h> /* SunOS byteorder(3) htohl(3) */
-#ifndef __P
-#define __P(x) x
-#endif
 #endif
 
 #include "locate.h"
diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c
index 8caa2483e39..8d5603c999c 100644
--- a/usr.bin/nc/netcat.c
+++ b/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.43 2002/02/17 03:24:56 ericj Exp $ */
+/* $OpenBSD: netcat.c,v 1.44 2002/02/17 19:42:31 millert Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  *
@@ -70,7 +70,7 @@ int timeout;
 int family = AF_UNSPEC;
 char *portlist[PORT_MAX];
 
-ssize_t	atomicio __P((ssize_t (*)(), int, void *, size_t));
+ssize_t	atomicio(ssize_t (*)(), int, void *, size_t);
 void	atelnet(int, unsigned char *, unsigned int);
 void	build_ports(char *);
 void	help(void);
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index ffcd82ab76a..3845bf90f55 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netstat.h,v 1.20 2002/02/16 21:27:50 millert Exp $	*/
+/*	$OpenBSD: netstat.h,v 1.21 2002/02/17 19:42:31 millert Exp $	*/
 /*	$NetBSD: netstat.h,v 1.6 1996/05/07 02:55:05 thorpej Exp $	*/
 
 /*
@@ -151,5 +151,4 @@ void	mrt_stats(u_long, u_long);
 void	atalkprotopr(u_long, char *);
 void	ddp_stats(u_long, char *);
 char	*atalk_print(const struct sockaddr *, int);
-char	*atalk_print2 __P((const struct sockaddr *,
-		const struct sockaddr *, int));
+char	*atalk_print2(const struct sockaddr *, const struct sockaddr *, int);
diff --git a/usr.bin/oldrdist/defs.h b/usr.bin/oldrdist/defs.h
index ba1eb915836..ed73ab7cdda 100644
--- a/usr.bin/oldrdist/defs.h
+++ b/usr.bin/oldrdist/defs.h
@@ -1,4 +1,4 @@
-/* *	$OpenBSD: defs.h,v 1.9 2002/02/16 21:27:50 millert Exp $*/
+/* *	$OpenBSD: defs.h,v 1.10 2002/02/17 19:42:31 millert Exp $*/
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -166,8 +166,7 @@ struct namelist *
 char	*exptilde(char [], char *, int);
 void	 fatal(const char *, ...);
 int	 inlist(struct namelist *, char *);
-void	 insert __P((char *,
-	    struct namelist *, struct namelist *, struct subcmd *));
+void	 insert(char *, struct namelist *, struct namelist *, struct subcmd *);
 void	 install(char *, char *, int, int);
 void	 log(FILE *, const char *, ...);
 struct namelist *
diff --git a/usr.bin/oldrdist/docmd.c b/usr.bin/oldrdist/docmd.c
index aa7974b1b19..0816e91260c 100644
--- a/usr.bin/oldrdist/docmd.c
+++ b/usr.bin/oldrdist/docmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: docmd.c,v 1.15 2002/02/16 21:27:50 millert Exp $	*/
+/*	$OpenBSD: docmd.c,v 1.16 2002/02/17 19:42:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)docmd.c	8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: docmd.c,v 1.15 2002/02/16 21:27:50 millert Exp $";
+static char *rcsid = "$OpenBSD: docmd.c,v 1.16 2002/02/17 19:42:31 millert Exp $";
 #endif /* not lint */
 
 #include "defs.h"
@@ -51,10 +51,8 @@ static int	 makeconn(char *);
 static int	 okname(char *);
 static void	 closeconn(void);
 static void	 cmptime(char *);
-static void	 doarrow __P((char **,
-		    struct namelist *, char *, struct subcmd *));
-static void	 dodcolon __P((char **,
-		    struct namelist *, char *, struct subcmd *));
+static void	 doarrow(char **, struct namelist *, char *, struct subcmd *);
+static void	 dodcolon(char **, struct namelist *, char *, struct subcmd *);
 static void	 notify(char *, char *, struct namelist *, time_t);
 static void	 rcmptime(struct stat *);
 
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index aff94f9d14a..ef3bc5d6366 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quota.c,v 1.18 2002/02/16 21:27:51 millert Exp $	*/
+/*	$OpenBSD: quota.c,v 1.19 2002/02/17 19:42:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -44,7 +44,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: quota.c,v 1.18 2002/02/16 21:27:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: quota.c,v 1.19 2002/02/17 19:42:31 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -87,14 +87,13 @@ struct quotause {
 #define	FOUND	0x01
 
 int	alldigits(char *);
-int	callaurpc __P((char *, int, int, int, xdrproc_t, void *,
-	    xdrproc_t, void *));
+int	callaurpc(char *, int, int, int, xdrproc_t, void *, xdrproc_t, void *);
 int	main(int, char **);
-int	getnfsquota __P((struct statfs *, struct fstab *, struct quotause *,
-	    long, int));
+int	getnfsquota(struct statfs *, struct fstab *, struct quotause *,
+	    long, int);
 struct quotause	*getprivs(long id, int quotatype);
-int	getufsquota __P((struct statfs *, struct fstab *, struct quotause *,
-	    long, int));
+int	getufsquota(struct statfs *, struct fstab *, struct quotause *,
+	    long, int);
 void	heading(int, u_long, const char *, const char *);
 void	showgid(gid_t);
 void	showgrpname(const char *);
diff --git a/usr.bin/rlogin/kcmd.c b/usr.bin/rlogin/kcmd.c
index 400bc2e8668..aa12550961d 100644
--- a/usr.bin/rlogin/kcmd.c
+++ b/usr.bin/rlogin/kcmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kcmd.c,v 1.14 2002/02/16 21:27:51 millert Exp $	*/
+/*	$OpenBSD: kcmd.c,v 1.15 2002/02/17 19:42:31 millert Exp $	*/
 /*	$NetBSD: kcmd.c,v 1.2 1995/03/21 07:58:32 cgd Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 static char Xsccsid[] = "derived from @(#)rcmd.c 5.17 (Berkeley) 6/27/88";
 static char sccsid[] = "@(#)kcmd.c	8.2 (Berkeley) 8/19/93";
 #else
-static char rcsid[] = "$OpenBSD: kcmd.c,v 1.14 2002/02/16 21:27:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: kcmd.c,v 1.15 2002/02/17 19:42:31 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -73,10 +73,10 @@ static char rcsid[] = "$OpenBSD: kcmd.c,v 1.14 2002/02/16 21:27:51 millert Exp $
 #define	START_PORT	5120	 /* arbitrary */
 
 int	getport(int *);
-int	kcmd __P((int *, char **, u_short, char *, char *, char *,
+int	kcmd(int *, char **, u_short, char *, char *, char *,
 	    int *, KTEXT, char *, char *, CREDENTIALS *,
 	    Key_schedule, MSG_DAT *, struct sockaddr_in *,
-	    struct sockaddr_in *, long));
+	    struct sockaddr_in *, long);
 
 int
 kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, ticket, service, realm,
diff --git a/usr.bin/rlogin/krcmd.c b/usr.bin/rlogin/krcmd.c
index fa0d85feeff..a50cf3584c0 100644
--- a/usr.bin/rlogin/krcmd.c
+++ b/usr.bin/rlogin/krcmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: krcmd.c,v 1.9 2002/02/16 21:27:51 millert Exp $	*/
+/*	$OpenBSD: krcmd.c,v 1.10 2002/02/17 19:42:31 millert Exp $	*/
 /*	$NetBSD: krcmd.c,v 1.2 1995/03/21 07:58:36 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)krcmd.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: krcmd.c,v 1.9 2002/02/16 21:27:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: krcmd.c,v 1.10 2002/02/17 19:42:31 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -60,12 +60,12 @@ static char rcsid[] = "$OpenBSD: krcmd.c,v 1.9 2002/02/16 21:27:51 millert Exp $
 
 #define	SERVICE_NAME	"rcmd"
 
-int	kcmd __P((int *, char **, u_short, char *, char *, char *, int *,
+int	kcmd(int *, char **, u_short, char *, char *, char *, int *,
 	    KTEXT, char *, char *, CREDENTIALS *, Key_schedule, MSG_DAT *,
-	    struct sockaddr_in *, struct sockaddr_in *, long));
+	    struct sockaddr_in *, struct sockaddr_in *, long);
 int	krcmd(char **, u_short, char *, char *, int *, char *);
-int	krcmd_mutual __P((char **, u_short, char *, char *, int *, char *,
-	    CREDENTIALS *, Key_schedule));
+int	krcmd_mutual(char **, u_short, char *, char *, int *, char *,
+	    CREDENTIALS *, Key_schedule);
 
 /*
  * krcmd: simplified version of Athena's "kcmd"
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index d0f04dccbd9..8f26b31ca6a 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlogin.c,v 1.28 2002/02/16 21:27:51 millert Exp $	*/
+/*	$OpenBSD: rlogin.c,v 1.29 2002/02/17 19:42:31 millert Exp $	*/
 /*	$NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: rlogin.c,v 1.28 2002/02/16 21:27:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: rlogin.c,v 1.29 2002/02/17 19:42:31 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -93,8 +93,8 @@ int des_read(int, char *, int);
 int des_write(int, char *, int);
 
 int krcmd(char **, u_short, char *, char *, int *, char *);
-int krcmd_mutual __P((char **, u_short, char *, char *, int *, char *,
-		      CREDENTIALS *, Key_schedule));
+int krcmd_mutual(char **, u_short, char *, char *, int *, char *,
+    CREDENTIALS *, Key_schedule);
 #endif
 
 #ifndef TIOCPKT_WINDOW
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index df220cb2d4c..1549077fd57 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rsh.c,v 1.23 2002/02/16 21:27:52 millert Exp $	*/
+/*	$OpenBSD: rsh.c,v 1.24 2002/02/17 19:42:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1990 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rsh.c	5.24 (Berkeley) 7/1/91";*/
-static char rcsid[] = "$OpenBSD: rsh.c,v 1.23 2002/02/16 21:27:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: rsh.c,v 1.24 2002/02/17 19:42:31 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -81,8 +81,8 @@ int des_read(int, char *, int);
 int des_write(int, char *, int);
 
 int krcmd(char **, u_short, char *, char *, int *, char *);
-int krcmd_mutual __P((char **, u_short, char *, char *, int *, char *,
-		      CREDENTIALS *, Key_schedule));
+int krcmd_mutual(char **, u_short, char *, char *, int *, char *,
+    CREDENTIALS *, Key_schedule);
 #endif
 
 void usage(void);
diff --git a/usr.bin/sort/extern.h b/usr.bin/sort/extern.h
index a5d5e332fe5..f9b5c3d1031 100644
--- a/usr.bin/sort/extern.h
+++ b/usr.bin/sort/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:52 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.5 2002/02/17 19:42:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,29 +38,28 @@
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
  */
 
-void	 append  __P((u_char **, int, int, FILE *, void (*)(), struct field *));
+void	 append(u_char **, int, int, FILE *, void (*)(), struct field *);
 void	 concat(FILE *, FILE *);
-length_t enterkey __P((RECHEADER *,
-	    DBT *, int, struct field *));
+length_t enterkey(RECHEADER *, DBT *, int, struct field *);
 void	 fixit(int *, char **);
 void	 fldreset(struct field *);
 FILE	*ftmp(void);
-void	 fmerge __P((int, union f_handle,
-	    int, int (*)(), FILE *, void (*)(), struct field *));
+void	 fmerge(int, union f_handle,
+	    int, int (*)(), FILE *, void (*)(), struct field *);
 void	 fsort(int, int, union f_handle, int, FILE *, struct field *);
-int	 geteasy __P((int, union f_handle,
-	    int, RECHEADER *, u_char *, struct field *));
-int	 getnext __P((int, union f_handle,
-	    int, RECHEADER *, u_char *, struct field *));
-int	 makekey __P((int, union f_handle,
-	    int, RECHEADER *, u_char *, struct field *));
-int	 makeline __P((int, union f_handle,
-	    int, RECHEADER *, u_char *, struct field *));
-void	 merge __P((int, int, int (*)(), FILE *, void (*)(), struct field *));
+int	 geteasy(int, union f_handle,
+	    int, RECHEADER *, u_char *, struct field *);
+int	 getnext(int, union f_handle,
+	    int, RECHEADER *, u_char *, struct field *);
+int	 makekey(int, union f_handle,
+	    int, RECHEADER *, u_char *, struct field *);
+int	 makeline(int, union f_handle,
+	    int, RECHEADER *, u_char *, struct field *);
+void	 merge(int, int, int (*)(), FILE *, void (*)(), struct field *);
 void	 num_init(void);
 void	 onepass(u_char **, int, long, long *, u_char *, FILE *);
 int	 optval(int, int);
-void	 order __P((union f_handle, int (*)(), struct field *));
+void	 order(union f_handle, int (*)(), struct field *);
 void	 putline(RECHEADER *, FILE *);
 void	 putrec(RECHEADER *, FILE *);
 void	 rd_append(int, union f_handle, int, FILE *, u_char *, u_char *);
diff --git a/usr.bin/ssh/auth.h b/usr.bin/ssh/auth.h
index 4bb8f81f46a..6a42dae77d1 100644
--- a/usr.bin/ssh/auth.h
+++ b/usr.bin/ssh/auth.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $OpenBSD: auth.h,v 1.27 2002/02/16 21:27:53 millert Exp $
+ * $OpenBSD: auth.h,v 1.28 2002/02/17 19:42:32 millert Exp $
  */
 #ifndef AUTH_H
 #define AUTH_H
@@ -80,9 +80,8 @@ struct KbdintDevice
 {
 	const char *name;
 	void*	(*init_ctx)(Authctxt*);
-	int	(*query)	__P((void *ctx, char **name, char **infotxt,
-				u_int *numprompts, char ***prompts,
-				u_int **echo_on));
+	int	(*query)(void *ctx, char **name, char **infotxt,
+		    u_int *numprompts, char ***prompts, u_int **echo_on);
 	int	(*respond)(void *ctx, u_int numresp, char **responses);
 	void	(*free_ctx)(void *ctx);
 };
diff --git a/usr.bin/sup/src/expand.c b/usr.bin/sup/src/expand.c
index 82e93d67310..01c61b9a5be 100644
--- a/usr.bin/sup/src/expand.c
+++ b/usr.bin/sup/src/expand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expand.c,v 1.12 2002/02/16 21:27:54 millert Exp $	*/
+/*	$OpenBSD: expand.c,v 1.13 2002/02/17 19:42:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -89,14 +89,6 @@ static	int	bufcnt;			/* current number in buffer */
 
 #define fixit(a) (a[0] ? a : ".")
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(a)	a
-#else
-#define __P(a)	()
-#endif
-#endif
-
 int expand(char *, char **, int);
 static void glob(char *);
 static void matchdir(char *);
diff --git a/usr.bin/sup/src/stree.c b/usr.bin/sup/src/stree.c
index bb9958eb4c9..4f9224dd637 100644
--- a/usr.bin/sup/src/stree.c
+++ b/usr.bin/sup/src/stree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stree.c,v 1.9 2002/02/16 21:27:54 millert Exp $	*/
+/*	$OpenBSD: stree.c,v 1.10 2002/02/17 19:42:33 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -67,7 +67,7 @@ Static TREE *Trothl(TREE *, TREE *);
 Static TREE *Trothh(TREE *, TREE *);
 Static void Tbalance(TREE **);
 Static TREE *Tinsertavl(TREE **, char *, int, int *);
-Static int Tsubprocess __P((TREE *, int, int (*f )(TREE *, void *), void *));
+Static int Tsubprocess(TREE *, int, int (*f )(TREE *, void *), void *);
 Static int Tprintone(TREE *, void *);
 
 
diff --git a/usr.bin/sup/src/supextern.h b/usr.bin/sup/src/supextern.h
index b2e234e8fa4..d371c9417a5 100644
--- a/usr.bin/sup/src/supextern.h
+++ b/usr.bin/sup/src/supextern.h
@@ -1,12 +1,4 @@
-/*     $OpenBSD: supextern.h,v 1.6 2002/02/16 21:27:54 millert Exp $  */
-
-#ifndef __P
-#ifdef __STDC__
-#define __P(a)	a
-#else
-#define	__P(a) ()
-#endif
-#endif
+/*     $OpenBSD: supextern.h,v 1.7 2002/02/17 19:42:33 millert Exp $  */
 
 /* atoo.c */
 unsigned int atoo(char *);
@@ -118,8 +110,8 @@ void Tfree(TREE **);
 TREE *Tinsert(TREE **, char *, int);
 TREE *Tsearch(TREE *, char *);
 TREE *Tlookup(TREE *, char *);
-int Trprocess __P((TREE *, int (*)(TREE *, void *), void *));
-int Tprocess __P((TREE *, int (*)(TREE *, void *), void *));
+int Trprocess(TREE *, int (*)(TREE *, void *), void *);
+int Tprocess(TREE *, int (*)(TREE *, void *), void *);
 void Tprint(TREE *, char *);
 
 /* supcmeat.c */
@@ -172,7 +164,7 @@ int msglist(void);
 int msgneed(void);
 int msgdeny(void);
 int msgsend(void);
-int msgrecv __P((int (*)(TREE *, va_list), ...));
+int msgrecv(int (*)(TREE *, va_list), ...);
 int msgdone(void);
 int msggoaway(void);
 int msgxpatch(void);
diff --git a/usr.bin/top/machine.h b/usr.bin/top/machine.h
index 15671cad50a..62bcd6e4c1a 100644
--- a/usr.bin/top/machine.h
+++ b/usr.bin/top/machine.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machine.h,v 1.3 2002/02/16 21:27:55 millert Exp $	*/
+/*	$OpenBSD: machine.h,v 1.4 2002/02/17 19:42:33 millert Exp $	*/
 
 /*
  *  This file defines the interface between top and the machine-dependent
@@ -58,9 +58,8 @@ extern int display_init(struct statics *);
 extern int machine_init(struct statics *);
 extern char *format_header(char *);
 extern void get_system_info(struct system_info *);
-extern caddr_t get_process_info __P((struct system_info *,
-				     struct process_select *,
-				     int (*)(const void *, const void *)));
-extern char *format_next_process __P((caddr_t, char *(*)()));
+extern caddr_t get_process_info(struct system_info *, struct process_select *,
+    int (*)(const void *, const void *));
+extern char *format_next_process(caddr_t, char *(*)());
 extern int proc_compate(const void *, const void *);
 extern int proc_owner(pid_t);
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 8deb52474f3..22154bfac9e 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsort.c,v 1.12 2002/02/16 21:27:55 millert Exp $ */
+/* $OpenBSD: tsort.c,v 1.13 2002/02/17 19:42:33 millert Exp $ */
 /* ex:ts=8 sw=4: 
  */
 
@@ -132,8 +132,8 @@ static struct node *node_lookup(struct ohash *, const char *, const char *);
 static void usage(void);
 static struct node *new_node(const char *, const char *);
 
-static unsigned int read_pairs __P((FILE *, struct ohash *, int, 
-    const char *, unsigned int, int));
+static unsigned int read_pairs(FILE *, struct ohash *, int, 
+    const char *, unsigned int, int);
 static void split_nodes(struct ohash *, struct array *, struct array *);
 static void make_transparent(struct ohash *);
 static void insert_arc(struct node *, struct node *);
@@ -143,8 +143,8 @@ static void dump_node(struct node *);
 static void dump_array(struct array *);
 static void dump_hash(struct ohash *);
 #endif
-static unsigned int read_hints __P((FILE *, struct ohash *, int, 
-    const char *, unsigned int));
+static unsigned int read_hints(FILE *, struct ohash *, int, 
+    const char *, unsigned int);
 static struct node *find_smallest_node(struct array *);
 static struct node *find_good_cycle_break(struct array *);
 static void print_cycle(struct array *);
diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c
index 362f994b329..1be43e2bea7 100644
--- a/usr.bin/vi/cl/cl_main.c
+++ b/usr.bin/vi/cl/cl_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cl_main.c,v 1.12 2002/02/16 21:27:56 millert Exp $	*/
+/*	$OpenBSD: cl_main.c,v 1.13 2002/02/17 19:42:33 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -43,7 +43,7 @@ static void	   cl_func_std(GS *);
 static CL_PRIVATE *cl_init(GS *);
 static GS	  *gs_init(char *);
 static void	   perr(char *, char *);
-static int	   setsig __P((int, struct sigaction *, void (*)(int)));
+static int	   setsig(int, struct sigaction *, void (*)(int));
 static void	   sig_end(GS *);
 static void	   term_init(char *, char *);
 
diff --git a/usr.bin/vi/cl/cl_read.c b/usr.bin/vi/cl/cl_read.c
index cef45baa5ba..ab1bc97b0b7 100644
--- a/usr.bin/vi/cl/cl_read.c
+++ b/usr.bin/vi/cl/cl_read.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cl_read.c,v 1.10 2002/02/16 21:27:56 millert Exp $	*/
+/*	$OpenBSD: cl_read.c,v 1.11 2002/02/17 19:42:33 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -37,8 +37,8 @@ static const char sccsid[] = "@(#)cl_read.c	10.15 (Berkeley) 9/24/96";
 #include "../ex/script.h"
 #include "cl.h"
 
-static input_t	cl_read __P((SCR *,
-    u_int32_t, CHAR_T *, size_t, int *, struct timeval *));
+static input_t	cl_read(SCR *,
+		    u_int32_t, CHAR_T *, size_t, int *, struct timeval *);
 static int	cl_resize(SCR *, size_t, size_t);
 
 /*
diff --git a/usr.bin/vi/common/search.c b/usr.bin/vi/common/search.c
index 72effe783ad..d6251effab8 100644
--- a/usr.bin/vi/common/search.c
+++ b/usr.bin/vi/common/search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: search.c,v 1.7 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -142,8 +142,7 @@ prev:			if (sp->re == NULL) {
  * f_search --
  *	Do a forward search.
  *
- * PUBLIC: int f_search __P((SCR *,
- * PUBLIC:    MARK *, MARK *, char *, size_t, char **, u_int));
+ * PUBLIC: int f_search(SCR *, MARK *, MARK *, char *, size_t, char **, u_int);
  */
 int
 f_search(sp, fm, rm, ptrn, plen, eptrn, flags)
@@ -286,8 +285,7 @@ f_search(sp, fm, rm, ptrn, plen, eptrn, flags)
  * b_search --
  *	Do a backward search.
  *
- * PUBLIC: int b_search __P((SCR *,
- * PUBLIC:    MARK *, MARK *, char *, size_t, char **, u_int));
+ * PUBLIC: int b_search(SCR *, MARK *, MARK *, char *, size_t, char **, u_int);
  */
 int
 b_search(sp, fm, rm, ptrn, plen, eptrn, flags)
diff --git a/usr.bin/vi/common/seq.c b/usr.bin/vi/common/seq.c
index b1cea0c3832..6c4c05917ed 100644
--- a/usr.bin/vi/common/seq.c
+++ b/usr.bin/vi/common/seq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: seq.c,v 1.5 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: seq.c,v 1.6 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -32,8 +32,8 @@ static const char sccsid[] = "@(#)seq.c	10.10 (Berkeley) 3/30/96";
  * seq_set --
  *	Internal version to enter a sequence.
  *
- * PUBLIC: int seq_set __P((SCR *, CHAR_T *,
- * PUBLIC:    size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int));
+ * PUBLIC: int seq_set(SCR *, CHAR_T *,
+ * PUBLIC:    size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int);
  */
 int
 seq_set(sp, name, nlen, input, ilen, output, olen, stype, flags)
diff --git a/usr.bin/vi/ex/ex_argv.c b/usr.bin/vi/ex/ex_argv.c
index adbef09c463..27dd8022429 100644
--- a/usr.bin/vi/ex/ex_argv.c
+++ b/usr.bin/vi/ex/ex_argv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_argv.c,v 1.9 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: ex_argv.c,v 1.10 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -32,8 +32,8 @@ static const char sccsid[] = "@(#)ex_argv.c	10.26 (Berkeley) 9/20/96";
 
 static int argv_alloc(SCR *, size_t);
 static int argv_comp(const void *, const void *);
-static int argv_fexp __P((SCR *, EXCMD *,
-	char *, size_t, char *, size_t *, char **, size_t *, int));
+static int argv_fexp(SCR *, EXCMD *,
+	char *, size_t, char *, size_t *, char **, size_t *, int);
 static int argv_lexp(SCR *, EXCMD *, char *);
 static int argv_sexp(SCR *, char **, size_t *, size_t *);
 
diff --git a/usr.bin/vi/ex/ex_cscope.c b/usr.bin/vi/ex/ex_cscope.c
index 3d8c7324095..3abcfc4e41a 100644
--- a/usr.bin/vi/ex/ex_cscope.c
+++ b/usr.bin/vi/ex/ex_cscope.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_cscope.c,v 1.7 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: ex_cscope.c,v 1.8 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1994, 1996
@@ -93,8 +93,7 @@ static CC const cscope_cmds[] = {
 
 static TAGQ	*create_cs_cmd(SCR *, char *, size_t *);
 static int	 csc_help(SCR *, char *);
-static void	 csc_file __P((SCR *,
-		    CSC *, char *, char **, size_t *, int *));
+static void	 csc_file(SCR *, CSC *, char *, char **, size_t *, int *);
 static int	 get_paths(SCR *, CSC *);
 static CC const	*lookup_ccmd(char *);
 static int	 parse(SCR *, CSC *, TAGQ *, int *);
diff --git a/usr.bin/vi/ex/ex_filter.c b/usr.bin/vi/ex/ex_filter.c
index 79de29a70d3..61505204348 100644
--- a/usr.bin/vi/ex/ex_filter.c
+++ b/usr.bin/vi/ex/ex_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_filter.c,v 1.5 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: ex_filter.c,v 1.6 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -37,8 +37,8 @@ static int filter_ldisplay(SCR *, FILE *);
  *	replace the original text with the stdout/stderr output of
  *	the utility.
  *
- * PUBLIC: int ex_filter __P((SCR *, 
- * PUBLIC:    EXCMD *, MARK *, MARK *, MARK *, char *, enum filtertype));
+ * PUBLIC: int ex_filter(SCR *, 
+ * PUBLIC:    EXCMD *, MARK *, MARK *, MARK *, char *, enum filtertype);
  */
 int
 ex_filter(sp, cmdp, fm, tm, rp, cmd, ftype)
diff --git a/usr.bin/vi/ex/ex_subst.c b/usr.bin/vi/ex/ex_subst.c
index f2dee8a61d6..bb10bcea575 100644
--- a/usr.bin/vi/ex/ex_subst.c
+++ b/usr.bin/vi/ex/ex_subst.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_subst.c,v 1.11 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: ex_subst.c,v 1.12 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -36,8 +36,7 @@ static const char sccsid[] = "@(#)ex_subst.c	10.37 (Berkeley) 9/15/96";
 
 static int re_conv(SCR *, char **, size_t *, int *);
 static int re_cscope_conv(SCR *, char **, size_t *, int *);
-static int re_sub __P((SCR *,
-		char *, char **, size_t *, size_t *, regmatch_t [10]));
+static int re_sub(SCR *, char *, char **, size_t *, size_t *, regmatch_t [10]);
 static int re_tag_conv(SCR *, char **, size_t *, int *);
 static int s(SCR *, EXCMD *, char *, regex_t *, u_int);
 
@@ -889,8 +888,8 @@ err:		rval = 1;
  * re_compile --
  *	Compile the RE.
  *
- * PUBLIC: int re_compile __P((SCR *,
- * PUBLIC:     char *, size_t, char **, size_t *, regex_t *, u_int));
+ * PUBLIC: int re_compile(SCR *,
+ * PUBLIC:     char *, size_t, char **, size_t *, regex_t *, u_int);
  */
 int
 re_compile(sp, ptrn, plen, ptrnp, lenp, rep, flags)
diff --git a/usr.bin/vi/ex/ex_util.c b/usr.bin/vi/ex/ex_util.c
index ffb807f4466..5e330e049d1 100644
--- a/usr.bin/vi/ex/ex_util.c
+++ b/usr.bin/vi/ex/ex_util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_util.c,v 1.5 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: ex_util.c,v 1.6 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -33,8 +33,7 @@ static const char sccsid[] = "@(#)ex_util.c	10.23 (Berkeley) 6/19/96";
  * ex_cinit --
  *	Create an EX command structure.
  *
- * PUBLIC: void ex_cinit __P((EXCMD *,
- * PUBLIC:    int, int, recno_t, recno_t, int, ARGS **));
+ * PUBLIC: void ex_cinit(EXCMD *, int, int, recno_t, recno_t, int, ARGS **);
  */
 void
 ex_cinit(cmdp, cmd_id, naddr, lno1, lno2, force, ap)
diff --git a/usr.bin/vi/ex/ex_write.c b/usr.bin/vi/ex/ex_write.c
index 0f2921c593a..d44e8c51a8a 100644
--- a/usr.bin/vi/ex/ex_write.c
+++ b/usr.bin/vi/ex/ex_write.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_write.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: ex_write.c,v 1.7 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -274,8 +274,8 @@ exwr(sp, cmdp, cmd)
  * ex_writefp --
  *	Write a range of lines to a FILE *.
  *
- * PUBLIC: int ex_writefp __P((SCR *,
- * PUBLIC:    char *, FILE *, MARK *, MARK *, u_long *, u_long *, int));
+ * PUBLIC: int ex_writefp(SCR *,
+ * PUBLIC:    char *, FILE *, MARK *, MARK *, u_long *, u_long *, int);
  */
 int
 ex_writefp(sp, name, fp, fm, tm, nlno, nch, silent)
diff --git a/usr.bin/vi/include/com_extern.h b/usr.bin/vi/include/com_extern.h
index cd9735dcb4d..34caf560158 100644
--- a/usr.bin/vi/include/com_extern.h
+++ b/usr.bin/vi/include/com_extern.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: com_extern.h,v 1.4 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: com_extern.h,v 1.5 2002/02/17 19:42:34 millert Exp $	*/
 
 #ifndef HAVE_BSEARCH
-void	*bsearch __P((const void *, const void *, size_t,
-   size_t, int (*)(const void *, const void *)));
+void	*bsearch(const void *, const void *, size_t,
+   size_t, int (*)(const void *, const void *));
 #endif
 #ifndef HAVE_SETENV
 int setenv(const char *, const char *, int);
@@ -177,13 +177,11 @@ int rcv_read(SCR *, FREF *);
 int screen_init(GS *, SCR *, SCR **);
 int screen_end(SCR *);
 SCR *screen_next(SCR *);
-int f_search __P((SCR *,
-   MARK *, MARK *, char *, size_t, char **, u_int));
-int b_search __P((SCR *,
-   MARK *, MARK *, char *, size_t, char **, u_int));
+int f_search(SCR *, MARK *, MARK *, char *, size_t, char **, u_int);
+int b_search(SCR *, MARK *, MARK *, char *, size_t, char **, u_int);
 void search_busy(SCR *, busy_t);
-int seq_set __P((SCR *, CHAR_T *,
-   size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int));
+int seq_set(SCR *, CHAR_T *,
+   size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int);
 int seq_delete(SCR *, CHAR_T *, size_t, seq_t);
 int seq_mdel(SEQ *);
 SEQ *seq_find
diff --git a/usr.bin/vi/include/ex_extern.h b/usr.bin/vi/include/ex_extern.h
index 9372d714eda..e787ed1ae9a 100644
--- a/usr.bin/vi/include/ex_extern.h
+++ b/usr.bin/vi/include/ex_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_extern.h,v 1.6 2002/02/16 21:27:58 millert Exp $	*/
+/*	$OpenBSD: ex_extern.h,v 1.7 2002/02/17 19:42:34 millert Exp $	*/
 
 int ex(SCR **);
 int ex_cmd(SCR *);
@@ -34,8 +34,7 @@ int ex_display(SCR *, EXCMD *);
 int ex_edit(SCR *, EXCMD *);
 int ex_equal(SCR *, EXCMD *);
 int ex_file(SCR *, EXCMD *);
-int ex_filter __P((SCR *, 
-   EXCMD *, MARK *, MARK *, MARK *, char *, enum filtertype));
+int ex_filter(SCR *, EXCMD *, MARK *, MARK *, MARK *, char *, enum filtertype);
 int ex_global(SCR *, EXCMD *);
 int ex_v(SCR *, EXCMD *);
 int ex_g_insdel(SCR *, lnop_t, recno_t);
@@ -87,8 +86,7 @@ int ex_stop(SCR *, EXCMD *);
 int ex_s(SCR *, EXCMD *);
 int ex_subagain(SCR *, EXCMD *);
 int ex_subtilde(SCR *, EXCMD *);
-int re_compile __P((SCR *,
-    char *, size_t, char **, size_t *, regex_t *, u_int));
+int re_compile(SCR *, char *, size_t, char **, size_t *, regex_t *, u_int);
 void re_error(SCR *, int, regex_t *);
 int ex_tag_first(SCR *, char *);
 int ex_tag_push(SCR *, EXCMD *);
@@ -110,8 +108,7 @@ int ex_undo(SCR *, EXCMD *);
 int ex_help(SCR *, EXCMD *);
 int ex_usage(SCR *, EXCMD *);
 int ex_viusage(SCR *, EXCMD *);
-void ex_cinit __P((EXCMD *,
-   int, int, recno_t, recno_t, int, ARGS **));
+void ex_cinit(EXCMD *, int, int, recno_t, recno_t, int, ARGS **);
 void ex_cadd(EXCMD *, ARGS *, char *, size_t);
 int ex_getline(SCR *, FILE *, size_t *);
 int ex_ncheck(SCR *, int);
@@ -123,7 +120,6 @@ int ex_wn(SCR *, EXCMD *);
 int ex_wq(SCR *, EXCMD *);
 int ex_write(SCR *, EXCMD *);
 int ex_xit(SCR *, EXCMD *);
-int ex_writefp __P((SCR *,
-   char *, FILE *, MARK *, MARK *, u_long *, u_long *, int));
+int ex_writefp(SCR *, char *, FILE *, MARK *, MARK *, u_long *, u_long *, int);
 int ex_yank(SCR *, EXCMD *);
 int ex_z(SCR *, EXCMD *);
diff --git a/usr.bin/vi/include/vi_extern.h b/usr.bin/vi/include/vi_extern.h
index ebc1d721a62..df253ae0f78 100644
--- a/usr.bin/vi/include/vi_extern.h
+++ b/usr.bin/vi/include/vi_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vi_extern.h,v 1.7 2002/02/16 21:27:58 millert Exp $	*/
+/*	$OpenBSD: vi_extern.h,v 1.8 2002/02/17 19:42:34 millert Exp $	*/
 
 int cs_init(SCR *, VCS *);
 int cs_next(SCR *, VCS *);
@@ -84,8 +84,8 @@ int v_sentencef(SCR *, VICMD *);
 int v_sentenceb(SCR *, VICMD *);
 int v_status(SCR *, VICMD *);
 int v_tcmd(SCR *, VICMD *, ARG_CHAR_T, u_int);
-int v_txt __P((SCR *, VICMD *, MARK *,
-   const char *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t));
+int v_txt(SCR *, VICMD *, MARK *,
+   const char *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t);
 int v_txt_auto(SCR *, recno_t, TEXT *, size_t, TEXT *);
 int v_ulcase(SCR *, VICMD *);
 int v_mulcase(SCR *, VICMD *);
diff --git a/usr.bin/vi/vi/v_txt.c b/usr.bin/vi/vi/v_txt.c
index e1b3a3f14d2..ab787db588d 100644
--- a/usr.bin/vi/vi/v_txt.c
+++ b/usr.bin/vi/vi/v_txt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: v_txt.c,v 1.12 2002/02/16 21:27:58 millert Exp $	*/
+/*	$OpenBSD: v_txt.c,v 1.13 2002/02/17 19:42:34 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -243,8 +243,8 @@ txt_map_end(sp)
  * v_txt --
  *	Vi text input.
  *
- * PUBLIC: int v_txt __P((SCR *, VICMD *, MARK *,
- * PUBLIC:    const char *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t));
+ * PUBLIC: int v_txt(SCR *, VICMD *, MARK *,
+ * PUBLIC:    const char *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t);
  */
 int
 v_txt(sp, vp, tm, lp, len, prompt, ai_line, rcount, flags)
diff --git a/usr.bin/xlint/lint2/chk.c b/usr.bin/xlint/lint2/chk.c
index 65431ca2be3..792e9fa9f19 100644
--- a/usr.bin/xlint/lint2/chk.c
+++ b/usr.bin/xlint/lint2/chk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chk.c,v 1.7 2002/02/16 21:27:59 millert Exp $	*/
+/*	$OpenBSD: chk.c,v 1.8 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: chk.c,v 1.2 1995/07/03 21:24:42 cgd Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: chk.c,v 1.7 2002/02/16 21:27:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: chk.c,v 1.8 2002/02/17 19:42:35 millert Exp $";
 #endif
 
 #include <stdlib.h>
@@ -54,14 +54,12 @@ static	void	chkmd(hte_t *);
 static	void	chkvtui(hte_t *, sym_t *, sym_t *);
 static	void	chkvtdi(hte_t *, sym_t *, sym_t *);
 static	void	chkfaui(hte_t *, sym_t *, sym_t *);
-static	void	chkau __P((hte_t *, int, sym_t *, sym_t *, pos_t *,
-			   fcall_t *, fcall_t *, type_t *, type_t *));
+static	void	chkau(hte_t *, int, sym_t *, sym_t *, pos_t *,
+		   fcall_t *, fcall_t *, type_t *, type_t *);
 static	void	chkrvu(hte_t *, sym_t *);
 static	void	chkadecl(hte_t *, sym_t *, sym_t *);
-static	void	printflike __P((hte_t *,fcall_t *, int,
-				const char *, type_t **));
-static	void	scanflike __P((hte_t *, fcall_t *, int,
-			       const char *, type_t **));
+static	void	printflike(hte_t *,fcall_t *, int, const char *, type_t **);
+static	void	scanflike(hte_t *, fcall_t *, int, const char *, type_t **);
 static	void	badfmt(hte_t *, fcall_t *);
 static	void	inconarg(hte_t *, fcall_t *, int);
 static	void	tofewarg(hte_t *, fcall_t *);
diff --git a/usr.bin/xlint/lint2/externs2.h b/usr.bin/xlint/lint2/externs2.h
index d9d23667309..148eae113af 100644
--- a/usr.bin/xlint/lint2/externs2.h
+++ b/usr.bin/xlint/lint2/externs2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: externs2.h,v 1.3 2002/02/16 21:27:59 millert Exp $	*/
+/*	$OpenBSD: externs2.h,v 1.4 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: externs2.h,v 1.2 1995/07/03 21:24:46 cgd Exp $	*/
 
 /*
@@ -52,7 +52,7 @@ extern	int	Fflag;
  */
 extern	void	inithash(void);
 extern	hte_t	*hsearch(const char *, int);
-extern	void	forall __P((void (*)(hte_t *)));
+extern	void	forall(void (*)(hte_t *));
 
 /*
  * read.c
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 398576a421f..ecc8e1dc44b 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ac.c,v 1.10 2002/02/16 21:28:00 millert Exp $";
+static char rcsid[] = "$Id: ac.c,v 1.11 2002/02/17 19:42:35 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -89,8 +89,8 @@ struct utmp_list	*log_in(struct utmp_list *, struct utmp *);
 struct utmp_list	*log_out(struct utmp_list *, struct utmp *);
 int			on_console(struct utmp_list *);
 void			show(char *, time_t);
-void			show_today __P((struct user_list *, struct utmp_list *,
-			    time_t));
+void			show_today(struct user_list *, struct utmp_list *,
+			    time_t);
 void			show_users(struct user_list *);
 struct user_list	*update_user(struct user_list *, char *, time_t);
 void			usage(void);
diff --git a/usr.sbin/afs/src/lib/acl/acl.h b/usr.sbin/afs/src/lib/acl/acl.h
index 4a90b8abae2..923f8f682b9 100644
--- a/usr.sbin/afs/src/lib/acl/acl.h
+++ b/usr.sbin/afs/src/lib/acl/acl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: acl.h,v 1.2 2002/02/16 21:28:00 millert Exp $ */
+/* $Id: acl.h,v 1.3 2002/02/17 19:42:35 millert Exp $ */
 
 #ifndef __ACL_H
 #define __ACL_H
@@ -46,10 +46,6 @@
 #include <stds.h>
 #endif
 
-#ifndef __P
-#define __P(x) x
-#endif
-
 void acl_canonicalize_principal(char *principal, char *canon);
 int acl_initialize(char *acl_file, int perm);
 int acl_exact_match(char *acl, char *principal);
diff --git a/usr.sbin/afs/src/rxkad/rxkad.h b/usr.sbin/afs/src/rxkad/rxkad.h
index 3ab7a79a693..b4110712b9f 100644
--- a/usr.sbin/afs/src/rxkad/rxkad.h
+++ b/usr.sbin/afs/src/rxkad/rxkad.h
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-/* @(#)$Id: rxkad.h,v 1.3 2002/02/16 21:28:00 millert Exp $ */
+/* @(#)$Id: rxkad.h,v 1.4 2002/02/17 19:42:35 millert Exp $ */
 
 #ifndef __RXKAD_H
 #define __RXKAD_H
@@ -65,35 +65,31 @@ extern int rxkad_min_level;	/* enforce min level at client end */
 
 extern int rxkad_EpochWasSet;
 
-#ifndef __P
-#define __P(x) x
-#endif
-
-int32 rxkad_GetServerInfo __P((struct rx_connection *con,
-			       rxkad_level *level,
-			       u_int32 *expiration,
-			       char *name,
-			       char *instance,
-			       char *cell,
-			       int32 *kvno));
+int32 rxkad_GetServerInfo(struct rx_connection *con,
+			  rxkad_level *level,
+			  u_int32 *expiration,
+			  char *name,
+			  char *instance,
+			  char *cell,
+			  int32 *kvno);
 
 struct rx_securityClass *
-rxkad_NewServerSecurityObject __P((/*rxkad_level*/ int min_level,
-				   void *appl_data,
-				   int (*get_key)(void *appl_data,
-						  int kvno,
-						  des_cblock *key),
-				   int (*user_ok)(char *name,
-						  char *inst,
-						  char *realm,
-						  int kvno)));
+rxkad_NewServerSecurityObject(/*rxkad_level*/ int min_level,
+			      void *appl_data,
+			      int (*get_key)(void *appl_data,
+			      int kvno,
+			      des_cblock *key),
+			      int (*user_ok)(char *name,
+					     char *inst,
+					     char *realm,
+					     int kvno));
 
 struct rx_securityClass *
-rxkad_NewClientSecurityObject __P((/*rxkad_level*/ int level,
-				   void *sessionkey,
-				   int32 kvno,
-				   int ticketLen,
-				   char *ticket));
+rxkad_NewClientSecurityObject(/*rxkad_level*/ int level,
+			      void *sessionkey,
+			      int32 kvno,
+			      int ticketLen,
+			      char *ticket);
 
 #define RXKADINCONSISTENCY	(19270400L)
 #define RXKADPACKETSHORT	(19270401L)
@@ -144,25 +140,25 @@ int time_to_life(u_int32 start, u_int32 end);
 int tkt_CheckTimes(int32 begin, int32 end, int32 now);
 
 int
-tkt_MakeTicket __P((char *ticket,
-		    int *ticketLen,
-		    struct ktc_encryptionKey *key,
-		    char *name, char *inst, char *cell,
-		    u_int32 start, u_int32 end,
-		    struct ktc_encryptionKey *sessionKey,
-		    u_int32 host,
-		    char *sname, char *sinst));
+tkt_MakeTicket(char *ticket,
+	       int *ticketLen,
+	       struct ktc_encryptionKey *key,
+	       char *name, char *inst, char *cell,
+	       u_int32 start, u_int32 end,
+	       struct ktc_encryptionKey *sessionKey,
+	       u_int32 host,
+	       char *sname, char *sinst);
 
 int
-tkt_DecodeTicket __P((char *asecret,
-		      int32 ticketLen,
-		      struct ktc_encryptionKey *key,
-		      char *name,
-		      char *inst,
-		      char *cell,
-		      char *sessionKey,
-		      int32 *host,
-		      int32 *start,
-		      int32 *end));
+tkt_DecodeTicket(char *asecret,
+		 int32 ticketLen,
+		 struct ktc_encryptionKey *key,
+		 char *name,
+		 char *inst,
+		 char *cell,
+		 char *sessionKey,
+		 int32 *host,
+		 int32 *start,
+		 int32 *end);
 
 #endif /* __RXKAD_H */
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 5017fdda174..16e516ab684 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.16 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: config.h,v 1.17 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $	*/
 
 /*
@@ -55,12 +55,6 @@
 #if !defined(MAKE_BOOTSTRAP) && defined(BSD)
 #include <sys/cdefs.h>
 #include <paths.h>
-#else /* ...BSD */
-#if defined(__STDC__) || defined(__cplusplus)
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#else /* ...STDC */
-#define	__P(protos)	()		/* traditional C preprocessor */
-#endif /* ...STDC */
 #endif /* ...BSD */
 
 #ifdef __STDC__
@@ -384,8 +378,7 @@ char	*sourcepath(const char *);
 void	error(const char *, ...);			/* immediate errs */
 void	xerror(const char *, int, const char *, ...);	/* delayed errs */
 __dead void panic(const char *, ...);
-struct nvlist *newnv __P((const char *, const char *, void *, int,
-	    struct nvlist *));
+struct nvlist *newnv(const char *, const char *, void *, int, struct nvlist *);
 void	nvfree(struct nvlist *);
 void	nvfreel(struct nvlist *);
 
diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c
index 4245d2fe5b9..e57cffc7a7d 100644
--- a/usr.sbin/config/files.c
+++ b/usr.sbin/config/files.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: files.c,v 1.9 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: files.c,v 1.10 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: files.c,v 1.6 1996/03/17 13:18:17 cgd Exp $	*/
 
 /*
@@ -72,8 +72,8 @@ static int	checkaux(const char *, void *);
 static int	fixcount(const char *, void *);
 static int	fixfsel(const char *, void *);
 static int	fixsel(const char *, void *);
-static int	expr_eval __P((struct nvlist *,
-		    int (*)(const char *, void *), void *));
+static int	expr_eval(struct nvlist *,
+		    int (*)(const char *, void *), void *);
 static void	expr_free(struct nvlist *);
 
 void
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 03a0e2acc22..4feedfd8ab5 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.23 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.24 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $	*/
 
 /*
@@ -74,8 +74,8 @@ static struct nvlist **nextdefopt;
 static struct nvlist **nextmkopt;
 
 static __dead void stop(void);
-static int do_option __P((struct hashtab *, struct nvlist ***,
-			const char *, const char *, const char *));
+static int do_option(struct hashtab *, struct nvlist ***,
+    const char *, const char *, const char *);
 static int crosscheck(void);
 static int badstar(void);
 static int mksymlinks(void);
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index 2abf276e3b9..009516850b2 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.c,v 1.23 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: sem.c,v 1.24 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: sem.c,v 1.10 1996/11/11 23:40:11 gwr Exp $	*/
 
 /*
@@ -80,10 +80,10 @@ static struct devi **nextpseudo;
 static int has_errobj(struct nvlist *, void *);
 static struct nvlist *addtoattr(struct nvlist *, struct devbase *);
 static int exclude(struct nvlist *, const char *, const char *);
-static int resolve __P((struct nvlist **, const char *, const char *,
-			struct nvlist *, int));
-static int lresolve __P((struct nvlist **, const char *, const char *,
-			struct nvlist *, int));
+static int resolve(struct nvlist **, const char *, const char *,
+    struct nvlist *, int);
+static int lresolve(struct nvlist **, const char *, const char *,
+    struct nvlist *, int);
 static struct devi *newdevi(const char *, int, struct devbase *d);
 static struct devi *getdevi(const char *);
 static const char *concat(const char *, int);
diff --git a/usr.sbin/config/sem.h b/usr.sbin/config/sem.h
index 89dfa079738..5e1fb471f22 100644
--- a/usr.sbin/config/sem.h
+++ b/usr.sbin/config/sem.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.h,v 1.9 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: sem.h,v 1.10 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: sem.h,v 1.6 1996/11/11 23:40:10 gwr Exp $	*/
 
 /*
@@ -50,10 +50,9 @@ void		enddefs(void);
 void		setdefmaxusers(int, int, int);
 void		setmaxusers(int);
 int		defattr(const char *, struct nvlist *);
-void		defdev __P((struct devbase *, int, struct nvlist *,
-			struct nvlist *));
-void		defdevattach __P((struct deva *, struct devbase *,
-			struct nvlist *, struct nvlist *));
+void		defdev(struct devbase *, int, struct nvlist *, struct nvlist *);
+void		defdevattach(struct deva *, struct devbase *,
+		    struct nvlist *, struct nvlist *);
 struct devbase *getdevbase(const char *name);
 struct deva    *getdevattach(const char *name);
 struct attr    *getattr(const char *name);
diff --git a/usr.sbin/eeprom/defs.h b/usr.sbin/eeprom/defs.h
index f51f9217aad..8be7394133a 100644
--- a/usr.sbin/eeprom/defs.h
+++ b/usr.sbin/eeprom/defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.3 2002/02/16 21:28:02 millert Exp $	*/
+/*	$OpenBSD: defs.h,v 1.4 2002/02/17 19:42:36 millert Exp $	*/
 /*	$NetBSD: defs.h,v 1.2 1996/02/28 01:13:20 thorpej Exp $	*/
 
 /*-
@@ -83,8 +83,7 @@ struct	strvaltabent {
  */
 struct	extabent {
 	char	*ex_keyword;		/* keyword for this entry */
-	void	(*ex_handler) __P((struct extabent *,
-		    struct opiocdesc *, char *));
+	void	(*ex_handler)(struct extabent *, struct opiocdesc *, char *);
 					/* handler function for this entry */
 };
 #endif /* __sparc__ */
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index 335b90d8332..d65735ea160 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lp.h,v 1.7 2002/02/16 21:28:03 millert Exp $	*/
+/*	$OpenBSD: lp.h,v 1.8 2002/02/17 19:42:36 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -113,7 +113,7 @@ void     dump(char *, char *, int);
 void	 fatal(const char *, ...);
 int	 getline(FILE *);
 int	 getport(char *, int);
-int	 getq __P((struct queue *(*[])));
+int	 getq(struct queue *(*[]));
 void     header(void);
 void     inform(char *);
 int      inlist(char *, char *);
diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c
index 4fdcc9ea833..ffe94ae536f 100644
--- a/usr.sbin/map-mbone/mapper.c
+++ b/usr.sbin/map-mbone/mapper.c
@@ -100,9 +100,9 @@ char *			graph_name(u_int32_t addr, char *buf);
 void			graph_edges(Node *node);
 void			elide_aliases(Node *node);
 void			graph_map(void);
-int			get_number __P((int *var, int deflt, char ***pargv,
-						int *pargc));
-u_int32_t			host_addr(char *name);
+int			get_number(int *var, int deflt, char ***pargv,
+			    int *pargc);
+u_int32_t		host_addr(char *name);
 
 
 Node *find_node(addr, ptr)
diff --git a/usr.sbin/mopd/common/file.h b/usr.sbin/mopd/common/file.h
index 076e31b8e50..9c6df070eb9 100644
--- a/usr.sbin/mopd/common/file.h
+++ b/usr.sbin/mopd/common/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: file.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: file.h,v 1.5 2002/02/17 19:42:36 millert Exp $
  *
  */
 
@@ -58,11 +58,10 @@ void	mopFileSwapX(u_char *, int, int);
 int	CheckMopFile(int);
 int	GetMopFileInfo(int, u_long *, u_long *);
 int	CheckAOutFile(int);
-int	GetAOutFileInfo __P((int, u_long *, u_long *, u_long *, u_long *,
-			     u_long *, u_long *, u_long *, u_long *, int *));
-int	GetFileInfo     __P((int, u_long *, u_long *, int *,
-			     u_long *, u_long *, u_long *, u_long *,
-			     u_long *, u_long *));
+int	GetAOutFileInfo(int, u_long *, u_long *, u_long *, u_long *,
+			u_long *, u_long *, u_long *, u_long *, int *);
+int	GetFileInfo(int, u_long *, u_long *, int *, u_long *, u_long *,
+		    u_long *, u_long *, u_long *, u_long *);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/get.h b/usr.sbin/mopd/common/get.h
index 03c32018325..c70bb6cfee8 100644
--- a/usr.sbin/mopd/common/get.h
+++ b/usr.sbin/mopd/common/get.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: get.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: get.h,v 1.5 2002/02/17 19:42:36 millert Exp $
  *
  */
 
@@ -51,8 +51,8 @@ u_short	mopGetShort(u_char *,int *);
 u_long	mopGetLong(u_char *,int *);
 void	mopGetMulti(u_char *,int *,u_char *,int);
 int	mopGetTrans(u_char *, int);
-void	mopGetHeader __P((u_char *, int *, u_char **, u_char **, u_short *,
-			  int *, int));
+void	mopGetHeader(u_char *, int *, u_char **, u_char **, u_short *,
+		     int *, int);
 u_short	mopGetLength(u_char *, int);
 __END_DECLS
 #endif
diff --git a/usr.sbin/mopd/common/print.h b/usr.sbin/mopd/common/print.h
index d79f58e27c2..6d4ab04a1a9 100644
--- a/usr.sbin/mopd/common/print.h
+++ b/usr.sbin/mopd/common/print.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: print.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: print.h,v 1.5 2002/02/17 19:42:36 millert Exp $
  *
  */
 
@@ -56,8 +56,7 @@ void	mopPrintHeader(FILE *, u_char *, int);
 void	mopPrintMopHeader(FILE *, u_char *, int);
 void	mopPrintDevice(FILE *, u_char);
 void	mopPrintTime(FILE *, u_char *);
-void	mopPrintInfo      __P((FILE *, u_char *, int *, u_short,
-			       u_char, int));
+void	mopPrintInfo(FILE *, u_char *, int *, u_short, u_char, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/mopd/process.h b/usr.sbin/mopd/mopd/process.h
index c500738cab1..e825cc35789 100644
--- a/usr.sbin/mopd/mopd/process.h
+++ b/usr.sbin/mopd/mopd/process.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: process.h,v 1.4 2002/02/17 19:42:36 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: process.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: process.h,v 1.4 2002/02/17 19:42:36 millert Exp $
  *
  */
 
@@ -42,10 +42,10 @@ void	mopProcessRC (/* FILE *, struct if_info *, u_char *, int *,
 			 u_char *, u_char *, int, u_short */);
 #else
 __BEGIN_DECLS
-void	mopProcessDL __P((FILE *, struct if_info *, u_char *, int *,
-			  u_char *, u_char *, int, u_short));
-void	mopProcessRC __P((FILE *, struct if_info *, u_char *, int *,
-			  u_char *, u_char *, int, u_short));
+void	mopProcessDL(FILE *, struct if_info *, u_char *, int *,
+		     u_char *, u_char *, int, u_short);
+void	mopProcessRC(FILE *, struct if_info *, u_char *, int *,
+		     u_char *, u_char *, int, u_short);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index 7f6e6c8480e..1fbd584aeac 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -108,9 +108,9 @@ vifi_t  numvifs;		/* to keep loader happy */
 char *			inet_name(u_int32_t addr);
 void			ask(u_int32_t dst);
 void			ask2(u_int32_t dst);
-int			get_number __P((int *var, int deflt, char ***pargv,
-					int *pargc));
-u_int32_t			host_addr(char *name);
+int			get_number(int *var, int deflt, char ***pargv,
+			    int *pargc);
+u_int32_t		host_addr(char *name);
 void			usage(void);
 
 /* to shut up -Wstrict-prototypes */
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 666e11a561e..b5c6150a910 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -36,14 +36,6 @@
 #include <sys/un.h>
 #endif /* RSRR */
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(x)	x
-#else
-#define __P(x)	()
-#endif
-#endif
-
 typedef void (*cfunc_t)(void *);
 typedef void (*ihfunc_t)(int, fd_set *);
 
@@ -167,41 +159,35 @@ extern int		register_input_handler(int fd, ihfunc_t func);
 /* igmp.c */
 extern void		init_igmp(void);
 extern void		accept_igmp(int recvlen);
-extern void		send_igmp __P((u_int32_t src, u_int32_t dst, int type,
-						int code, u_int32_t group,
-						int datalen));
+extern void		send_igmp(u_int32_t src, u_int32_t dst, int type,
+			    int code, u_int32_t group, int datalen);
 
 /* callout.c */
 extern void		callout_init(void);
 extern void		age_callout_queue(void);
-extern int		timer_setTimer __P((int delay, cfunc_t action,
-						char *data));
+extern int		timer_setTimer(int delay, cfunc_t action, char *data);
 extern void		timer_clearTimer(int timer_id);
 
 /* route.c */
 extern void		init_routes(void);
 extern void		start_route_updates(void);
-extern void		update_route __P((u_int32_t origin, u_int32_t mask,
-						u_int metric, u_int32_t src,
-						vifi_t vifi));
+extern void		update_route(u_int32_t origin, u_int32_t mask,
+			    u_int metric, u_int32_t src, vifi_t vifi);
 extern void		age_routes(void);
 extern void		expire_all_routes(void);
 extern void		free_all_routes(void);
-extern void		accept_probe __P((u_int32_t src, u_int32_t dst,
-						char *p, int datalen,
-						u_int32_t level));
-extern void		accept_report __P((u_int32_t src, u_int32_t dst,
-						char *p, int datalen,
-						u_int32_t level));
+extern void		accept_probe(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen, u_int32_t level);
+extern void		accept_report(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen, u_int32_t level);
 extern struct rtentry *	determine_route(u_int32_t src);
-extern void		report __P((int which_routes, vifi_t vifi,
-						u_int32_t dst));
+extern void		report(int which_routes, vifi_t vifi, u_int32_t dst);
 extern void		report_to_all_neighbors(int which_routes);
 extern int		report_next_chunk(void);
 extern void		add_vif_to_routes(vifi_t vifi);
 extern void		delete_vif_from_routes(vifi_t vifi);
-extern void		delete_neighbor_from_routes __P((u_int32_t addr,
-							vifi_t vifi));
+extern void		delete_neighbor_from_routes(u_int32_t addr,
+			    vifi_t vifi);
 extern void		dump_routes(FILE *fp);
 extern void		start_route_updates(void);
 
@@ -213,24 +199,22 @@ extern void		age_vifs(void);
 extern void		dump_vifs(FILE *fp);
 extern void		stop_all_vifs(void);
 extern struct listaddr *neighbor_info(vifi_t vifi, u_int32_t addr);
-extern void		accept_group_report __P((u_int32_t src, u_int32_t dst,
-					u_int32_t group, int r_type));
+extern void		accept_group_report(u_int32_t src, u_int32_t dst,
+			    u_int32_t group, int r_type);
 extern void		query_groups(void);
 extern void		probe_for_neighbors(void);
-extern int		update_neighbor __P((vifi_t vifi, u_int32_t addr,
-					int msgtype, char *p, int datalen,
-					u_int32_t level));
+extern int		update_neighbor(vifi_t vifi, u_int32_t addr,
+			    int msgtype, char *p, int datalen, u_int32_t level);
 extern void		accept_neighbor_request(u_int32_t src, u_int32_t dst);
-extern void		accept_neighbor_request2 __P((u_int32_t src,
-					u_int32_t dst));
-extern void		accept_neighbors __P((u_int32_t src, u_int32_t dst,
-					u_char *p, int datalen, u_int32_t level));
-extern void		accept_neighbors2 __P((u_int32_t src, u_int32_t dst,
-					u_char *p, int datalen, u_int32_t level));
-extern void		accept_leave_message __P((u_int32_t src, u_int32_t dst,
-					u_int32_t group));
-extern void		accept_membership_query __P((u_int32_t src, u_int32_t dst,
-					u_int32_t group, int tmo));
+extern void		accept_neighbor_request2(u_int32_t src, u_int32_t dst);
+extern void		accept_neighbors(u_int32_t src, u_int32_t dst,
+			    u_char *p, int datalen, u_int32_t level);
+extern void		accept_neighbors2(u_int32_t src, u_int32_t dst,
+			    u_char *p, int datalen, u_int32_t level);
+extern void		accept_leave_message(u_int32_t src, u_int32_t dst,
+			    u_int32_t group);
+extern void		accept_membership_query(u_int32_t src, u_int32_t dst,
+			    u_int32_t group, int tmo);
 
 /* config.c */
 extern void		config_vifs_from_kernel(void);
@@ -249,12 +233,12 @@ extern int		inet_cksum(u_short *addr, u_int len);
 /* prune.c */
 extern unsigned		kroutes;
 extern void		add_table_entry(u_int32_t origin, u_int32_t mcastgrp);
-extern void 		del_table_entry __P((struct rtentry *r,
-					u_int32_t mcastgrp, u_int del_flag));
+extern void 		del_table_entry(struct rtentry *r,
+			    u_int32_t mcastgrp, u_int del_flag);
 extern void		update_table_entry(struct rtentry *r);
 extern void		init_ktable(void);
-extern void 		accept_prune __P((u_int32_t src, u_int32_t dst, char *p,
-					int datalen));
+extern void 		accept_prune(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen);
 extern void		steal_sources(struct rtentry *rt);
 extern void		reset_neighbor_state(vifi_t vifi, u_int32_t addr);
 extern int		grplst_mem(vifi_t vifi, u_int32_t mcastgrp);
@@ -265,14 +249,13 @@ extern void		dump_cache(FILE *fp2);
 extern void 		update_lclgrp(vifi_t vifi, u_int32_t mcastgrp);
 extern void		delete_lclgrp(vifi_t vifi, u_int32_t mcastgrp);
 extern void		chkgrp_graft(vifi_t vifi, u_int32_t mcastgrp);
-extern void		accept_graft __P((u_int32_t src, u_int32_t dst, char *p,
-					int datalen));
-extern void 		accept_g_ack __P((u_int32_t src, u_int32_t dst, char *p,
-					int datalen));
+extern void		accept_graft(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen);
+extern void 		accept_g_ack(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen);
 /* u_int is promoted u_char */
-extern void		accept_mtrace __P((u_int32_t src, u_int32_t dst,
-					u_int32_t group, char *data, u_int no,
-					int datalen));
+extern void		accept_mtrace(u_int32_t src, u_int32_t dst,
+			    u_int32_t group, char *data, u_int no, int datalen);
 
 /* kern.c */
 extern void		k_set_rcvbuf(int bufsize);
@@ -301,8 +284,8 @@ extern struct stable *	find_grp_src();
 /* prune.c */
 extern struct gtable	*kernel_table;
 extern struct gtable	*gtp;
-extern int		find_src_grp __P((u_int32_t src, u_int32_t mask,
-					u_int32_t grp));
+extern int		find_src_grp(u_int32_t src, u_int32_t mask,
+			    u_int32_t grp);
 
 /* rsrr.c */
 extern void		rsrr_init(void);
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index cd79b73fe2c..6c3f6ba63c9 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -57,8 +57,8 @@ static struct ptable *	find_prune_entry(u_int32_t vr, struct ptable *pt);
 static void		expire_prune(vifi_t vifi, struct gtable *gt);
 static void		send_prune(struct gtable *gt);
 static void		send_graft(struct gtable *gt);
-static void		send_graft_ack __P((u_int32_t src, u_int32_t dst,
-					u_int32_t origin, u_int32_t grp));
+static void		send_graft_ack(u_int32_t src, u_int32_t dst,
+			    u_int32_t origin, u_int32_t grp);
 static void		update_kernel(struct gtable *g);
 static char *		scaletime(u_long t);
 
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index 7657cdd25ef..ec4cfc07102 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -40,14 +40,12 @@ unsigned int nroutes;			/* current number of route entries  */
 /*
  * Private functions.
  */
-static int init_children_and_leaves	__P((struct rtentry *r,
-						vifi_t parent));
+static int init_children_and_leaves(struct rtentry *r, vifi_t parent);
 static int find_route(u_int32_t origin, u_int32_t mask);
 static void create_route(u_int32_t origin, u_int32_t mask);
 static void discard_route(struct rtentry *prev_r);
 static int compare_rts(const void *rt1, const void *rt2);
-static int report_chunk		__P((struct rtentry *start_rt, vifi_t vifi,
-						u_int32_t dst));
+static int report_chunk(struct rtentry *start_rt, vifi_t vifi, u_int32_t dst);
 
 /*
  * Initialize the routing table and associated variables.
diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c
index 017dc152d19..26a1cb53b6c 100644
--- a/usr.sbin/mrouted/rsrr.c
+++ b/usr.sbin/mrouted/rsrr.c
@@ -76,11 +76,10 @@ int client_length = sizeof(client_addr);
  */
 static void	rsrr_accept(int recvlen);
 static void	rsrr_accept_iq(void);
-static int	rsrr_accept_rq __P((struct rsrr_rq *route_query, int flags,
-					struct gtable *gt_notify));
+static int	rsrr_accept_rq(struct rsrr_rq *route_query, int flags,
+		    struct gtable *gt_notify);
 static int	rsrr_send(int sendlen);
-static void	rsrr_cache __P((struct gtable *gt,
-					struct rsrr_rq *route_query));
+static void	rsrr_cache(struct gtable *gt, struct rsrr_rq *route_query);
 
 /* Initialize RSRR socket */
 void
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index ea84bc76629..71b46a989ec 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -45,8 +45,8 @@ static void DelVif(void *arg);
 static int SetTimer(int vifi, struct listaddr *g);
 static int DeleteTimer(int id);
 static void SendQuery(void *arg);
-static int SetQueryTimer __P((struct listaddr *g, vifi_t vifi, int to_expire,
-					int q_time));
+static int SetQueryTimer(struct listaddr *g, vifi_t vifi, int to_expire,
+    int q_time);
 
 
 /*
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index 81d76614a44..d0e5e9a140a 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $Id: mtrace.c,v 1.10 2002/02/16 21:28:05 millert Exp $";
+    "@(#) $Id: mtrace.c,v 1.11 2002/02/17 19:42:37 millert Exp $";
 #endif
 
 #include <netdb.h>
@@ -149,21 +149,19 @@ u_int32_t			get_netmask(int s, u_int32_t dst);
 int			get_ttl(struct resp_buf *buf);
 int			t_diff(u_long a, u_long b);
 u_long			fixtime(u_long time);
-int			send_recv __P((u_int32_t dst, int type, int code,
-					int tries, struct resp_buf *save));
+int			send_recv(u_int32_t dst, int type, int code,
+			    int tries, struct resp_buf *save);
 char *			print_host(u_int32_t addr);
 char *			print_host2(u_int32_t addr1, u_int32_t addr2);
 void			print_trace(int index, struct resp_buf *buf);
 int			what_kind(struct resp_buf *buf, char *why);
 char *			scale(int *hop);
-void			stat_line __P((struct tr_resp *r, struct tr_resp *s,
-					int have_next, int *res));
-void			fixup_stats __P((struct resp_buf *base,
-					struct resp_buf *prev,
-					struct resp_buf *new));
-int			print_stats __P((struct resp_buf *base,
-					struct resp_buf *prev,
-					struct resp_buf *new));
+void			stat_line(struct tr_resp *r, struct tr_resp *s,
+			    int have_next, int *res);
+void			fixup_stats(struct resp_buf *base,
+			    struct resp_buf *prev, struct resp_buf *new);
+int			print_stats(struct resp_buf *base,
+			    struct resp_buf *prev, struct resp_buf *new);
 void			check_vif_state(void);
 
 int			main(int argc, char *argv[]);
diff --git a/usr.sbin/named/conf/portability.h b/usr.sbin/named/conf/portability.h
index 7d4ad88e1f9..baa3e594c4b 100644
--- a/usr.sbin/named/conf/portability.h
+++ b/usr.sbin/named/conf/portability.h
@@ -260,14 +260,6 @@ struct timezoneBSD {
 };
 #endif
 
-#ifndef __P
-# if defined(__STDC__) || defined(__GNUC__)
-#  define __P(x) x
-# else
-#  define __P(x) ()
-# endif
-#endif
-
 #ifndef _TIMEZONE
 # define _TIMEZONE timezone
 #endif
diff --git a/usr.sbin/named/include/resolv.h b/usr.sbin/named/include/resolv.h
index 193c97213af..ebf9b712468 100644
--- a/usr.sbin/named/include/resolv.h
+++ b/usr.sbin/named/include/resolv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolv.h,v 1.4 2002/02/16 21:28:05 millert Exp $	*/
+/*	$OpenBSD: resolv.h,v 1.5 2002/02/17 19:42:37 millert Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1987, 1989, 1993
@@ -170,19 +170,19 @@ struct __res_state {
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
 	res_sendhookact;
 
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
-					      const u_char **query,
-					      int *querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
+typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
+					  const u_char **query,
+					  int *querylen,
+					  u_char *ans,
+					  int anssiz,
+					  int *resplen);
 
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
-					      const u_char *query,
-					      int querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
+typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
+					  const u_char *query,
+					  int querylen,
+					  u_char *ans,
+					  int anssiz,
+					  int *resplen);
 
 struct res_sym {
 	int	number;		/* Identifying number, like T_MX */
@@ -267,31 +267,30 @@ const char *	p_type(int);
 void		p_query(const u_char *);
 const u_char *	p_cdnname(const u_char *, const u_char *, int, FILE *);
 const u_char *	p_cdname(const u_char *, const u_char *, FILE *);
-const u_char *	p_fqnname __P((const u_char *cp, const u_char *msg,
-			       int, char *, int));
+const u_char *	p_fqnname(const u_char *cp, const u_char *msg,
+		   int, char *, int);
 const u_char *	p_fqname(const u_char *, const u_char *, FILE *);
 const u_char *	p_rr(const u_char *, const u_char *, FILE *);
 const char *	p_option(u_long option);
 char *		p_secstodate(u_long);
 int		dn_count_labels(char *);
-int		dn_comp __P((const char *, u_char *, int,
-			     u_char **, u_char **));
-int		dn_expand __P((const u_char *, const u_char *, const u_char *,
-			       char *, int));
+int		dn_comp(const char *, u_char *, int, u_char **, u_char **);
+int		dn_expand(const u_char *, const u_char *, const u_char *,
+		    char *, int);
 int		res_init(void);
 u_int		res_randomid(void);
 int		res_query(const char *, int, int, u_char *, int);
 int		res_search(const char *, int, int, u_char *, int);
-int		res_querydomain __P((const char *, const char *, int, int,
-				     u_char *, int));
-int		res_mkquery __P((int, const char *, int, int, const u_char *, int,
-				 const u_char *, u_char *, int));
+int		res_querydomain(const char *, const char *, int, int,
+		    u_char *, int);
+int		res_mkquery(int, const char *, int, int, const u_char *, int,
+		    const u_char *, u_char *, int);
 int		res_send(const u_char *, int, u_char *, int);
 int		res_isourserver(const struct sockaddr_in *);
-int		res_nameinquery __P((const char *, int, int,
-				     const u_char *, const u_char *));
-int		res_queriesmatch __P((const u_char *, const u_char *,
-				      const u_char *, const u_char *));
+int		res_nameinquery(const char *, int, int,
+		    const u_char *, const u_char *);
+int		res_queriesmatch(const u_char *, const u_char *,
+		    const u_char *, const u_char *);
 void		res_close(void);
 __END_DECLS
 
diff --git a/usr.sbin/named/libresolv/inet_net_ntop.c b/usr.sbin/named/libresolv/inet_net_ntop.c
index b1308b9aed9..1fb34e3cfcb 100644
--- a/usr.sbin/named/libresolv/inet_net_ntop.c
+++ b/usr.sbin/named/libresolv/inet_net_ntop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/12 10:42:05 downsj Exp $	*/
+/*	$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:37 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -21,7 +21,7 @@
 #if 0
 static const char rcsid[] = "$From: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp $";
 #else
-static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/12 10:42:05 downsj Exp $";
+static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif
 
@@ -41,8 +41,8 @@ static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/12 10:42:05
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static char *	inet_net_ntop_ipv4 __P((const u_char *src, int bits,
-					char *dst, size_t size));
+static char *inet_net_ntop_ipv4(const u_char *src, int bits, char *dst,
+    size_t size);
 
 /*
  * char *
diff --git a/usr.sbin/named/libresolv/inet_net_pton.c b/usr.sbin/named/libresolv/inet_net_pton.c
index 2f8c1e6e09d..92f1b7d3552 100644
--- a/usr.sbin/named/libresolv/inet_net_pton.c
+++ b/usr.sbin/named/libresolv/inet_net_pton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_pton.c,v 1.1 1997/03/12 10:42:05 downsj Exp $	*/
+/*	$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:37 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -21,7 +21,7 @@
 #if 0
 static const char rcsid[] = "$From: inet_net_pton.c,v 8.3 1996/11/11 06:36:52 vixie Exp $";
 #else
-static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/12 10:42:05 downsj Exp $";
+static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif
 
@@ -43,8 +43,7 @@ static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/12 10:42:05
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
-					size_t size));
+static int inet_net_pton_ipv4(const char *src, u_char *dst, size_t size);
 
 /*
  * static int
diff --git a/usr.sbin/named/libresolv/res_comp.c b/usr.sbin/named/libresolv/res_comp.c
index 9bf9acda04d..44212083295 100644
--- a/usr.sbin/named/libresolv/res_comp.c
+++ b/usr.sbin/named/libresolv/res_comp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Exp $	*/
+/*	$OpenBSD: res_comp.c,v 1.6 2002/02/17 19:42:37 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_comp.c,v 8.14 1998/05/11 04:19:47 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_comp.c,v 1.6 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -83,14 +83,14 @@ static char rcsid[] = "$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Ex
 
 static int	ns_name_ntop(const u_char *, char *, size_t);
 static int	ns_name_pton(const char *, u_char *, size_t);
-static int	ns_name_unpack __P((const u_char *, const u_char *,
-				    const u_char *, u_char *, size_t));
-static int	ns_name_pack __P((const u_char *, u_char *, int,
-				  const u_char **, const u_char **));
-static int	ns_name_uncompress __P((const u_char *, const u_char *,
-					const u_char *, char *, size_t));
-static int	ns_name_compress __P((const char *, u_char *, size_t,
-				      const u_char **, const u_char **));
+static int	ns_name_unpack(const u_char *, const u_char *,
+		    const u_char *, u_char *, size_t);
+static int	ns_name_pack(const u_char *, u_char *, int,
+		    const u_char **, const u_char **);
+static int	ns_name_uncompress(const u_char *, const u_char *,
+		    const u_char *, char *, size_t);
+static int	ns_name_compress(const char *, u_char *, size_t,
+		    const u_char **, const u_char **);
 static int	ns_name_skip(const u_char **, const u_char *);
 
 /*
diff --git a/usr.sbin/named/named-xfer/named-xfer.c b/usr.sbin/named/named-xfer/named-xfer.c
index bf365c3786a..ae2eb43a3b2 100644
--- a/usr.sbin/named/named-xfer/named-xfer.c
+++ b/usr.sbin/named/named-xfer/named-xfer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: named-xfer.c,v 1.9 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: named-xfer.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * The original version of xfer by Kevin Dunlap.
@@ -97,7 +97,7 @@ char copyright[] =
 static char sccsid[] = "@(#)named-xfer.c	4.18 (Berkeley) 3/7/91";
 static char rcsid[] = "$From: named-xfer.c,v 8.24 1998/04/07 04:59:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: named-xfer.c,v 1.9 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: named-xfer.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -158,8 +158,8 @@ static	char		*ProgName;
 
 static	void		usage(const char *);
 static	int		getzone(struct zoneinfo *, u_int32_t, int),
-			print_output __P((struct zoneinfo *, u_int32_t,
-					  u_char *, int, u_char *)),
+			print_output(struct zoneinfo *, u_int32_t,
+			    u_char *, int, u_char *),
 			netread(int, char *, int, int);
 static	SIG_FN		read_alarm();
 static	SIG_FN		term_handler();
diff --git a/usr.sbin/named/named/db_func.h b/usr.sbin/named/named/db_func.h
index f609532a78f..bcbb757217f 100644
--- a/usr.sbin/named/named/db_func.h
+++ b/usr.sbin/named/named/db_func.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_func.h,v 1.5 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: db_func.h,v 1.6 2002/02/17 19:42:37 millert Exp $	*/
 
 /* db_proc.h - prototypes for functions in db_*.c
  *
@@ -6,11 +6,11 @@
  */
 
 /* ++from db_update.c++ */
-extern int		db_update __P((char name[],
-				       struct databuf *odp,
-				       struct databuf *newdp,
-				       int flags,
-				       struct hashbuf *htp)),
+extern int		db_update(char name[],
+				  struct databuf *odp,
+				  struct databuf *newdp,
+				  int flags,
+				  struct hashbuf *htp),
 			db_cmp(struct databuf *,struct databuf *),
 			findMyZone(struct namebuf *np, int class);
 extern void		fixttl(struct databuf *dp);
@@ -37,17 +37,14 @@ extern u_int		db_getclev(const char *);
 
 /* ++from db_load.c++ */
 extern void		endline(FILE *),
-			get_netlist __P((FILE *, struct netinfo **,
-					 int, char *)),
+			get_netlist(FILE *, struct netinfo **, int, char *),
 			free_netlist(struct netinfo **);
 extern int		getword(char *, int, FILE *, int),
 			getnum(FILE *, const char *, int),
-			db_load __P((const char *, const char *,
-				     struct zoneinfo *, const char *)),
-			position_on_netlist __P((struct in_addr,
-						 struct netinfo *));
-extern struct netinfo	*addr_on_netlist __P((struct in_addr,
-					      struct netinfo *));
+			db_load(const char *, const char *,
+			    struct zoneinfo *, const char *),
+			position_on_netlist(struct in_addr, struct netinfo *);
+extern struct netinfo	*addr_on_netlist(struct in_addr, struct netinfo *);
 /* --from db_load.c-- */
 
 /* ++from db_glue.c++ */
@@ -74,12 +71,10 @@ extern char		*protocolname(int),
 #ifndef BSD
 extern int		getdtablesize(void);
 #endif
-extern struct databuf	*rm_datum __P((struct databuf *,
-				       struct namebuf *,
-				       struct databuf *));
-extern struct namebuf	*rm_name __P((struct namebuf *, 
-				      struct namebuf **,
-				      struct namebuf *));
+extern struct databuf	*rm_datum(struct databuf *, struct namebuf *,
+			    struct databuf *);
+extern struct namebuf	*rm_name(struct namebuf *, struct namebuf **,
+			    struct namebuf *);
 #ifdef INVQ
 extern void		addinv(struct namebuf *, struct databuf *),
 			rminv(struct databuf *);
@@ -87,14 +82,14 @@ struct invbuf		*saveinv(void);
 #endif
 extern char *		ctimel(long);
 extern struct in_addr	data_inaddr(const u_char *data);
-extern void		setsignal __P((int, int, SIG_FN (*)())),
-			resignal __P((int, int, SIG_FN (*)()));
+extern void		setsignal(int, int, SIG_FN (*)()),
+			resignal(int, int, SIG_FN (*)());
 extern void		db_free(struct databuf *);
 /* --from db_glue.c-- */
 
 /* ++from db_lookup.c++ */
-extern struct namebuf	*nlookup __P((const char *, struct hashbuf **,
-				      const char **, int));
+extern struct namebuf	*nlookup(const char *, struct hashbuf **,
+			    const char **, int);
 extern struct namebuf	*np_parent(struct namebuf *);
 extern int		match(struct databuf *, int, int);
 /* --from db_lookup.c-- */
diff --git a/usr.sbin/named/named/db_load.c b/usr.sbin/named/named/db_load.c
index bfafd9d96c9..00e78788cb4 100644
--- a/usr.sbin/named/named/db_load.c
+++ b/usr.sbin/named/named/db_load.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: db_load.c,v 1.6 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: db_load.c,v 1.7 2002/02/17 19:42:37 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)db_load.c	4.38 (Berkeley) 3/2/91";
 static char rcsid[] = "$From: db_load.c,v 8.33 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: db_load.c,v 1.6 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: db_load.c,v 1.7 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -117,12 +117,12 @@ static int		gettoken(register FILE *, const char *),
 			getservices(int, char *, FILE *, const char *),
 			getcharstring(char *, char *, int, int, int, FILE *, const char *);
 static void		makename(char *, const char *);
-static int		makename_ok __P((char *name, const char *origin,
-					 int class,
-					 enum transport transport,
-					 enum context context,
-					 const char *owner,
-					 const char *filename, int lineno));
+static int		makename_ok(char *name, const char *origin,
+				    int class,
+				    enum transport transport,
+				    enum context context,
+				    const char *owner,
+				    const char *filename, int lineno);
 static int		getmlword(char *, int, FILE *, int);
 static int		getallwords(char *, int, FILE *, int);
 static u_int32_t	wordtouint32(char *);
diff --git a/usr.sbin/named/named/ns_func.h b/usr.sbin/named/named/ns_func.h
index 8a64bd15a74..dc4c53c602f 100644
--- a/usr.sbin/named/named/ns_func.h
+++ b/usr.sbin/named/named/ns_func.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_func.h,v 1.3 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_func.h,v 1.4 2002/02/17 19:42:37 millert Exp $	*/
 
 /* ns_func.h - declarations for ns_*.c's externally visible functions
  *
@@ -10,61 +10,57 @@ extern void		ns_resp(u_char *, int),
 			prime_cache(void),
 			delete_all(struct namebuf *, int, int),
 			delete_stale(struct namebuf *);
-extern struct qinfo	*sysquery __P((const char *, int, int,
-				       struct in_addr *, int, int));
-extern struct notify	*findNotifyPeer __P((const struct zoneinfo *,
-					   struct in_addr));
+extern struct qinfo	*sysquery(const char *, int, int,
+			    struct in_addr *, int, int);
+extern struct notify	*findNotifyPeer(const struct zoneinfo *,
+			    struct in_addr);
 extern void		sysnotify(const char *, int, int);
-extern int		doupdate __P((u_char *, int, u_char *, int,
-				      struct databuf **, int, u_int)),
+extern int		doupdate(u_char *, int, u_char *, int,
+			    struct databuf **, int, u_int),
 			send_msg(u_char *, int, struct qinfo *),
-			findns __P((struct namebuf **, int,
-				    struct databuf **, int *, int)),
-			finddata __P((struct namebuf *, int, int, HEADER *,
-				      char **, int *, int *)),
+			findns(struct namebuf **, int,
+			    struct databuf **, int *, int),
+			finddata(struct namebuf *, int, int, HEADER *,
+			    char **, int *, int *),
 			wanted(struct databuf *, int, int),
-			add_data __P((struct namebuf *,
-				      struct databuf **,
-				      u_char *, int, int *));
+			add_data(struct namebuf *, struct databuf **,
+			    u_char *, int, int *);
 /* --from ns_resp.c-- */
 
 /* ++from ns_req.c++ */
-extern void		ns_req __P((u_char *, int, int,
-				    struct qstream *,
-				    struct sockaddr_in *,
-				    int)),
+extern void		ns_req(u_char *, int, int, struct qstream *,
+			    struct sockaddr_in *, int),
 			free_addinfo(void),
 			free_nsp(struct databuf **);
 extern int		stale(struct databuf *),
-			make_rr __P((const char *, struct databuf *,
-				     u_char *, int, int)),
+			make_rr(const char *, struct databuf *,
+			    u_char *, int, int),
 			doaddinfo(HEADER *, u_char *, int),
-			doaddauth __P((HEADER *, u_char *, int,
-				       struct namebuf *,
-				       struct databuf *));
+			doaddauth(HEADER *, u_char *, int,
+			    struct namebuf *, struct databuf *);
 #ifdef BIND_NOTIFY
-extern int		findZonePri __P((const struct zoneinfo *,
-					 const struct sockaddr_in *));
+extern int		findZonePri(const struct zoneinfo *,
+			    const struct sockaddr_in *);
 #endif
 /* --from ns_req.c-- */
 
 /* ++from ns_forw.c++ */
 extern time_t		retrytime(struct qinfo *);
-extern int		ns_forw __P((struct databuf *nsp[],
-				     u_char *msg,
-				     int msglen,
-				     struct sockaddr_in *fp,
-				     struct qstream *qsp,
-				     int dfd,
-				     struct qinfo **qpp,
-				     char *dname,
-				     int class, int type,
-				     struct namebuf *np)),
+extern int		ns_forw(struct databuf *nsp[],
+				u_char *msg,
+				int msglen,
+				struct sockaddr_in *fp,
+				struct qstream *qsp,
+				int dfd,
+				struct qinfo **qpp,
+				char *dname,
+				int class, int type,
+				struct namebuf *np),
 			haveComplained(const char *, const char *),
-			nslookup __P((struct databuf *nsp[],
-				      struct qinfo *qp,
-				      const char *syslogdname,
-				      const char *sysloginfo)),
+			nslookup(struct databuf *nsp[],
+				 struct qinfo *qp,
+				 const char *syslogdname,
+				 const char *sysloginfo),
 			qcomp(struct qserv *, struct qserv *);
 extern struct qdatagram	*aIsUs(struct in_addr);
 extern void		schedretry(struct qinfo *, time_t),
@@ -117,9 +113,8 @@ extern void		printzoneinfo(int);
 
 /* ++from ns_sort.c++ */
 extern struct netinfo	*local(struct sockaddr_in *);
-extern void		sort_response __P((u_char *, int,
-					   struct netinfo *,
-					   u_char *));
+extern void		sort_response(u_char *, int, struct netinfo *,
+			    u_char *);
 /* --from ns_sort.c-- */
 
 /* ++from ns_init.c++ */
@@ -128,10 +123,9 @@ extern void		ns_refreshtime(struct zoneinfo *, time_t),
 			ns_init(char *);
 extern enum context	ns_ptrcontext(const char *owner);
 extern enum context	ns_ownercontext(int type, enum transport);
-extern int		ns_nameok __P((const char *name, int class,
-				       enum transport, enum context,
-				       const char *owner,
-				       struct in_addr source));
+extern int		ns_nameok(const char *name, int class, enum transport,
+			    enum context, const char *owner,
+			    struct in_addr source);
 extern int		ns_wildcard(const char *name);
 /* --from ns_init.c-- */
 
@@ -151,22 +145,22 @@ extern void		ns_logstats(void);
 extern void		qtypeIncr(int qtype);
 extern struct nameser	*nameserFind(struct in_addr addr, int flags);
 #define NS_F_INSERT	0x0001
-extern void		nameserIncr __P((struct in_addr addr,
-					 enum nameserStats which));
+extern void		nameserIncr(struct in_addr addr,
+				    enum nameserStats which);
 /* --from ns_stats.c-- */
 
 /* ++from ns_validate.c++ */
 extern int
 #ifdef NCACHE
-			validate __P((char *, char *, struct sockaddr_in *,
-				      int, int, char *, int, int)),
+			validate(char *, char *, struct sockaddr_in *,
+				 int, int, char *, int, int),
 #else
-			validate __P((char *, char *, struct sockaddr_in *,
-				      int, int, char *, int)),
+			validate(char *, char *, struct sockaddr_in *,
+				 int, int, char *, int),
 #endif
-			dovalidate __P((u_char *, int, u_char *, int, int,
-					char *, struct sockaddr_in *, int *)),
+			dovalidate(u_char *, int, u_char *, int, int,
+				   char *, struct sockaddr_in *, int *),
 			update_msg(u_char *, int *, int Vlist[], int);
-extern void		store_name_addr __P((const char *, struct in_addr,
-					     const char *, const char *));
+extern void		store_name_addr(const char *, struct in_addr,
+					const char *, const char *);
 /* --from ns_validate.c-- */
diff --git a/usr.sbin/named/named/ns_init.c b/usr.sbin/named/named/ns_init.c
index 0d6d6ffe46e..7a41cba736c 100644
--- a/usr.sbin/named/named/ns_init.c
+++ b/usr.sbin/named/named/ns_init.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_init.c,v 1.7 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_init.c,v 1.8 2002/02/17 19:42:37 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_init.c	4.38 (Berkeley) 3/21/91";
 static char rcsid[] = "$From: ns_init.c,v 8.26 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_init.c,v 1.7 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_init.c,v 1.8 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -92,10 +92,9 @@ static void		zoneinit(struct zoneinfo *),
 			do_reload(char *, int, int),
 			free_forwarders(void),
 			ns_limit(const char *name, int value),
-			ns_checknames __P((const char *names,
-					   const char *severity)),
-			ns_rlimit __P((const char *name, enum limit limit,
-				       long value)),
+			ns_checknames(const char *names, const char *severity),
+			ns_rlimit(const char *name, enum limit limit,
+				  long value),
 			ns_option(const char *name);
 
 static struct zoneinfo	*find_zone(char *, int, int);
diff --git a/usr.sbin/named/named/ns_req.c b/usr.sbin/named/named/ns_req.c
index 8b1012e8fe5..0c783a7e188 100644
--- a/usr.sbin/named/named/ns_req.c
+++ b/usr.sbin/named/named/ns_req.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_req.c,v 1.8 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_req.c,v 1.9 2002/02/17 19:42:37 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_req.c	4.47 (Berkeley) 7/1/91";
 static char rcsid[] = "$From: ns_req.c,v 8.30 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_req.c,v 1.8 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_req.c,v 1.9 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -111,30 +111,30 @@ struct addinfo {
 
 enum req_action { Finish, Refuse, Return };
 
-static enum req_action	req_query __P((HEADER *hp, u_char **cpp, u_char *eom,
-				       struct qstream *qsp,
-				       int *buflenp, int *msglenp,
-				       u_char *msg, int dfd,
-				       struct sockaddr_in *from));
+static enum req_action	req_query(HEADER *hp, u_char **cpp, u_char *eom,
+				  struct qstream *qsp,
+				  int *buflenp, int *msglenp,
+				  u_char *msg, int dfd,
+				  struct sockaddr_in *from);
 
-static enum req_action	req_iquery __P((HEADER *hp, u_char **cpp, u_char *eom,
-					int *buflenp, u_char *msg,
-					struct sockaddr_in *from));
+static enum req_action	req_iquery(HEADER *hp, u_char **cpp, u_char *eom,
+				   int *buflenp, u_char *msg,
+				   struct sockaddr_in *from);
 
 #ifdef BIND_NOTIFY
-static enum req_action	req_notify __P((HEADER *hp, u_char **cpp, u_char *eom,
-					u_char *msg,struct sockaddr_in *from));
+static enum req_action	req_notify(HEADER *hp, u_char **cpp, u_char *eom,
+				   u_char *msg,struct sockaddr_in *from);
 #endif
 
 static void		fwritemsg(FILE *, u_char *, int),
-			doaxfr __P((struct namebuf *, FILE *,
-				    struct namebuf *, int)),
-			startxfr __P((struct qstream *, struct namebuf *,
-				      u_char *, int, int, const char *));
+			doaxfr(struct namebuf *, FILE *,
+			       struct namebuf *, int),
+			startxfr(struct qstream *, struct namebuf *,
+				 u_char *, int, int, const char *);
 
 static struct addinfo	addinfo[NADDRECS];
-static void		addname __P((const char *, const char *,
-				     u_int16_t, u_int16_t));
+static void		addname(const char *, const char *,
+				u_int16_t, u_int16_t);
 static void		copyCharString(u_char **, const char *);
 
 /*
diff --git a/usr.sbin/named/named/ns_resp.c b/usr.sbin/named/named/ns_resp.c
index c5d4ef9870a..10663f71eec 100644
--- a/usr.sbin/named/named/ns_resp.c
+++ b/usr.sbin/named/named/ns_resp.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_resp.c,v 1.6 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_resp.c,v 1.7 2002/02/17 19:42:37 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_resp.c	4.65 (Berkeley) 3/3/91";
 static char rcsid[] = "$From: ns_resp.c,v 8.41 1998/04/07 04:59:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_resp.c,v 1.6 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_resp.c,v 1.7 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -135,17 +135,15 @@ struct flush_set {
 	struct db_list *fs_last;
 };
 
-static void		rrsetadd __P((struct flush_set *, char *,
-				      struct databuf *)),
+static void		rrsetadd(struct flush_set *, char *, struct databuf *),
 			rrsetupdate(struct flush_set *, int flags),
 			flushrrset(struct flush_set *),
 			free_flushset(struct flush_set *);
 static int		rrsetcmp(char *, struct db_list *),
 			check_root(void),
 			check_ns(void),
-			rrextract __P((u_char *, int, u_char *,
-				       struct databuf **, char *, int,
-				       char **));
+			rrextract(u_char *, int, u_char *, struct databuf **,
+				  char *, int, char **);
 
 static void		add_related_additional(char *);
 static void		free_related_additional(void);
diff --git a/usr.sbin/named/named/ns_validate.c b/usr.sbin/named/named/ns_validate.c
index 2eba777c7a6..95f57ac1da7 100644
--- a/usr.sbin/named/named/ns_validate.c
+++ b/usr.sbin/named/named/ns_validate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_validate.c,v 1.4 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_validate.c,v 1.5 2002/02/17 19:42:37 millert Exp $	*/
 
 /**************************************************************************
  * ns_validate.c (was security.c in original ISI contribution)
@@ -28,12 +28,10 @@
 #ifdef VALIDATE
 
 static int		isvalid(struct namebuf *, int, int, char *, int),
-			check_addr_ns __P((struct databuf **,
-					   struct sockaddr_in *,
-					   char *)),
-			check_in_tables __P((struct databuf **,
-					     struct sockaddr_in *,
-					     char *));
+			check_addr_ns(struct databuf **,
+				      struct sockaddr_in *, char *),
+			check_in_tables(struct databuf **,
+					struct sockaddr_in *, char *);
 #if 0
 static void		stick_in_queue(char *, int, int, char *);
 #endif
diff --git a/usr.sbin/named/named/tree.c b/usr.sbin/named/named/tree.c
index 5cc2132f989..5fd7cd083a1 100644
--- a/usr.sbin/named/named/tree.c
+++ b/usr.sbin/named/named/tree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.c,v 1.3 1997/07/30 15:42:47 kstailey Exp $	*/
+/*	$OpenBSD: tree.c,v 1.4 2002/02/17 19:42:37 millert Exp $	*/
 
 /* tree - balanced binary tree library
  *
@@ -79,12 +79,11 @@ static char	*debugFuncs[256];
 #endif
 
 
-static tree *	sprout	__P( (tree **, tree_t, int *, int (*)(), void (*)()) );
-static int	delete	__P( (tree **, int (*)(), tree_t, void (*)(),
-			      int *, int *) );
-static void	del	__P( (tree **, int *, tree **, void (*)(), int *) );
-static void	bal_L	__P( (tree **, int *) );
-static void	bal_R	__P( (tree **, int *) );
+static tree *	sprout(tree **, tree_t, int *, int (*)(), void (*)());
+static int	delete(tree **, int (*)(), tree_t, void (*)(), int *, int *);
+static void	del(tree **, int *, tree **, void (*)(), int *);
+static void	bal_L(tree **, int *);
+static void	bal_R(tree **, int *);
 
 
 void
diff --git a/usr.sbin/named/named/tree.h b/usr.sbin/named/named/tree.h
index 7d2af9e03ec..32e7ae9fe11 100644
--- a/usr.sbin/named/named/tree.h
+++ b/usr.sbin/named/named/tree.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.h,v 1.4 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: tree.h,v 1.5 2002/02/17 19:42:37 millert Exp $	*/
 
 /* tree.h - declare structures used by tree library
  *
@@ -13,14 +13,6 @@
 #define	_TREE_H_INCLUDED
 
 
-#ifndef __P
-# if defined(__STDC__) || defined(__GNUC__)
-#  define __P(x) x
-# else
-#  define __P(x) ()
-# endif
-#endif
-
 /*
  * tree_t is our package-specific anonymous pointer.
  */
@@ -40,11 +32,11 @@ typedef	struct tree_s {
 
 
 void	tree_init(tree **);
-tree_t	tree_srch	__P((tree **, int (*)(), tree_t));
-tree_t	tree_add	__P((tree **, int (*)(), tree_t, void (*)()));
-int	tree_delete	__P((tree **, int (*)(), tree_t, void (*)()));
-int	tree_trav	__P((tree **, int (*)()));
-void	tree_mung	__P((tree **, void (*)()));
+tree_t	tree_srch(tree **, int (*)(), tree_t);
+tree_t	tree_add(tree **, int (*)(), tree_t, void (*)());
+int	tree_delete(tree **, int (*)(), tree_t, void (*)());
+int	tree_trav(tree **, int (*)());
+void	tree_mung(tree **, void (*)());
 
 
 #endif	/* _TREE_H_INCLUDED */
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index fb7ff983b28..6cc7c9fc005 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndp.c,v 1.13 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ndp.c,v 1.14 2002/02/17 19:42:38 millert Exp $	*/
 /*	$KAME: ndp.c,v 1.69 2001/07/23 14:46:31 itojun Exp $	*/
 
 /*
@@ -146,8 +146,7 @@ int set(int, char **);
 void get(char *);
 int delete(char *);
 void dump(struct in6_addr *);
-static struct in6_nbrinfo *getnbrinfo __P((struct in6_addr *addr,
-					   int ifindex, int));
+static struct in6_nbrinfo *getnbrinfo(struct in6_addr *addr, int ifindex, int);
 static char *ether_str(struct sockaddr_dl *);
 int ndp_ether_aton(char *, u_char *);
 void usage(void);
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index dedd22da1fc..821cfddeb7c 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: netgroup_mkdb.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $";
+static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -71,8 +71,8 @@ struct nentry {
 
 
 static DB       *ng_insert(DB *, const char *);
-static void	 ng_reventry __P((DB *, DB *, struct nentry *, char *,
-				  size_t, struct stringlist *));
+static void	 ng_reventry(DB *, DB *, struct nentry *, char *,
+		    size_t, struct stringlist *);
 
 static void	 ng_print(struct nentry *, struct string *);
 static void	 ng_rprint(DB *, struct string *);
diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h
index 181a8c5c765..35f54ea11d9 100644
--- a/usr.sbin/pkg_install/sign/extern.h
+++ b/usr.sbin/pkg_install/sign/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.5 2002/02/17 19:42:38 millert Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
  *
@@ -38,19 +38,19 @@ struct mygzip_header;
 struct signature;
 
 /* common.c */
-extern int read_header_and_diagnose __P((FILE *file, \
+extern int read_header_and_diagnose(FILE *file, \
 	/*@out@*/struct mygzip_header *h, /*@null@*/struct signature **sign, \
-	const char *filename));
+	const char *filename);
 extern int reap(pid_t pid);
 
 /* sign.c */
-extern int sign __P((/*@observer@*/const char *filename, int type, \
-	/*@null@*/const char *userid, char *envp[]));
+extern int sign(/*@observer@*/const char *filename, int type, \
+	/*@null@*/const char *userid, char *envp[]);
 
 /* check.c */
-extern int check_signature __P((/*@dependent@*/FILE *file, \
+extern int check_signature(/*@dependent@*/FILE *file, \
 	/*@null@*/const char *userid, char *envp[], \
-	/*@observer@*/const char *filename));
+	/*@observer@*/const char *filename);
 
 #define PKG_BADSIG 0
 #define PKG_GOODSIG 1
@@ -65,14 +65,13 @@ typedef /*@observer@*/char *pchar;
 /* sha1.c */
 #define SHA1_DB_NAME	"/var/db/pkg/SHA1"
 
-extern void *new_sha1_checker __P((struct mygzip_header *h, \
+extern void *new_sha1_checker(struct mygzip_header *h, \
 	struct signature *sign, const char *userid, char *envp[], \
-	const char *filename));
+	const char *filename);
 
-extern void sha1_add __P((void *arg, const char *buffer, \
-	size_t length));
+extern void sha1_add(void *arg, const char *buffer, size_t length);
 
 extern int sha1_sign_ok(void *arg);
 
-extern int retrieve_sha1_marker __P((const char *filename, \
-	struct signature **sign, const char *userid));
+extern int retrieve_sha1_marker(const char *filename, \
+	struct signature **sign, const char *userid);
diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h
index f55be34cf15..1bc09f23439 100644
--- a/usr.sbin/pkg_install/sign/gzip.h
+++ b/usr.sbin/pkg_install/sign/gzip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gzip.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: gzip.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
  *
@@ -66,16 +66,16 @@ struct signature {
 #define GZIP_SIGNED 		1	/* gzip file, signature parsed ok */
 #define GZIP_NOT_GZIP 		2	/* not a proper gzip file */
 #define GZIP_NOT_PGPSIGNED 	3	/* gzip file, unknown extension */
-extern int gzip_read_header __P((FILE *f, /*@out@*/struct mygzip_header *h, \
-	/*@null@*/struct signature **sign));
+extern int gzip_read_header(FILE *f, /*@out@*/struct mygzip_header *h, \
+	/*@null@*/struct signature **sign);
 /* gzip_write_header returns 1 for success */
-extern int gzip_write_header __P((FILE *f, const struct mygzip_header *h, \
-	/*@null@*/struct signature *sign));
+extern int gzip_write_header(FILE *f, const struct mygzip_header *h, \
+	/*@null@*/struct signature *sign);
 /* writing header to memory. Returns size needed, or 0 if buffer too small
    buffer must be at least 14 characters */
-extern int gzip_copy_header __P((const struct mygzip_header *h, \
+extern int gzip_copy_header(const struct mygzip_header *h, \
 	/*@null@*/struct signature *sign, \
-	void (*add)(void *, const char *, size_t), void *data));
+	void (*add)(void *, const char *, size_t), void *data);
 
 extern void free_signature(/*@null@*/struct signature *sign);
 extern void sign_fill_tag(struct signature *sign);
diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h
index 641ab4cbab4..e179a26afa5 100644
--- a/usr.sbin/pkg_install/sign/pgp.h
+++ b/usr.sbin/pkg_install/sign/pgp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgp.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: pgp.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 /* Estimate size of pgp signature */
 #define MAXPGPSIGNSIZE	1024
 
@@ -9,16 +9,15 @@
 struct mygzip_header;
 struct signature;
 
-extern void *new_pgp_checker __P((struct mygzip_header *h, \
+extern void *new_pgp_checker(struct mygzip_header *h, \
 	struct signature *sign, const char *userid, char *envp[], \
-	const char *filename));
+	const char *filename);
 
-extern void pgp_add __P((void *arg, const char *buffer, \
-	size_t length));
+extern void pgp_add(void *arg, const char *buffer, size_t length);
 
 extern int pgp_sign_ok(void *arg);
 
 extern void handle_pgp_passphrase(void);
 
-extern int retrieve_pgp_signature __P((const char *filename, \
-struct signature **sign, const char *userid, char *envp[]));
+extern int retrieve_pgp_signature(const char *filename, \
+	struct signature **sign, const char *userid, char *envp[]);
diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h
index 9dda6faa520..af61be3dff9 100644
--- a/usr.sbin/pkg_install/sign/stand.h
+++ b/usr.sbin/pkg_install/sign/stand.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stand.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: stand.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 
 /* provided to cater for BSD idiosyncrasies */
 
@@ -6,14 +6,6 @@
 #include <sys/param.h>
 #endif
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(x)	x
-#else
-#define __P(x) ()
-#endif
-#endif
-
 #if defined(BSD4_4)
 #include <err.h>
 #else
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 60d5b4e49de..9c8210cdbe8 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: auth.c,v 1.22 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * auth.c - PPP authentication and phase control.
@@ -38,7 +38,7 @@
 #if 0
 static char rcsid[] = "Id: auth.c,v 1.37 1998/03/26 04:46:03 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: auth.c,v 1.22 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -143,8 +143,8 @@ static int  get_pap_passwd(char *);
 static int  have_pap_secret(void);
 static int  have_chap_secret(char *, char *, u_int32_t);
 static int  ip_addr_check(u_int32_t, struct wordlist *);
-static int  scan_authfile __P((FILE *, char *, char *, u_int32_t, char *,
-			       struct wordlist **, char *));
+static int  scan_authfile(FILE *, char *, char *, u_int32_t, char *,
+		struct wordlist **, char *);
 static void free_wordlist(struct wordlist *);
 static void auth_script(char *);
 static void set_allowed_addrs(int, struct wordlist *);
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index 439d73a8395..b8a7c81fe07 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: cbcp.c,v 1.4 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * cbcp - Call Back Configuration Protocol.
@@ -24,7 +24,7 @@
 #if 0
 static char rcsid[] = "Id: cbcp.c,v 1.2 1997/04/30 05:50:26 paulus Exp";
 #else
-static char rcsid[] = "$OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: cbcp.c,v 1.4 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -48,9 +48,8 @@ static void cbcp_open(int unit);
 static void cbcp_lowerup(int unit);
 static void cbcp_input(int unit, u_char *pkt, int len);
 static void cbcp_protrej(int unit);
-static int  cbcp_printpkt  __P((u_char *pkt, int len,
-				void (*printer)(void *, char *, ...),
-				void *arg));
+static int  cbcp_printpkt(u_char *pkt, int len,
+    void (*printer)(void *, char *, ...), void *arg);
 
 struct protent cbcp_protent = {
     PPP_CBCP,
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index f9cfad3e793..b4f746cb89a 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: ccp.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * ccp.c - PPP Compression Control Protocol.
@@ -31,7 +31,7 @@
 #if 0
 static char rcsid[] = "Id: ccp.c,v 1.22 1998/03/25 01:25:02 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ccp.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -55,9 +55,8 @@ static void ccp_lowerup(int unit);
 static void ccp_lowerdown(int);
 static void ccp_input(int unit, u_char *pkt, int len);
 static void ccp_protrej(int unit);
-static int  ccp_printpkt __P((u_char *pkt, int len,
-			      void (*printer)(void *, char *, ...),
-			      void *arg));
+static int  ccp_printpkt(u_char *pkt, int len,
+    void (*printer)(void *, char *, ...), void *arg);
 static void ccp_datainput(int unit, u_char *pkt, int len);
 
 struct protent ccp_protent = {
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index cc2819530a0..e978f26eb0d 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: chap.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * chap.c - Challenge Handshake Authentication Protocol.
@@ -39,7 +39,7 @@
 #if 0
 static char rcsid[] = "Id: chap.c,v 1.15 1997/11/27 06:07:48 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: chap.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -69,8 +69,7 @@ static void ChapLowerUp(int);
 static void ChapLowerDown(int);
 static void ChapInput(int, u_char *, int);
 static void ChapProtocolReject(int);
-static int  ChapPrintPkt __P((u_char *, int,
-			      void (*)(void *, char *, ...), void *));
+static int  ChapPrintPkt(u_char *, int, void (*)(void *, char *, ...), void *);
 
 struct protent chap_protent = {
     PPP_CHAP,
diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c
index 8b927b4ba4f..e02bb725f5b 100644
--- a/usr.sbin/pppd/chat/chat.c
+++ b/usr.sbin/pppd/chat/chat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  *	Chat -- a program for automatic session establishment (i.e. dial
@@ -83,7 +83,7 @@
 #if 0
 static char rcsid[] = "Id: chat.c,v 1.19 1998/03/24 23:57:48 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -118,17 +118,14 @@ static char rcsid[] = "$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $
 #define SIGTYPE void
 #endif
 
-#undef __P
 #undef __V
 
 #ifdef __STDC__
 #include <stdarg.h>
 #define __V(x)	x
-#define __P(x)	x
 #else
 #include <varargs.h>
 #define __V(x)	(va_alist) va_dcl
-#define __P(x)	()
 #define const
 #endif
 
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 424b20c58b1..33368115b5e 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: ipcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * ipcp.c - PPP IP Control Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: ipcp.c,v 1.34 1998/04/28 23:38:09 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -101,8 +101,7 @@ static void ipcp_lowerup(int);
 static void ipcp_lowerdown(int);
 static void ipcp_input(int, u_char *, int);
 static void ipcp_protrej(int);
-static int  ipcp_printpkt __P((u_char *, int,
-			       void (*)(void *, char *, ...), void *));
+static int  ipcp_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
 static void ip_check_options(void);
 static int  ip_demand_conf(int);
 static int  ip_active_pkt(u_char *, int);
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index 081166b6c60..a5fc1b7b3fa 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: ipxcp.c,v 1.7 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * ipxcp.c - PPP IPX Control Protocol.
@@ -24,7 +24,7 @@
 #if 0
 static char rcsid[] = "Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.7 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -101,8 +101,8 @@ static void ipxcp_lowerup(int);
 static void ipxcp_lowerdown(int);
 static void ipxcp_input(int, u_char *, int);
 static void ipxcp_protrej(int);
-static int  ipxcp_printpkt __P((u_char *, int,
-				void (*)(void *, char *, ...), void *));
+static int  ipxcp_printpkt(u_char *, int,
+    void (*)(void *, char *, ...), void *);
 
 struct protent ipxcp_protent = {
     PPP_IPXCP,
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index fa8fd8f60dc..ac337fe0dc1 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: lcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * lcp.c - PPP Link Control Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: lcp.c,v 1.31 1997/11/27 06:08:44 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: lcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -116,8 +116,7 @@ static fsm_callbacks lcp_callbacks = {	/* LCP callback routines */
 static void lcp_init(int);
 static void lcp_input(int, u_char *, int);
 static void lcp_protrej(int);
-static int  lcp_printpkt __P((u_char *, int,
-			      void (*)(void *, char *, ...), void *));
+static int  lcp_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
 
 struct protent lcp_protent = {
     PPP_LCP,
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index e9a83a306c3..708efac92fa 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppd.h,v 1.11 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: pppd.h,v 1.12 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * pppd.h - PPP daemon global declarations.
@@ -156,9 +156,8 @@ struct protent {
     /* Close the protocol */
     void (*close)(int unit, char *reason);
     /* Print a packet in readable form */
-    int  (*printpkt) __P((u_char *pkt, int len,
-			  void (*printer)(void *, char *, ...),
-			  void *arg));
+    int  (*printpkt)(u_char *pkt, int len,
+	void (*printer)(void *, char *, ...), void *arg);
     /* Process a received data packet */
     void (*datainput)(int unit, u_char *pkt, int len);
     int  enabled_flag;		/* 0 iff protocol is disabled */
@@ -183,20 +182,20 @@ void detach(void);		/* Detach from controlling tty */
 void die(int);			/* Cleanup and exit */
 void quit(void);		/* like die(1) */
 void novm(char *);		/* Say we ran out of memory, and die */
-void timeout __P((void (*func)(void *), void *arg, int t));
+void timeout(void (*func)(void *), void *arg, int t);
 				/* Call func(arg) after t seconds */
-void untimeout __P((void (*func)(void *), void *arg));
+void untimeout(void (*func)(void *), void *arg);
 				/* Cancel call to func(arg) */
 int run_program(char *prog, char **args, int must_exist);
 				/* Run program prog with args in child */
 void demuxprotrej(int, int);
 				/* Demultiplex a Protocol-Reject */
-void format_packet __P((u_char *, int, void (*) (void *, char *, ...),
-		void *));	/* Format a packet in human-readable form */
+void format_packet(u_char *, int, void (*) (void *, char *, ...), void *);
+				/* Format a packet in human-readable form */
 void log_packet(u_char *, int, char *, int);
 				/* Format a packet and log it with syslog */
-void print_string __P((char *, int,  void (*) (void *, char *, ...),
-		void *));	/* Format a string for output */
+void print_string(char *, int,  void (*) (void *, char *, ...), void *);
+				/* Format a string for output */
 int fmtmsg(char *, int, char *, ...);		/* sprintf++ */
 int vfmtmsg(char *, int, char *, va_list);	/* vsprintf++ */
 void script_setenv(char *, char *);	/* set script env var */
@@ -311,8 +310,8 @@ int  set_filters(struct bpf_program *pass, struct bpf_program *active);
 int  parse_args(int argc, char **argv);
 				/* Parse options from arguments given */
 void usage(void);		/* Print a usage message */
-int  options_from_file __P((char *filename, int must_exist, int check_prot,
-			    int privileged));
+int  options_from_file(char *filename, int must_exist, int check_prot,
+		       int privileged);
 				/* Parse options from an options file */
 int  options_from_user(void);	/* Parse options from user's .ppprc */
 int  options_for_tty(void);	/* Parse options from /etc/ppp/options.tty */
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index edb2d67f61a..17ede4956e0 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: upap.c,v 1.8 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * upap.c - User/Password Authentication Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: upap.c,v 1.11 1997/04/30 05:59:56 paulus Exp";
 #else
-static char rcsid[] = "$OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: upap.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -48,8 +48,7 @@ static void upap_lowerup(int);
 static void upap_lowerdown(int);
 static void upap_input(int, u_char *, int);
 static void upap_protrej(int);
-static int  upap_printpkt __P((u_char *, int,
-			       void (*)(void *, char *, ...), void *));
+static int  upap_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
 
 struct protent pap_protent = {
     PPP_PAP,
diff --git a/usr.sbin/pppoe/client.c b/usr.sbin/pppoe/client.c
index 0d022c82eac..dceeb92a4e5 100644
--- a/usr.sbin/pppoe/client.c
+++ b/usr.sbin/pppoe/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.13 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: client.c,v 1.14 2002/02/17 19:42:39 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -66,20 +66,18 @@ u_int32_t client_cookie;
 u_int16_t client_sessionid;
 int pppfd, client_state;
 
-static int getpackets __P((int, char *, char *, struct ether_addr *,
-    struct ether_addr *));
+static int getpackets(int, char *, char *, struct ether_addr *,
+    struct ether_addr *);
 static int send_padi(int, struct ether_addr *, u_int8_t *);
-static int send_padr __P((int, char *, struct ether_addr *,
+static int send_padr(int, char *, struct ether_addr *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, struct tag_list *);
+static int recv_pado(int, char *, struct ether_addr *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+static int recv_pads(int, char *, char *, struct ether_addr *,
     struct ether_addr *, struct ether_header *, struct pppoe_header *,
-    struct tag_list *));
-static int recv_pado __P((int, char *, struct ether_addr *,
-    struct ether_addr *, struct ether_header *, struct pppoe_header *,
-    u_long, u_int8_t *));
-static int recv_pads __P((int, char *, char *, struct ether_addr *,
-    struct ether_addr *, struct ether_header *, struct pppoe_header *,
-    u_long, u_int8_t *));
-static int recv_padt __P((int, struct ether_addr *, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
+    u_long, u_int8_t *);
+static int recv_padt(int, struct ether_addr *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
 
 void timer_handler(int);
 int timer_set(u_int);
diff --git a/usr.sbin/pppoe/pppoe.h b/usr.sbin/pppoe/pppoe.h
index 238a9e236a8..9e4762e6c8a 100644
--- a/usr.sbin/pppoe/pppoe.h
+++ b/usr.sbin/pppoe/pppoe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppoe.h,v 1.3 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: pppoe.h,v 1.4 2002/02/17 19:42:39 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -136,11 +136,10 @@ struct pppoe_session *session_find_fd(int);
 
 int runppp(int, char *);
 int bpf_to_ppp(int, u_long, u_int8_t *);
-int ppp_to_bpf __P((int, int, struct ether_addr *, struct ether_addr *,
-    u_int16_t));
+int ppp_to_bpf(int, int, struct ether_addr *, struct ether_addr *, u_int16_t);
 int send_padt(int, struct ether_addr *, struct ether_addr *, u_int16_t);
-void recv_debug __P((int, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
+void recv_debug(int, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
 void debug_packet(u_int8_t *, int);
 
 u_int32_t cookie_bake(void);
diff --git a/usr.sbin/pppoe/server.c b/usr.sbin/pppoe/server.c
index d861f306af7..ea34212e2a7 100644
--- a/usr.sbin/pppoe/server.c
+++ b/usr.sbin/pppoe/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: server.c,v 1.7 2002/02/17 19:42:39 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -64,17 +64,17 @@ static char ac_cookie_key[8];
 
 static void getpackets(int, char *, struct ether_addr *);
 
-static void recv_padi __P((int, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-static void recv_padr __P((int, char *, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-static void recv_padt __P((int, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-
-static void send_pado __P((int, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-static void send_pads __P((int, char *, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
+static void recv_padi(int, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+static void recv_padr(int, char *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+static void recv_padt(int, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+
+static void send_pado(int, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+static void send_pads(int, char *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
 static void key_gen(void);
 static u_int8_t *key_make(u_int8_t *, int, u_int8_t *, int);
 static int key_cmp(u_int8_t *, int, u_int8_t *, int, u_int8_t *, int);
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index e86594082c4..bbe7fa7f290 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.32 2002/02/16 21:28:08 millert Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.33 2002/02/17 19:42:39 millert Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -28,7 +28,7 @@ char    copyright[] =
 #endif				/* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rarpd.c,v 1.32 2002/02/16 21:28:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: rarpd.c,v 1.33 2002/02/17 19:42:39 millert Exp $";
 #endif
 
 
@@ -96,8 +96,8 @@ void   rarp_loop(void);
 void   lookup_addrs(char *, struct if_info *);
 void   usage(void);
 void   rarp_process(struct if_info *, u_char *);
-void   rarp_reply    __P((struct if_info *, struct if_addr *,
-	struct ether_header *, u_int32_t, struct hostent *));
+void   rarp_reply(struct if_info *, struct if_addr *,
+	    struct ether_header *, u_int32_t, struct hostent *);
 void   update_arptab(u_char *, u_int32_t);
 void   err(int, const char *,...);
 void   debug(const char *,...);
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index c0243a429e9..11fd8399567 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route6d.c,v 1.23 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: route6d.c,v 1.24 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: route6d.c,v 1.73 2001/09/05 01:12:34 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #if 0
-static char _rcsid[] = "$OpenBSD: route6d.c,v 1.23 2002/02/16 21:28:08 millert Exp $";
+static char _rcsid[] = "$OpenBSD: route6d.c,v 1.24 2002/02/17 19:42:39 millert Exp $";
 #endif
 
 #include <stdio.h>
@@ -223,10 +223,10 @@ void sockopt(struct ifc *);
 void ifconfig(void);
 void ifconfig1(const char *, const struct sockaddr *, struct ifc *, int);
 void rtrecv(void);
-int rt_del __P((const struct sockaddr_in6 *, const struct sockaddr_in6 *,
-	const struct sockaddr_in6 *));
-int rt_deladdr __P((struct ifc *, const struct sockaddr_in6 *,
-	const struct sockaddr_in6 *));
+int rt_del(const struct sockaddr_in6 *, const struct sockaddr_in6 *,
+    const struct sockaddr_in6 *);
+int rt_deladdr(struct ifc *, const struct sockaddr_in6 *,
+    const struct sockaddr_in6 *);
 void filterconfig(void);
 int getifmtu(int);
 const char *rttypes(struct rt_msghdr *);
@@ -242,8 +242,7 @@ void ifdump0(FILE *, const struct ifc *);
 void rtdump(int);
 void rt_entry(struct rt_msghdr *, int);
 void rtdexit(void);
-void riprequest __P((struct ifc *, struct netinfo6 *, int,
-	struct sockaddr_in6 *));
+void riprequest(struct ifc *, struct netinfo6 *, int, struct sockaddr_in6 *);
 void ripflush(struct ifc *, struct sockaddr_in6 *);
 void sendrequest(struct ifc *);
 int sin6mask2len(const struct sockaddr_in6 *);
diff --git a/usr.sbin/rpc.pcnfsd/paths.h b/usr.sbin/rpc.pcnfsd/paths.h
index cb9f4250054..bc16ce1f473 100644
--- a/usr.sbin/rpc.pcnfsd/paths.h
+++ b/usr.sbin/rpc.pcnfsd/paths.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: paths.h,v 1.3 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: paths.h,v 1.4 2002/02/17 19:42:39 millert Exp $	*/
 /*	$NetBSD: paths.h,v 1.1 1995/08/14 19:50:09 gwr Exp $	*/
 
 #define SPOOLDIR        "/export/pcnfs"
@@ -21,5 +21,4 @@ int build_pr_list(void);
 pirstat build_pr_queue(printername, username, int, int *, int *);
 psrstat pr_start2(char *, char *, char *, char *, char *, char **);
 pcrstat pr_cancel(char *, char *, char *);
-pirstat get_pr_status __P((printername, bool_t *, bool_t *, int *, bool_t *,
-			char *));
+pirstat get_pr_status(printername, bool_t *, bool_t *, int *, bool_t *, char *);
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index decc7ea844a..841b93dfc9e 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.10 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: if.c,v 1.11 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $	*/
 
 /*
@@ -75,8 +75,8 @@ size_t ifblock_size;
 char *ifblock;
 
 static void get_iflist(char **buf, size_t *size);
-static void parse_iflist __P((struct if_msghdr ***ifmlist_p, char *buf,
-		       size_t bufsize));
+static void parse_iflist(struct if_msghdr ***ifmlist_p, char *buf,
+    size_t bufsize);
 
 static void
 get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index 49f1758ec6a..291712320d6 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rrenum.h,v 1.4 2001/01/21 15:42:36 itojun Exp $	*/
+/*	$OpenBSD: rrenum.h,v 1.5 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $	*/
 
 /*
@@ -30,5 +30,5 @@
  * SUCH DAMAGE.
  */
 
-void rr_input __P((int, struct icmp6_router_renum *, struct in6_pktinfo *,
-	struct sockaddr_in6 *, struct in6_addr *));
+void rr_input(int, struct icmp6_router_renum *, struct in6_pktinfo *,
+    struct sockaddr_in6 *, struct in6_addr *);
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index b4f1ce09fa7..d04e36dd340 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtadvd.c,v 1.14 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: rtadvd.c,v 1.15 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: rtadvd.c,v 1.50 2001/02/04 06:15:15 itojun Exp $	*/
 
 /*
@@ -131,14 +131,14 @@ static void die(void);
 static void sock_open(void);
 static void rtsock_open(void);
 static void rtadvd_input(void);
-static void rs_input __P((int, struct nd_router_solicit *,
-			  struct in6_pktinfo *, struct sockaddr_in6 *));
-static void ra_input __P((int, struct nd_router_advert *,
-			  struct in6_pktinfo *, struct sockaddr_in6 *));
-static int prefix_check __P((struct nd_opt_prefix_info *, struct rainfo *,
-			     struct sockaddr_in6 *));
-static int nd6_options __P((struct nd_opt_hdr *, int,
-			    union nd_opts *, u_int32_t));
+static void rs_input(int, struct nd_router_solicit *,
+    struct in6_pktinfo *, struct sockaddr_in6 *);
+static void ra_input(int, struct nd_router_advert *,
+    struct in6_pktinfo *, struct sockaddr_in6 *);
+static int prefix_check(struct nd_opt_prefix_info *, struct rainfo *,
+    struct sockaddr_in6 *);
+static int nd6_options(struct nd_opt_hdr *, int,
+    union nd_opts *, u_int32_t);
 static void free_ndopts(union nd_opts *);
 static void ra_output(struct rainfo *);
 static void rtmsg_input(void);
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index f667e8c268b..3e8d751f2d5 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timer.h,v 1.5 2002/02/16 21:28:09 millert Exp $	*/
+/*	$OpenBSD: timer.h,v 1.6 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: timer.h,v 1.3 2000/05/27 11:30:43 jinmei Exp $	*/
 
 /*
@@ -53,13 +53,11 @@ struct rtadvd_timer {
 };
 
 void rtadvd_timer_init(void);
-struct rtadvd_timer *rtadvd_add_timer __P((void (*)(void *),
-		void (*)(void *, struct timeval *), void *, void *));
+struct rtadvd_timer *rtadvd_add_timer(void (*)(void *),
+    void (*)(void *, struct timeval *), void *, void *);
 void rtadvd_set_timer(struct timeval *, struct rtadvd_timer *);
 void rtadvd_remove_timer(struct rtadvd_timer **);
 struct timeval * rtadvd_check_timer(void);
 struct timeval * rtadvd_timer_rest(struct rtadvd_timer *);
-void TIMEVAL_ADD __P((struct timeval *, struct timeval *,
-		      struct timeval *)); 
-void TIMEVAL_SUB __P((struct timeval *, struct timeval *,
-		      struct timeval *)); 
+void TIMEVAL_ADD(struct timeval *, struct timeval *, struct timeval *); 
+void TIMEVAL_SUB(struct timeval *, struct timeval *, struct timeval *); 
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index 9b52e09c1ed..f3b8f464b4f 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.9 2002/02/16 21:28:09 millert Exp $	*/
+/*	$OpenBSD: if.c,v 1.10 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: if.c,v 1.15 2001/05/22 06:04:17 jinmei Exp $	*/
 
 /*
@@ -80,8 +80,8 @@ static int get_llflag(const char *name);
 #ifndef HAVE_GETIFADDRS
 static unsigned int if_maxindex(void);
 #endif
-static void get_rtaddrs __P((int addrs, struct sockaddr *sa,
-			     struct sockaddr **rti_info));
+static void get_rtaddrs(int addrs, struct sockaddr *sa,
+    struct sockaddr **rti_info);
 
 int
 ifinit()
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index bfa8a7bd2f9..2e91c2f7e58 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsold.c,v 1.15 2002/02/16 21:28:09 millert Exp $	*/
+/*	$OpenBSD: rtsold.c,v 1.16 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: rtsold.c,v 1.32 2001/07/09 22:34:07 itojun Exp $	*/
 
 /*
@@ -96,10 +96,10 @@ static int ifreconfig(char *ifname);
 #endif
 static int make_packet(struct ifinfo *ifinfo);
 static struct timeval *rtsol_check_timer(void);
-static void TIMEVAL_ADD __P((struct timeval *a, struct timeval *b,
-			     struct timeval *result));
-static void TIMEVAL_SUB __P((struct timeval *a, struct timeval *b,
-			     struct timeval *result));
+static void TIMEVAL_ADD(struct timeval *a, struct timeval *b,
+    struct timeval *result);
+static void TIMEVAL_SUB(struct timeval *a, struct timeval *b,
+    struct timeval *result);
 
 static void rtsold_set_dump_file(void);
 static void usage(char *progname);
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index 6c4a719c564..15dd80bdf7c 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsold.h,v 1.7 2002/02/16 21:28:09 millert Exp $	*/
+/*	$OpenBSD: rtsold.h,v 1.8 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: rtsold.h,v 1.11 2000/10/10 06:18:04 itojun Exp $	*/
 
 /*
@@ -72,8 +72,7 @@ extern int ifinit(void);
 extern int interface_up(char *name);
 extern int interface_status(struct ifinfo*);
 extern int lladdropt_length(struct sockaddr_dl *sdl);
-extern void lladdropt_fill __P((struct sockaddr_dl *sdl,
-				struct nd_opt_hdr *ndopt));
+extern void lladdropt_fill(struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt);
 extern struct sockaddr_dl *if_nametosdl(char *name);
 extern int getinet6sysctl(int code);
 
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 2511e26d902..b510317ab67 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: rwhod.c,v 1.20 2002/02/16 21:28:09 millert Exp $";
+static char rcsid[] = "$OpenBSD: rwhod.c,v 1.21 2002/02/17 19:42:39 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -109,8 +109,8 @@ void	 quit(char *);
 void	 rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *);
 int	 verify(char *);
 void	 handleread(int s);
-int	 Sendto __P((int, const void *, size_t, int,
-	    const struct sockaddr *, socklen_t));
+int	 Sendto(int, const void *, size_t, int, const struct sockaddr *,
+	    socklen_t);
 char	*interval(int, char *);
 
 void
diff --git a/usr.sbin/tcpdump/gnuc.h b/usr.sbin/tcpdump/gnuc.h
index 7d6c5994118..e7aa722d44a 100644
--- a/usr.sbin/tcpdump/gnuc.h
+++ b/usr.sbin/tcpdump/gnuc.h
@@ -1,15 +1,6 @@
-/*	$OpenBSD: gnuc.h,v 1.3 2000/10/03 14:31:55 ho Exp $	*/
+/*	$OpenBSD: gnuc.h,v 1.4 2002/02/17 19:42:39 millert Exp $	*/
 
-/* @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/gnuc.h,v 1.3 2000/10/03 14:31:55 ho Exp $ (LBL) */
-
-/* Define __P() macro, if necessary */
-#ifndef __P
-#ifdef __STDC__
-#define __P(protos) protos
-#else
-#define __P(protos) ()
-#endif
-#endif
+/* @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/gnuc.h,v 1.4 2002/02/17 19:42:39 millert Exp $ (LBL) */
 
 /* inline foo */
 #ifdef __GNUC__
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index dcb2805453e..82f28086f9c 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trpt.c,v 1.9 2002/02/16 21:28:10 millert Exp $	*/
+/*	$OpenBSD: trpt.c,v 1.10 2002/02/17 19:42:40 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -135,8 +135,8 @@ extern	char *__progname;
 
 int	main(int, char *[]);
 void	dotrace(caddr_t);
-void	tcp_trace __P((short, short, struct tcpcb *, struct tcpcb *,
-	    struct tcpiphdr *, int));
+void	tcp_trace(short, short, struct tcpcb *, struct tcpcb *,
+	    struct tcpiphdr *, int);
 int	numeric(const void *, const void *);
 void	usage(void);
 
diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c
index f8ea088ac4f..b17ce3c2f2c 100644
--- a/usr.sbin/trsp/trsp.c
+++ b/usr.sbin/trsp/trsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trsp.c,v 1.8 2002/02/16 21:28:10 millert Exp $	*/
+/*	$OpenBSD: trsp.c,v 1.9 2002/02/17 19:42:40 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -143,8 +143,8 @@ extern	char *__progname;
 int	main(int, char *[]);
 void	dotrace(caddr_t);
 int	numeric(const void *, const void *);
-void	spp_trace __P((short, short, struct sppcb *, struct sppcb *,
-	    struct spidp *, int));
+void	spp_trace(short, short, struct sppcb *, struct sppcb *,
+	    struct spidp *, int);
 void	usage(void);
 
 int
diff --git a/usr.sbin/ypserv/common/yplib_host.h b/usr.sbin/ypserv/common/yplib_host.h
index caa88ae235f..8547bb52130 100644
--- a/usr.sbin/ypserv/common/yplib_host.h
+++ b/usr.sbin/ypserv/common/yplib_host.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yplib_host.h,v 1.5 2002/02/16 21:28:11 millert Exp $ */
+/*	$OpenBSD: yplib_host.h,v 1.6 2002/02/17 19:42:40 millert Exp $ */
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -34,26 +34,24 @@
 #ifndef _YPLIB_HOST_H_
 #define _YPLIB_HOST_H_
 
-int	yp_match_host 	__P((CLIENT *client, char *indomain, char *inmap,
-			    const char *inkey, int inkeylen, char **outval,
-			    int *outvallen));
-int	yp_first_host	__P((CLIENT *client, char *indomain, char *inmap,
-			    char **outkey, int *outkeylen, char **outval,
-			    int *outvallen));
-int	yp_next_host	__P((CLIENT *client, char *indomain, char *inmap,
-			    char *inkey, int inkeylen, char **outkey,
-			    int *outkeylen, char **outval, int *outvallen));
-int	yp_master_host	__P((CLIENT *client,
-			    char *indomain, char *inmap, char **outname));
-int	yp_order_host	__P((CLIENT *client,
-			    char *indomain, char *inmap, u_int32_t *outorder));
-int	yp_all_host	__P((CLIENT *client, char *indomain, char *inmap,
-			    struct ypall_callback *incallback));
-int	yp_maplist_host	__P((CLIENT *client, char *indomain,
-			    struct ypmaplist **outmaplist));
+int	yp_match_host(CLIENT *client, char *indomain, char *inmap,
+	    const char *inkey, int inkeylen, char **outval, int *outvallen);
+int	yp_first_host(CLIENT *client, char *indomain, char *inmap,
+	    char **outkey, int *outkeylen, char **outval, int *outvallen);
+int	yp_next_host(CLIENT *client, char *indomain, char *inmap, char *inkey,
+	    int inkeylen, char **outkey, int *outkeylen, char **outval,
+	    int *outvallen);
+int	yp_master_host(CLIENT *client, char *indomain, char *inmap,
+	    char **outname);
+int	yp_order_host(CLIENT *client, char *indomain, char *inmap,
+	    u_int32_t *outorder);
+int	yp_all_host(CLIENT *client, char *indomain, char *inmap,
+	    struct ypall_callback *incallback);
+int	yp_maplist_host(CLIENT *client, char *indomain,
+	    struct ypmaplist **outmaplist);
 CLIENT *yp_bind_local(u_long program, u_long version);
-CLIENT *yp_bind_host	__P((char *server, u_long program, u_long version,
-			    u_short port, int usetcp));
+CLIENT *yp_bind_host(char *server, u_long program, u_long version,
+	    u_short port, int usetcp);
 
 #endif /* _YPLIB_HOST_H_ */