Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

author: millert <millert@openbsd.org> 2002-02-16 21:27:05 +0000
committer: millert <millert@openbsd.org> 2002-02-16 21:27:05 +0000
commit: c72b5b24e14c03dd8b22104fbae0d3921fa2aa37 (patch)
tree: 1ac67aab11df5f96856c0e3015d691db7dc9e811 /include
parent: default to rsa keyfile path for non key generation operations where (diff)
download: wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.tar.xz
wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.zip
68 files changed, 1094 insertions, 1094 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index d649a96dbb9..0f212fa81c1 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.h,v 1.4 1997/04/05 20:58:30 millert Exp $	*/
+/*	$OpenBSD: inet.h,v 1.5 2002/02/16 21:27:18 millert Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1993
@@ -74,20 +74,20 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-in_addr_t	 inet_addr __P((const char *));
-int		 inet_aton __P((const char *, struct in_addr *));
-in_addr_t	 inet_lnaof __P((struct in_addr));
-struct in_addr	 inet_makeaddr __P((in_addr_t , in_addr_t));
-char *		 inet_neta __P((in_addr_t, char *, size_t));
-in_addr_t	 inet_netof __P((struct in_addr));
-in_addr_t	 inet_network __P((const char *));
-char		*inet_net_ntop __P((int, const void *, int, char *, size_t));
-int		 inet_net_pton __P((int, const char *, void *, size_t));
-char		*inet_ntoa __P((struct in_addr));
-int		 inet_pton __P((int, const char *, void *));
-const char	*inet_ntop __P((int, const void *, char *, size_t));
-u_int		 inet_nsap_addr __P((const char *, u_char *, int));
-char		*inet_nsap_ntoa __P((int, const u_char *, char *));
+in_addr_t	 inet_addr(const char *);
+int		 inet_aton(const char *, struct in_addr *);
+in_addr_t	 inet_lnaof(struct in_addr);
+struct in_addr	 inet_makeaddr(in_addr_t , in_addr_t);
+char *		 inet_neta(in_addr_t, char *, size_t);
+in_addr_t	 inet_netof(struct in_addr);
+in_addr_t	 inet_network(const char *);
+char		*inet_net_ntop(int, const void *, int, char *, size_t);
+int		 inet_net_pton(int, const char *, void *, size_t);
+char		*inet_ntoa(struct in_addr);
+int		 inet_pton(int, const char *, void *);
+const char	*inet_ntop(int, const void *, char *, size_t);
+u_int		 inet_nsap_addr(const char *, u_char *, int);
+char		*inet_nsap_ntoa(int, const u_char *, char *);
 __END_DECLS
 
 #endif /* !_INET_H_ */
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 7fd5ee320b1..c147724ac78 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nameser.h,v 1.6 2001/07/31 22:02:18 jakob Exp $	*/
+/*	$OpenBSD: nameser.h,v 1.7 2002/02/16 21:27:18 millert Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1989, 1993
@@ -352,8 +352,8 @@ typedef struct {
  */
 #define INDIR_MASK	0xc0
 
-extern	u_int16_t	_getshort __P((const u_char *));
-extern	u_int32_t	_getlong __P((const u_char *));
+extern	u_int16_t	_getshort(const u_char *);
+extern	u_int32_t	_getlong(const u_char *);
 
 /*
  * Inline versions of get/put short/long.  Pointer is advanced.
diff --git a/include/assert.h b/include/assert.h
index c51d000da51..b5951f6d344 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: assert.h,v 1.2 1997/09/21 10:45:25 niklas Exp $	*/
+/*	$OpenBSD: assert.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $	*/
 
 /*-
@@ -64,5 +64,5 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void __assert __P((const char *, int, const char *));
+void __assert(const char *, int, const char *);
 __END_DECLS
diff --git a/include/blf.h b/include/blf.h
index 5bdc43484d0..6c9085a6e6f 100644
--- a/include/blf.h
+++ b/include/blf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: blf.h,v 1.5 2000/12/21 16:35:32 aaron Exp $ */
+/* $OpenBSD: blf.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */
 /*
  * Blowfish - a fast block cipher designed by Bruce Schneier
  *
@@ -56,26 +56,26 @@ typedef struct BlowfishContext {
  *	Blowfish_expand0state( state, key, keylen )
  */
 
-void Blowfish_encipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
-void Blowfish_decipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
-void Blowfish_initstate __P((blf_ctx *));
-void Blowfish_expand0state __P((blf_ctx *, const u_int8_t *, u_int16_t));
+void Blowfish_encipher(blf_ctx *, u_int32_t *, u_int32_t *);
+void Blowfish_decipher(blf_ctx *, u_int32_t *, u_int32_t *);
+void Blowfish_initstate(blf_ctx *);
+void Blowfish_expand0state(blf_ctx *, const u_int8_t *, u_int16_t);
 void Blowfish_expandstate
-    __P((blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t));
+(blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t);
 
 /* Standard Blowfish */
 
-void blf_key __P((blf_ctx *, const u_int8_t *, u_int16_t));
-void blf_enc __P((blf_ctx *, u_int32_t *, u_int16_t));
-void blf_dec __P((blf_ctx *, u_int32_t *, u_int16_t));
+void blf_key(blf_ctx *, const u_int8_t *, u_int16_t);
+void blf_enc(blf_ctx *, u_int32_t *, u_int16_t);
+void blf_dec(blf_ctx *, u_int32_t *, u_int16_t);
 
-void blf_ecb_encrypt __P((blf_ctx *, u_int8_t *, u_int32_t));
-void blf_ecb_decrypt __P((blf_ctx *, u_int8_t *, u_int32_t));
+void blf_ecb_encrypt(blf_ctx *, u_int8_t *, u_int32_t);
+void blf_ecb_decrypt(blf_ctx *, u_int8_t *, u_int32_t);
 
-void blf_cbc_encrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t));
-void blf_cbc_decrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t));
+void blf_cbc_encrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t);
+void blf_cbc_decrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t);
 
 /* Converts u_int8_t to u_int32_t */
-u_int32_t Blowfish_stream2word __P((const u_int8_t *, u_int16_t , u_int16_t *));
+u_int32_t Blowfish_stream2word(const u_int8_t *, u_int16_t , u_int16_t *);
 
 #endif
diff --git a/include/bm.h b/include/bm.h
index f4e45ae5210..d69033e6ae5 100644
--- a/include/bm.h
+++ b/include/bm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bm.h,v 1.2 1997/09/21 10:45:27 niklas Exp $	*/
+/*	$OpenBSD: bm.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: bm.h,v 1.3 1994/10/26 00:55:46 cgd Exp $	*/
 
 /*-
@@ -54,9 +54,9 @@ typedef struct {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-bm_pat	*bm_comp __P((u_char const *, size_t, u_char const *));
-u_char	*bm_exec __P((bm_pat *, u_char *, size_t));
-void	 bm_free __P((bm_pat *));
+bm_pat	*bm_comp(u_char const *, size_t, u_char const *);
+u_char	*bm_exec(bm_pat *, u_char *, size_t);
+void	 bm_free(bm_pat *);
 __END_DECLS
 
 #endif /* !_BM_H_ */
diff --git a/include/bsd_auth.h b/include/bsd_auth.h
index 0720d63e323..08f1cb5bcb3 100644
--- a/include/bsd_auth.h
+++ b/include/bsd_auth.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsd_auth.h,v 1.3 2001/01/28 23:43:15 niklas Exp $	*/
+/*	$OpenBSD: bsd_auth.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -52,46 +52,46 @@ typedef enum {
 #include <sys/cdefs.h>
 __BEGIN_DECLS
 
-char *	auth_getitem __P((auth_session_t *, auth_item_t));
-int	auth_setitem __P((auth_session_t *, auth_item_t, char *));
+char *	auth_getitem(auth_session_t *, auth_item_t);
+int	auth_setitem(auth_session_t *, auth_item_t, char *);
 
-auth_session_t *auth_open __P((void));
-auth_session_t *auth_verify __P((auth_session_t *, char *, char *, ...));
-auth_session_t *auth_userchallenge __P((char *, char *, char *, char **));
-auth_session_t *auth_usercheck __P((char *, char *, char *, char *));
+auth_session_t *auth_open(void);
+auth_session_t *auth_verify(auth_session_t *, char *, char *, ...);
+auth_session_t *auth_userchallenge(char *, char *, char *, char **);
+auth_session_t *auth_usercheck(char *, char *, char *, char *);
 
-int	auth_userresponse __P((auth_session_t *, char *, int));
-int	auth_userokay __P((char *, char *, char *, char *));
-int	auth_approval __P((auth_session_t *, login_cap_t *, char *, char *));
+int	auth_userresponse(auth_session_t *, char *, int);
+int	auth_userokay(char *, char *, char *, char *);
+int	auth_approval(auth_session_t *, login_cap_t *, char *, char *);
 
-int	auth_close __P((auth_session_t *));
-void	auth_clean __P((auth_session_t *));
+int	auth_close(auth_session_t *);
+void	auth_clean(auth_session_t *);
 
-char *	auth_getvalue __P((auth_session_t *, char *));
-int	auth_getstate __P((auth_session_t *));
-char *	auth_challenge __P((auth_session_t *));
-void	auth_setenv __P((auth_session_t *));
-void	auth_clrenv __P((auth_session_t *));
+char *	auth_getvalue(auth_session_t *, char *);
+int	auth_getstate(auth_session_t *);
+char *	auth_challenge(auth_session_t *);
+void	auth_setenv(auth_session_t *);
+void	auth_clrenv(auth_session_t *);
 
-void	auth_setstate __P((auth_session_t *, int));
-int	auth_call __P((auth_session_t *, char *, ...));
+void	auth_setstate(auth_session_t *, int);
+int	auth_call(auth_session_t *, char *, ...);
 
-int	auth_setdata __P((auth_session_t *, void *, size_t));
-int	auth_setoption __P((auth_session_t *, char *, char *));
-int	auth_setpwd __P((auth_session_t *, struct passwd *pwd));
-void	auth_set_va_list __P((auth_session_t *, _BSD_VA_LIST_));
+int	auth_setdata(auth_session_t *, void *, size_t);
+int	auth_setoption(auth_session_t *, char *, char *);
+int	auth_setpwd(auth_session_t *, struct passwd *pwd);
+void	auth_set_va_list(auth_session_t *, _BSD_VA_LIST_);
 
-struct	passwd *auth_getpwd __P((auth_session_t *));
+struct	passwd *auth_getpwd(auth_session_t *);
 
-quad_t	auth_check_expire __P((auth_session_t *));
-quad_t	auth_check_change __P((auth_session_t *));
+quad_t	auth_check_expire(auth_session_t *);
+quad_t	auth_check_change(auth_session_t *);
 
-void	auth_clroptions __P((auth_session_t *));
-void	auth_clroption __P((auth_session_t *, char *));
+void	auth_clroptions(auth_session_t *);
+void	auth_clroption(auth_session_t *, char *);
 
-char *	auth_mkvalue __P((char *));
-void	auth_checknologin __P((login_cap_t *));
-int	auth_cat __P((char *));
+char *	auth_mkvalue(char *);
+void	auth_checknologin(login_cap_t *);
+int	auth_cat(char *);
 
 __END_DECLS
 
diff --git a/include/ctype.h b/include/ctype.h
index 942bfc8660a..73f3a7d6a67 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctype.h,v 1.3 1998/04/30 05:49:21 deraadt Exp $	*/
+/*	$OpenBSD: ctype.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: ctype.h,v 1.14 1994/10/26 00:55:47 cgd Exp $	*/
 
 /*
@@ -59,26 +59,26 @@ extern const short	*_tolower_tab_;
 extern const short	*_toupper_tab_;
 
 __BEGIN_DECLS
-extern int	isalnum __P ((int));
-extern int	isalpha __P ((int));
-extern int	iscntrl __P ((int));
-extern int	isdigit __P ((int));
-extern int	isgraph __P ((int));
-extern int	islower __P ((int));
-extern int	isprint __P ((int));
-extern int	ispunct __P ((int));
-extern int	isspace __P ((int));
-extern int	isupper __P ((int));
-extern int	isxdigit __P ((int));
-extern int	tolower __P ((int));
-extern int	toupper __P ((int));
+extern int	isalnum(int);
+extern int	isalpha(int);
+extern int	iscntrl(int);
+extern int	isdigit(int);
+extern int	isgraph(int);
+extern int	islower(int);
+extern int	isprint(int);
+extern int	ispunct(int);
+extern int	isspace(int);
+extern int	isupper(int);
+extern int	isxdigit(int);
+extern int	tolower(int);
+extern int	toupper(int);
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-extern int	isblank __P ((int));
-extern int	isascii __P ((int));
-extern int	toascii __P ((int));
-extern int	_tolower __P ((int));
-extern int	_toupper __P ((int));
+extern int	isblank(int);
+extern int	isascii(int);
+extern int	toascii(int);
+extern int	_tolower(int);
+extern int	_toupper(int);
 #endif
 __END_DECLS
 
diff --git a/include/db.h b/include/db.h
index d8336ece161..5ab191fd2c6 100644
--- a/include/db.h
+++ b/include/db.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db.h,v 1.4 1999/11/15 01:47:54 aaron Exp $	*/
+/*	$OpenBSD: db.h,v 1.5 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: db.h,v 1.13 1994/10/26 00:55:48 cgd Exp $	*/
 
 /*-
@@ -118,14 +118,14 @@ typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
 /* Access method description structure. */
 typedef struct __db {
 	DBTYPE type;			/* Underlying db type. */
-	int (*close)	__P((struct __db *));
-	int (*del)	__P((const struct __db *, const DBT *, u_int));
-	int (*get)	__P((const struct __db *, const DBT *, DBT *, u_int));
-	int (*put)	__P((const struct __db *, DBT *, const DBT *, u_int));
-	int (*seq)	__P((const struct __db *, DBT *, DBT *, u_int));
-	int (*sync)	__P((const struct __db *, u_int));
+	int (*close)(struct __db *);
+	int (*del)(const struct __db *, const DBT *, u_int);
+	int (*get)(const struct __db *, const DBT *, DBT *, u_int);
+	int (*put)(const struct __db *, DBT *, const DBT *, u_int);
+	int (*seq)(const struct __db *, DBT *, DBT *, u_int);
+	int (*sync)(const struct __db *, u_int);
 	void *internal;			/* Access method private. */
-	int (*fd)	__P((const struct __db *));
+	int (*fd)(const struct __db *);
 } DB;
 
 #define	BTREEMAGIC	0x053162
@@ -140,9 +140,9 @@ typedef struct {
 	int	minkeypage;	/* minimum keys per page */
 	u_int	psize;		/* page size */
 	int	(*compare)	/* comparison function */
-	    __P((const DBT *, const DBT *));
+(const DBT *, const DBT *);
 	size_t	(*prefix)	/* prefix function */
-	    __P((const DBT *, const DBT *));
+(const DBT *, const DBT *);
 	int	lorder;		/* byte order */
 } BTREEINFO;
 
@@ -156,7 +156,7 @@ typedef struct {
 	u_int	nelem;		/* number of elements */
 	u_int	cachesize;	/* bytes to cache */
 	u_int32_t		/* hash function */
-		(*hash) __P((const void *, size_t));
+		(*hash)(const void *, size_t);
 	int	lorder;		/* byte order */
 } HASHINFO;
 
@@ -225,13 +225,13 @@ typedef struct {
 #endif
 
 __BEGIN_DECLS
-DB *dbopen __P((const char *, int, int, DBTYPE, const void *));
+DB *dbopen(const char *, int, int, DBTYPE, const void *);
 
 #ifdef __DBINTERFACE_PRIVATE
-DB	*__bt_open __P((const char *, int, int, const BTREEINFO *, int));
-DB	*__hash_open __P((const char *, int, int, const HASHINFO *, int));
-DB	*__rec_open __P((const char *, int, int, const RECNOINFO *, int));
-void	 __dbpanic __P((DB *dbp));
+DB	*__bt_open(const char *, int, int, const BTREEINFO *, int);
+DB	*__hash_open(const char *, int, int, const HASHINFO *, int);
+DB	*__rec_open(const char *, int, int, const RECNOINFO *, int);
+void	 __dbpanic(DB *dbp);
 #endif
 __END_DECLS
 #endif /* !_DB_H_ */
diff --git a/include/dbm.h b/include/dbm.h
index 665651ec946..ca4250b03fe 100644
--- a/include/dbm.h
+++ b/include/dbm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dbm.h,v 1.3 2001/01/28 23:43:15 niklas Exp $	*/
+/*	$OpenBSD: dbm.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -33,13 +33,13 @@
 #include <ndbm.h>
 
 __BEGIN_DECLS
-int	dbmclose __P((void));
-int	dbminit __P((const char *));
-int	delete __P((datum));
-datum	fetch __P((datum));
-datum	firstkey __P((void));
-datum	nextkey __P((datum));
-int	store __P((datum, datum));
+int	dbmclose(void);
+int	dbminit(const char *);
+int	delete(datum);
+datum	fetch(datum);
+datum	firstkey(void);
+datum	nextkey(datum);
+int	store(datum, datum);
 __END_DECLS
 
 #endif /* _DBM_H_ */
diff --git a/include/dirent.h b/include/dirent.h
index 54291f535a1..012e8006073 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dirent.h,v 1.6 1999/09/17 13:13:46 espie Exp $	*/
+/*	$OpenBSD: dirent.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $	*/
 
 /*-
@@ -96,20 +96,20 @@ typedef struct _dirdesc {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-DIR *opendir __P((const char *));
-struct dirent *readdir __P((DIR *));
-void rewinddir __P((DIR *));
-int closedir __P((DIR *));
+DIR *opendir(const char *);
+struct dirent *readdir(DIR *);
+void rewinddir(DIR *);
+int closedir(DIR *);
 #ifndef _POSIX_SOURCE
-DIR *__opendir2 __P((const char *, int));
-long telldir __P((const DIR *));
-void seekdir __P((DIR *, long));
+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 alphasort __P((const void *, const void *));
-int getdirentries __P((int, char *, int, long *));
+int alphasort(const void *, const void *);
+int getdirentries(int, char *, int, long *);
 #endif /* not POSIX */
-int readdir_r __P((DIR *, struct dirent *, struct dirent **));
+int readdir_r(DIR *, struct dirent *, struct dirent **);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/include/dlfcn.h b/include/dlfcn.h
index b96b018498d..88e0515cd3d 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dlfcn.h,v 1.4 2001/05/31 14:04:09 art Exp $	*/
+/*	$OpenBSD: dlfcn.h,v 1.5 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: dlfcn.h,v 1.2 1995/06/05 19:38:00 pk Exp $	*/
 
 /*
@@ -40,11 +40,11 @@
  * User interface to the run-time linker.
  */
 __BEGIN_DECLS
-extern void	*dlopen __P((const char *, int));
-extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, const char *));
-extern int	dlctl __P((void *, int, void *));
-extern const char	*dlerror __P((void));
+extern void	*dlopen(const char *, int);
+extern int	dlclose(void *);
+extern void	*dlsym(void *, const char *);
+extern int	dlctl(void *, int, void *);
+extern const char	*dlerror(void);
 __END_DECLS
 
 /* Values for dlopen `mode'. */
diff --git a/include/err.h b/include/err.h
index d494281396c..434a01c2edf 100644
--- a/include/err.h
+++ b/include/err.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: err.h,v 1.7 2001/08/07 21:34:42 millert Exp $	*/
+/*	$OpenBSD: err.h,v 1.8 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $	*/
 
 /*-
@@ -51,42 +51,42 @@
 
 __BEGIN_DECLS
 
-__dead void	err __P((int, const char *, ...))
+__dead void	err(int, const char *, ...)
 			__attribute__((__format__ (printf, 2, 3)));
-__dead void	verr __P((int, const char *, _BSD_VA_LIST_))
+__dead void	verr(int, const char *, _BSD_VA_LIST_)
 			__attribute__((__format__ (printf, 2, 0)));
-__dead void	errx __P((int, const char *, ...))
+__dead void	errx(int, const char *, ...)
 			__attribute__((__format__ (printf, 2, 3)));
-__dead void	verrx __P((int, const char *, _BSD_VA_LIST_))
+__dead void	verrx(int, const char *, _BSD_VA_LIST_)
 			__attribute__((__format__ (printf, 2, 0)));
-void		warn __P((const char *, ...))
+void		warn(const char *, ...)
 			__attribute__((__format__ (printf, 1, 2)));
-void		vwarn __P((const char *, _BSD_VA_LIST_))
+void		vwarn(const char *, _BSD_VA_LIST_)
 			__attribute__((__format__ (printf, 1, 0)));
-void		warnx __P((const char *, ...))
+void		warnx(const char *, ...)
 			__attribute__((__format__ (printf, 1, 2)));
-void		vwarnx __P((const char *, _BSD_VA_LIST_))
+void		vwarnx(const char *, _BSD_VA_LIST_)
 			__attribute__((__format__ (printf, 1, 0)));
 
 /*
  * The _* versions are for use in library functions so user-defined
  * versions of err*,warn* do not get used.
  */
-__dead void	_err __P((int, const char *, ...))
+__dead void	_err(int, const char *, ...)
 			__attribute__((__format__ (printf, 2, 3)));
-__dead void	_verr __P((int, const char *, _BSD_VA_LIST_))
+__dead void	_verr(int, const char *, _BSD_VA_LIST_)
 			__attribute__((__format__ (printf, 2, 0)));
-__dead void	_errx __P((int, const char *, ...))
+__dead void	_errx(int, const char *, ...)
 			__attribute__((__format__ (printf, 2, 3)));
-__dead void	_verrx __P((int, const char *, _BSD_VA_LIST_))
+__dead void	_verrx(int, const char *, _BSD_VA_LIST_)
 			__attribute__((__format__ (printf, 2, 0)));
-void		_warn __P((const char *, ...))
+void		_warn(const char *, ...)
 			__attribute__((__format__ (printf, 1, 2)));
-void		_vwarn __P((const char *, _BSD_VA_LIST_))
+void		_vwarn(const char *, _BSD_VA_LIST_)
 			__attribute__((__format__ (printf, 1, 0)));
-void		_warnx __P((const char *, ...))
+void		_warnx(const char *, ...)
 			__attribute__((__format__ (printf, 1, 2)));
-void		_vwarnx __P((const char *, _BSD_VA_LIST_))
+void		_vwarnx(const char *, _BSD_VA_LIST_)
 			__attribute__((__format__ (printf, 1, 0)));
 
 __END_DECLS
diff --git a/include/fnmatch.h b/include/fnmatch.h
index 70a5fec6d7c..579e752ce65 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fnmatch.h,v 1.5 2000/03/24 17:13:23 millert Exp $	*/
+/*	$OpenBSD: fnmatch.h,v 1.6 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: fnmatch.h,v 1.5 1994/10/26 00:55:53 cgd Exp $	*/
 
 /*-
@@ -55,7 +55,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	 fnmatch __P((const char *, const char *, int));
+int	 fnmatch(const char *, const char *, int);
 __END_DECLS
 
 #endif /* !_FNMATCH_H_ */
diff --git a/include/fstab.h b/include/fstab.h
index 01d3d1be751..8376aadb344 100644
--- a/include/fstab.h
+++ b/include/fstab.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fstab.h,v 1.3 1997/09/21 10:45:34 niklas Exp $	*/
+/*	$OpenBSD: fstab.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: fstab.h,v 1.3 1994/10/26 00:55:53 cgd Exp $	*/
 
 /*
@@ -72,11 +72,11 @@ struct fstab {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct fstab *getfsent __P((void));
-struct fstab *getfsspec __P((const char *));
-struct fstab *getfsfile __P((const char *));
-int setfsent __P((void));
-void endfsent __P((void));
+struct fstab *getfsent(void);
+struct fstab *getfsspec(const char *);
+struct fstab *getfsfile(const char *);
+int setfsent(void);
+void endfsent(void);
 __END_DECLS
 
 #endif /* !_FSTAB_H_ */
diff --git a/include/fts.h b/include/fts.h
index eb40c7a14d9..8f01f294886 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fts.h,v 1.6 2001/05/15 21:14:37 millert Exp $	*/
+/*	$OpenBSD: fts.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: fts.h,v 1.5 1994/12/28 01:41:50 mycroft Exp $	*/
 
 /*
@@ -120,12 +120,12 @@ typedef struct _ftsent {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-FTSENT	*fts_children __P((FTS *, int));
-int	 fts_close __P((FTS *));
+FTSENT	*fts_children(FTS *, int);
+int	 fts_close(FTS *);
 FTS	*fts_open __P((char * const *, int,
 	    int (*)(const FTSENT **, const FTSENT **)));
-FTSENT	*fts_read __P((FTS *));
-int	 fts_set __P((FTS *, FTSENT *, int));
+FTSENT	*fts_read(FTS *);
+int	 fts_set(FTS *, FTSENT *, int);
 __END_DECLS
 
 #endif /* !_FTS_H_ */
diff --git a/include/glob.h b/include/glob.h
index d744001f737..6766660bcb9 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glob.h,v 1.5 2001/03/18 17:18:58 deraadt Exp $	*/
+/*	$OpenBSD: glob.h,v 1.6 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $	*/
 
 /*
@@ -52,18 +52,18 @@ typedef struct {
 	int gl_flags;		/* Copy of flags parameter to glob. */
 	char **gl_pathv;	/* List of paths matching pattern. */
 				/* Copy of errfunc parameter to glob. */
-	int (*gl_errfunc) __P((const char *, int));
+	int (*gl_errfunc)(const char *, int);
 
 	/*
 	 * Alternate filesystem access methods for glob; replacement
 	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
 	 * and lstat(2).
 	 */
-	void (*gl_closedir) __P((void *));
-	struct dirent *(*gl_readdir) __P((void *));	
-	void *(*gl_opendir) __P((const char *));
-	int (*gl_lstat) __P((const char *, struct stat *));
-	int (*gl_stat) __P((const char *, struct stat *));
+	void (*gl_closedir)(void *);
+	struct dirent *(*gl_readdir)(void *);	
+	void *(*gl_opendir)(const char *);
+	int (*gl_lstat)(const char *, struct stat *);
+	int (*gl_stat)(const char *, struct stat *);
 } glob_t;
 
 /* Flags */
@@ -94,7 +94,7 @@ typedef struct {
 
 __BEGIN_DECLS
 int	glob __P((const char *, int, int (*)(const char *, int), glob_t *));
-void	globfree __P((glob_t *));
+void	globfree(glob_t *);
 __END_DECLS
 
 #endif /* !_GLOB_H_ */
diff --git a/include/grp.h b/include/grp.h
index 31bfeddfaa7..514a8bbafb1 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grp.h,v 1.3 1997/09/21 10:45:35 niklas Exp $	*/
+/*	$OpenBSD: grp.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: grp.h,v 1.7 1995/04/29 05:30:40 cgd Exp $	*/
 
 /*-
@@ -59,16 +59,16 @@ struct group {
 };
 
 __BEGIN_DECLS
-struct group	*getgrgid __P((gid_t));
-struct group	*getgrnam __P((const char *));
+struct group	*getgrgid(gid_t);
+struct group	*getgrnam(const char *);
 #ifndef _POSIX_SOURCE
-struct group	*getgrent __P((void));
-void		 setgrent __P((void));
-void		 endgrent __P((void));
-void		 setgrfile __P((const char *));
+struct group	*getgrent(void);
+void		 setgrent(void);
+void		 endgrent(void);
+void		 setgrfile(const char *);
 #ifndef _XOPEN_SOURCE
-char		*group_from_gid __P((gid_t, int));
-int		 setgroupent __P((int));
+char		*group_from_gid(gid_t, int);
+int		 setgroupent(int);
 #endif /* !_XOPEN_SOURCE */
 #endif /* !_POSIX_SOURCE */
 __END_DECLS
diff --git a/include/ieeefp.h b/include/ieeefp.h
index 5b8fa9af18d..8812f6bf52e 100644
--- a/include/ieeefp.h
+++ b/include/ieeefp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieeefp.h,v 1.2 1997/09/21 10:45:36 niklas Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 
 /* 
  * Written by J.T. Conklin, Apr 6, 1995
@@ -11,11 +11,11 @@
 #include <sys/cdefs.h>
 #include <machine/ieeefp.h>
 
-extern fp_rnd    fpgetround __P((void));
-extern fp_rnd    fpsetround __P((fp_rnd));
-extern fp_except fpgetmask __P((void));
-extern fp_except fpsetmask __P((fp_except));
-extern fp_except fpgetsticky __P((void));
-extern fp_except fpsetsticky __P((fp_except));
+extern fp_rnd    fpgetround(void);
+extern fp_rnd    fpsetround(fp_rnd);
+extern fp_except fpgetmask(void);
+extern fp_except fpsetmask(fp_except);
+extern fp_except fpgetsticky(void);
+extern fp_except fpsetsticky(fp_except);
 
 #endif /* _IEEEFP_H_ */
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index c0872e469e3..373e6014ac9 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifaddrs.h,v 1.2 2000/02/23 15:39:53 itojun Exp $	*/
+/*	$OpenBSD: ifaddrs.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 
 /*
  * Copyright (c) 1995, 1999
@@ -49,8 +49,8 @@ struct ifaddrs {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern int getifaddrs __P((struct ifaddrs **));
-extern void freeifaddrs __P((struct ifaddrs *));
+extern int getifaddrs(struct ifaddrs **);
+extern void freeifaddrs(struct ifaddrs *);
 __END_DECLS
 
 #endif
diff --git a/include/kvm.h b/include/kvm.h
index c51d34de174..9ecc806fcd7 100644
--- a/include/kvm.h
+++ b/include/kvm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm.h,v 1.3 1997/09/21 10:45:37 niklas Exp $	*/
+/*	$OpenBSD: kvm.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: kvm.h,v 1.7 1996/04/19 12:02:50 leo Exp $	*/
 
 /*-
@@ -52,24 +52,24 @@ __BEGIN_DECLS
 typedef struct __kvm kvm_t;
 
 struct kinfo_proc;
-int	  kvm_close __P((kvm_t *));
-int	  kvm_dump_inval __P((kvm_t *));
-int	  kvm_dump_mkheader __P((kvm_t *, off_t));
-int	  kvm_dump_wrtheader __P((kvm_t *, FILE *, int));
-char	**kvm_getargv __P((kvm_t *, const struct kinfo_proc *, int));
-char	**kvm_getenvv __P((kvm_t *, const struct kinfo_proc *, int));
-char	 *kvm_geterr __P((kvm_t *));
-int	  kvm_getloadavg __P((kvm_t *, double [], int));
-char	 *kvm_getfiles __P((kvm_t *, int, int, int *));
+int	  kvm_close(kvm_t *);
+int	  kvm_dump_inval(kvm_t *);
+int	  kvm_dump_mkheader(kvm_t *, off_t);
+int	  kvm_dump_wrtheader(kvm_t *, FILE *, int);
+char	**kvm_getargv(kvm_t *, const struct kinfo_proc *, int);
+char	**kvm_getenvv(kvm_t *, const struct kinfo_proc *, int);
+char	 *kvm_geterr(kvm_t *);
+int	  kvm_getloadavg(kvm_t *, double [], int);
+char	 *kvm_getfiles(kvm_t *, int, int, int *);
 struct kinfo_proc *
-	  kvm_getprocs __P((kvm_t *, int, int, int *));
-int	  kvm_nlist __P((kvm_t *, struct nlist *));
+	  kvm_getprocs(kvm_t *, int, int, int *);
+int	  kvm_nlist(kvm_t *, struct nlist *);
 kvm_t	 *kvm_open
-	    __P((const char *, const char *, const char *, int, const char *));
+(const char *, const char *, const char *, int, const char *);
 kvm_t	 *kvm_openfiles
-	    __P((const char *, const char *, const char *, int, char *));
-ssize_t	  kvm_read __P((kvm_t *, u_long, void *, size_t));
-ssize_t	  kvm_write __P((kvm_t *, u_long, const void *, size_t));
+(const char *, const char *, const char *, int, char *);
+ssize_t	  kvm_read(kvm_t *, u_long, void *, size_t);
+ssize_t	  kvm_write(kvm_t *, u_long, const void *, size_t);
 
 __END_DECLS
 
diff --git a/include/langinfo.h b/include/langinfo.h
index bae00d5a033..b3aafd04500 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: langinfo.h,v 1.3 2001/01/29 01:32:37 naddy Exp $	*/
+/*	$OpenBSD: langinfo.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: langinfo.h,v 1.3 1995/04/28 23:30:54 jtc Exp $	*/
 
 /*
@@ -70,7 +70,7 @@
 #define CRNCYSTR	50	/* Currency symbol */
 
 __BEGIN_DECLS
-char *nl_langinfo __P((nl_item));
+char *nl_langinfo(nl_item);
 __END_DECLS
 
 #endif	/* _LANGINFO_H_ */
diff --git a/include/libgen.h b/include/libgen.h
index 89d0ba5ada0..ce005ec66f8 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $	*/
+/*	$OpenBSD: libgen.h,v 1.5 2002/02/16 21:27:17 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -34,11 +34,11 @@
 
 __BEGIN_DECLS
 
-char	*basename __P((const char *));
-char	*dirname __P((const char *));
+char	*basename(const char *);
+char	*dirname(const char *);
 #if 0
-char	*regcmp __P((const char *, ...));
-char	*regex __P((const char *, const char *, ...));
+char	*regcmp(const char *, ...);
+char	*regex(const char *, const char *, ...);
 
 extern char *__loc1;
 #endif
diff --git a/include/link.h b/include/link.h
index ab1b244516f..a45eacd0300 100644
--- a/include/link.h
+++ b/include/link.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: link.h,v 1.8 2001/06/08 07:45:18 art Exp $	*/
+/*	$OpenBSD: link.h,v 1.9 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: link.h,v 1.10 1996/01/09 00:00:11 pk Exp $	*/
 
 /*
@@ -202,12 +202,12 @@ struct r_debug {
  * Entry points into ld.so - user interface to the run-time linker.
  */
 struct ld_entry {
-	void	*(*dlopen) __P((const char *, int));
-	int	(*dlclose) __P((void *));
-	void	*(*dlsym) __P((void *, const char *));
-	int	(*dlctl) __P((void *, int, void *));
-	void	(*dlexit) __P((void));
-	void	(*dlrsrvd[3]) __P((void));
+	void	*(*dlopen)(const char *, int);
+	int	(*dlclose)(void *);
+	void	*(*dlsym)(void *, const char *);
+	int	(*dlctl)(void *, int, void *);
+	void	(*dlexit)(void);
+	void	(*dlrsrvd[3])(void);
 };
 
 /*
diff --git a/include/locale.h b/include/locale.h
index 5644acbd193..4bd430b6183 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locale.h,v 1.3 1999/06/11 22:47:48 espie Exp $	*/
+/*	$OpenBSD: locale.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $	*/
 
 /*
@@ -81,8 +81,8 @@ struct lconv {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct lconv	*localeconv __P((void));
-char		*setlocale __P((int, const char *));
+struct lconv	*localeconv(void);
+char		*setlocale(int, const char *);
 __END_DECLS
 
 #endif /* _LOCALE_H_ */
diff --git a/include/login_cap.h b/include/login_cap.h
index 6b150583e4a..3955f12a207 100644
--- a/include/login_cap.h
+++ b/include/login_cap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_cap.h,v 1.6 2001/07/15 21:32:25 millert Exp $	*/
+/*	$OpenBSD: login_cap.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -89,18 +89,18 @@ typedef struct login_cap {
 __BEGIN_DECLS
 struct passwd;
 
-login_cap_t *login_getclass __P((char *));
-void	 login_close __P((login_cap_t *));
-int	 login_getcapbool __P((login_cap_t *, char *, u_int));
-quad_t	 login_getcapnum __P((login_cap_t *, char *, quad_t, quad_t));
-quad_t	 login_getcapsize __P((login_cap_t *, char *, quad_t, quad_t));
-char	*login_getcapstr __P((login_cap_t *, char *, char *, char *));
-quad_t	 login_getcaptime __P((login_cap_t *, char *, quad_t, quad_t));
-char	*login_getstyle __P((login_cap_t *, char *, char *));
+login_cap_t *login_getclass(char *);
+void	 login_close(login_cap_t *);
+int	 login_getcapbool(login_cap_t *, char *, u_int);
+quad_t	 login_getcapnum(login_cap_t *, char *, quad_t, quad_t);
+quad_t	 login_getcapsize(login_cap_t *, char *, quad_t, quad_t);
+char	*login_getcapstr(login_cap_t *, char *, char *, char *);
+quad_t	 login_getcaptime(login_cap_t *, char *, quad_t, quad_t);
+char	*login_getstyle(login_cap_t *, char *, char *);
 
-int	secure_path __P((char *));
-int	setclasscontext __P((char *, u_int));
-int	setusercontext __P((login_cap_t *, struct passwd *, uid_t, u_int));
+int	secure_path(char *);
+int	setclasscontext(char *, u_int);
+int	setusercontext(login_cap_t *, struct passwd *, uid_t, u_int);
 
 __END_DECLS
 
diff --git a/include/math.h b/include/math.h
index d9d2a9ca447..4daefae3426 100644
--- a/include/math.h
+++ b/include/math.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: math.h,v 1.5 2001/05/26 01:49:25 millert Exp $	*/
+/*	$OpenBSD: math.h,v 1.6 2002/02/16 21:27:17 millert Exp $	*/
 /*
  * ====================================================
  * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -99,167 +99,167 @@ __BEGIN_DECLS
 /*
  * ANSI/POSIX
  */
-extern double acos __P((double));
-extern double asin __P((double));
-extern double atan __P((double));
-extern double atan2 __P((double, double));
-extern double cos __P((double));
-extern double sin __P((double));
-extern double tan __P((double));
-
-extern double cosh __P((double));
-extern double sinh __P((double));
-extern double tanh __P((double));
-
-extern double exp __P((double));
-extern double frexp __P((double, int *));
-extern double ldexp __P((double, int));
-extern double log __P((double));
-extern double log10 __P((double));
-extern double modf __P((double, double *));
-
-extern double pow __P((double, double));
-extern double sqrt __P((double));
-
-extern double ceil __P((double));
-extern double fabs __P((double));
-extern double floor __P((double));
-extern double fmod __P((double, double));
+extern double acos(double);
+extern double asin(double);
+extern double atan(double);
+extern double atan2(double, double);
+extern double cos(double);
+extern double sin(double);
+extern double tan(double);
+
+extern double cosh(double);
+extern double sinh(double);
+extern double tanh(double);
+
+extern double exp(double);
+extern double frexp(double, int *);
+extern double ldexp(double, int);
+extern double log(double);
+extern double log10(double);
+extern double modf(double, double *);
+
+extern double pow(double, double);
+extern double sqrt(double);
+
+extern double ceil(double);
+extern double fabs(double);
+extern double floor(double);
+extern double fmod(double, double);
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-extern double erf __P((double));
-extern double erfc __P((double));
-extern double gamma __P((double));
-extern double hypot __P((double, double));
-extern int isinf __P((double));
-extern int isnan __P((double));
-extern int finite __P((double));
-extern double j0 __P((double));
-extern double j1 __P((double));
-extern double jn __P((int, double));
-extern double lgamma __P((double));
-extern double y0 __P((double));
-extern double y1 __P((double));
-extern double yn __P((int, double));
+extern double erf(double);
+extern double erfc(double);
+extern double gamma(double);
+extern double hypot(double, double);
+extern int isinf(double);
+extern int isnan(double);
+extern int finite(double);
+extern double j0(double);
+extern double j1(double);
+extern double jn(int, double);
+extern double lgamma(double);
+extern double y0(double);
+extern double y1(double);
+extern double yn(int, double);
 
 #if !defined(_XOPEN_SOURCE)
-extern double acosh __P((double));
-extern double asinh __P((double));
-extern double atanh __P((double));
-extern double cbrt __P((double));
-extern double logb __P((double));
-extern double nextafter __P((double, double));
-extern double remainder __P((double, double));
-extern double scalb __P((double, double));
+extern double acosh(double);
+extern double asinh(double);
+extern double atanh(double);
+extern double cbrt(double);
+extern double logb(double);
+extern double nextafter(double, double);
+extern double remainder(double, double);
+extern double scalb(double, double);
 
 #ifdef __LIBM_PRIVATE
-extern int matherr __P((struct exception *));
+extern int matherr(struct exception *);
 #endif
 
 /*
  * IEEE Test Vector
  */
-extern double significand __P((double));
+extern double significand(double);
 
 /*
  * Functions callable from C, intended to support IEEE arithmetic.
  */
-extern double copysign __P((double, double));
-extern int ilogb __P((double));
-extern double rint __P((double));
-extern double scalbn __P((double, int));
+extern double copysign(double, double);
+extern int ilogb(double);
+extern double rint(double);
+extern double scalbn(double, int);
 
 /*
  * BSD math library entry points
  */
 extern double cabs();
-extern double drem __P((double, double));
-extern double expm1 __P((double));
-extern double log1p __P((double));
+extern double drem(double, double);
+extern double expm1(double);
+extern double log1p(double);
 
 /*
  * Reentrant version of gamma & lgamma; passes signgam back by reference
  * as the second argument; user must allocate space for signgam.
  */
 #ifdef _REENTRANT
-extern double gamma_r __P((double, int *));
-extern double lgamma_r __P((double, int *));
+extern double gamma_r(double, int *);
+extern double lgamma_r(double, int *);
 #endif /* _REENTRANT */
 
 
 /* float versions of ANSI/POSIX functions */
-extern float acosf __P((float));
-extern float asinf __P((float));
-extern float atanf __P((float));
-extern float atan2f __P((float, float));
-extern float cosf __P((float));
-extern float sinf __P((float));
-extern float tanf __P((float));
-
-extern float coshf __P((float));
-extern float sinhf __P((float));
-extern float tanhf __P((float));
-
-extern float expf __P((float));
-extern float frexpf __P((float, int *));
-extern float ldexpf __P((float, int));
-extern float logf __P((float));
-extern float log10f __P((float));
-extern float modff __P((float, float *));
-
-extern float powf __P((float, float));
-extern float sqrtf __P((float));
-
-extern float ceilf __P((float));
-extern float fabsf __P((float));
-extern float floorf __P((float));
-extern float fmodf __P((float, float));
-
-extern float erff __P((float));
-extern float erfcf __P((float));
-extern float gammaf __P((float));
-extern float hypotf __P((float, float));
-extern int isinff __P((float));
-extern int isnanf __P((float));
-extern int finitef __P((float));
-extern float j0f __P((float));
-extern float j1f __P((float));
-extern float jnf __P((int, float));
-extern float lgammaf __P((float));
-extern float y0f __P((float));
-extern float y1f __P((float));
-extern float ynf __P((int, float));
-
-extern float acoshf __P((float));
-extern float asinhf __P((float));
-extern float atanhf __P((float));
-extern float cbrtf __P((float));
-extern float logbf __P((float));
-extern float nextafterf __P((float, float));
-extern float remainderf __P((float, float));
-extern float scalbf __P((float, float));
+extern float acosf(float);
+extern float asinf(float);
+extern float atanf(float);
+extern float atan2f(float, float);
+extern float cosf(float);
+extern float sinf(float);
+extern float tanf(float);
+
+extern float coshf(float);
+extern float sinhf(float);
+extern float tanhf(float);
+
+extern float expf(float);
+extern float frexpf(float, int *);
+extern float ldexpf(float, int);
+extern float logf(float);
+extern float log10f(float);
+extern float modff(float, float *);
+
+extern float powf(float, float);
+extern float sqrtf(float);
+
+extern float ceilf(float);
+extern float fabsf(float);
+extern float floorf(float);
+extern float fmodf(float, float);
+
+extern float erff(float);
+extern float erfcf(float);
+extern float gammaf(float);
+extern float hypotf(float, float);
+extern int isinff(float);
+extern int isnanf(float);
+extern int finitef(float);
+extern float j0f(float);
+extern float j1f(float);
+extern float jnf(int, float);
+extern float lgammaf(float);
+extern float y0f(float);
+extern float y1f(float);
+extern float ynf(int, float);
+
+extern float acoshf(float);
+extern float asinhf(float);
+extern float atanhf(float);
+extern float cbrtf(float);
+extern float logbf(float);
+extern float nextafterf(float, float);
+extern float remainderf(float, float);
+extern float scalbf(float, float);
 
 /*
  * float version of IEEE Test Vector
  */
-extern float significandf __P((float));
+extern float significandf(float);
 
 /*
  * Float versions of functions callable from C, intended to support
  * IEEE arithmetic.
  */
-extern float copysignf __P((float, float));
-extern int ilogbf __P((float));
-extern float rintf __P((float));
-extern float scalbnf __P((float, int));
+extern float copysignf(float, float);
+extern int ilogbf(float);
+extern float rintf(float);
+extern float scalbnf(float, int);
 
 /*
  * float versions of BSD math library entry points
  */
 extern float cabsf ();
-extern float dremf __P((float, float));
-extern float expm1f __P((float));
-extern float log1pf __P((float));
+extern float dremf(float, float);
+extern float expm1f(float);
+extern float log1pf(float);
 
 /*
  * Float versions of reentrant version of gamma & lgamma; passes
@@ -267,8 +267,8 @@ extern float log1pf __P((float));
  * allocate space for signgam.
  */
 #ifdef _REENTRANT
-extern float gammaf_r __P((float, int *));
-extern float lgammaf_r __P((float, int *));
+extern float gammaf_r(float, int *);
+extern float lgammaf_r(float, int *);
 #endif	/* _REENTRANT */
 
 #endif /* !_XOPEN_SOURCE */
diff --git a/include/md4.h b/include/md4.h
index ca3ff1664c1..89cabf7436d 100644
--- a/include/md4.h
+++ b/include/md4.h
@@ -1,5 +1,5 @@
 /* MD4.H - header file for MD4C.C
- * $OpenBSD: md4.h,v 1.5 2000/03/28 17:35:07 millert Exp $
+ * $OpenBSD: md4.h,v 1.6 2002/02/16 21:27:17 millert Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
@@ -33,12 +33,12 @@ typedef struct MD4Context {
     unsigned char buffer[64];	/* input buffer */
 } MD4_CTX;
 
-void   MD4Init __P((MD4_CTX *));
-void   MD4Update __P((MD4_CTX *, const unsigned char *, size_t));
-void   MD4Final __P((unsigned char [16], MD4_CTX *));
-void   MD4Transform __P ((u_int32_t [4], const unsigned char [64]));
-char * MD4End __P((MD4_CTX *, char *));
-char * MD4File __P((char *, char *));
-char * MD4Data __P((const unsigned char *, size_t, char *));
+void   MD4Init(MD4_CTX *);
+void   MD4Update(MD4_CTX *, const unsigned char *, size_t);
+void   MD4Final(unsigned char [16], MD4_CTX *);
+void   MD4Transform(u_int32_t [4], const unsigned char [64]);
+char * MD4End(MD4_CTX *, char *);
+char * MD4File(char *, char *);
+char * MD4Data(const unsigned char *, size_t, char *);
 
 #endif /* _MD4_H_ */
diff --git a/include/md5.h b/include/md5.h
index 3d67a5cb5e5..8190b176186 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -1,5 +1,5 @@
 /* MD5.H - header file for MD5C.C
- * $OpenBSD: md5.h,v 1.5 2000/03/28 17:35:08 millert Exp $
+ * $OpenBSD: md5.h,v 1.6 2002/02/16 21:27:17 millert Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
@@ -34,12 +34,12 @@ typedef struct MD5Context {
     unsigned char buffer[64];	/* input buffer */
 } MD5_CTX;
 
-void   MD5Init __P((MD5_CTX *));
-void   MD5Update __P((MD5_CTX *, const unsigned char *, size_t));
-void   MD5Final __P((unsigned char [16], MD5_CTX *));
-void   MD5Transform __P ((u_int32_t [4], const unsigned char [64]));
-char * MD5End __P((MD5_CTX *, char *));
-char * MD5File __P((char *, char *));
-char * MD5Data __P((const unsigned char *, size_t, char *));
+void   MD5Init(MD5_CTX *);
+void   MD5Update(MD5_CTX *, const unsigned char *, size_t);
+void   MD5Final(unsigned char [16], MD5_CTX *);
+void   MD5Transform(u_int32_t [4], const unsigned char [64]);
+char * MD5End(MD5_CTX *, char *);
+char * MD5File(char *, char *);
+char * MD5Data(const unsigned char *, size_t, char *);
 
 #endif /* _MD5_H_ */
diff --git a/include/mpool.h b/include/mpool.h
index 49055b77f35..3d5a249c607 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpool.h,v 1.6 1999/02/15 21:17:48 millert Exp $	*/
+/*	$OpenBSD: mpool.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: mpool.h,v 1.7 1996/05/03 21:13:41 cgd Exp $	*/
 
 /*-
@@ -74,9 +74,9 @@ typedef struct MPOOL {
 	u_long	pagesize;		/* file page size */
 	int	fd;			/* file descriptor */
 					/* page in conversion routine */
-	void    (*pgin) __P((void *, pgno_t, void *));
+	void    (*pgin)(void *, pgno_t, void *);
 					/* page out conversion routine */
-	void    (*pgout) __P((void *, pgno_t, void *));
+	void    (*pgout)(void *, pgno_t, void *);
 	void	*pgcookie;		/* cookie for page in/out routines */
 #ifdef STATISTICS
 	u_long	cachehit;
@@ -98,17 +98,17 @@ typedef struct MPOOL {
 					  page number. */
 
 __BEGIN_DECLS
-MPOOL	*mpool_open __P((void *, int, pgno_t, pgno_t));
+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_new __P((MPOOL *, pgno_t *, u_int));
-void	*mpool_get __P((MPOOL *, pgno_t, u_int));
-int	 mpool_delete __P((MPOOL *, void *));
-int	 mpool_put __P((MPOOL *, void *, u_int));
-int	 mpool_sync __P((MPOOL *));
-int	 mpool_close __P((MPOOL *));
+void	*mpool_new(MPOOL *, pgno_t *, u_int);
+void	*mpool_get(MPOOL *, pgno_t, u_int);
+int	 mpool_delete(MPOOL *, void *);
+int	 mpool_put(MPOOL *, void *, u_int);
+int	 mpool_sync(MPOOL *);
+int	 mpool_close(MPOOL *);
 #ifdef STATISTICS
-void	 mpool_stat __P((MPOOL *));
+void	 mpool_stat(MPOOL *);
 #endif
 __END_DECLS
 
diff --git a/include/ndbm.h b/include/ndbm.h
index 0d815fa0e62..aba2d3d348c 100644
--- a/include/ndbm.h
+++ b/include/ndbm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndbm.h,v 1.3 1999/02/16 21:57:53 millert Exp $	*/
+/*	$OpenBSD: ndbm.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: ndbm.h,v 1.6 1995/07/20 23:31:11 jtc Exp $	*/
 
 /*-
@@ -66,18 +66,18 @@ typedef DB DBM;
 #define	dbm_pagfno(a)	DBM_PAGFNO_NOT_AVAILABLE
 
 __BEGIN_DECLS
-void	 dbm_close __P((DBM *));
-int	 dbm_delete __P((DBM *, datum));
-datum	 dbm_fetch __P((DBM *, datum));
-datum	 dbm_firstkey __P((DBM *));
-long	 dbm_forder __P((DBM *, datum));
-datum	 dbm_nextkey __P((DBM *));
-DBM	*dbm_open __P((const char *, int, int));
-int	 dbm_store __P((DBM *, datum, datum, int));
-int	 dbm_dirfno __P((DBM *));
-int	 dbm_error __P((DBM *));
-int	 dbm_clearerr __P((DBM *));
-int	 dbm_rdonly __P((DBM *));
+void	 dbm_close(DBM *);
+int	 dbm_delete(DBM *, datum);
+datum	 dbm_fetch(DBM *, datum);
+datum	 dbm_firstkey(DBM *);
+long	 dbm_forder(DBM *, datum);
+datum	 dbm_nextkey(DBM *);
+DBM	*dbm_open(const char *, int, int);
+int	 dbm_store(DBM *, datum, datum, int);
+int	 dbm_dirfno(DBM *);
+int	 dbm_error(DBM *);
+int	 dbm_clearerr(DBM *);
+int	 dbm_rdonly(DBM *);
 __END_DECLS
 
 #endif /* !_NDBM_H_ */
diff --git a/include/netdb.h b/include/netdb.h
index 87adb107497..6dd03a21c87 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netdb.h,v 1.14 2001/08/06 14:40:47 jakob Exp $	*/
+/*	$OpenBSD: netdb.h,v 1.15 2002/02/16 21:27:17 millert Exp $	*/
 
 /*
  * ++Copyright++ 1980, 1983, 1988, 1993
@@ -240,39 +240,39 @@ struct rrsetinfo {
 };
 
 __BEGIN_DECLS
-void		endhostent __P((void));
-void		endnetent __P((void));
-void		endprotoent __P((void));
-void		endservent __P((void));
-struct hostent	*gethostbyaddr __P((const char *, int, int));
-struct hostent	*gethostbyname __P((const char *));
-struct hostent	*gethostbyname2 __P((const char *, int));
-struct hostent	*gethostent __P((void));
-struct netent	*getnetbyaddr __P((in_addr_t, int));
-struct netent	*getnetbyname __P((const char *));
-struct netent	*getnetent __P((void));
-struct protoent	*getprotobyname __P((const char *));
-struct protoent	*getprotobynumber __P((int));
-struct protoent	*getprotoent __P((void));
-struct servent	*getservbyname __P((const char *, const char *));
-struct servent	*getservbyport __P((int, const char *));
-struct servent	*getservent __P((void));
-void		herror __P((const char *));
-const char	*hstrerror __P((int));
-void		sethostent __P((int));
-/* void		sethostfile __P((const char *)); */
-void		setnetent __P((int));
-void		setprotoent __P((int));
-void		setservent __P((int));
+void		endhostent(void);
+void		endnetent(void);
+void		endprotoent(void);
+void		endservent(void);
+struct hostent	*gethostbyaddr(const char *, int, int);
+struct hostent	*gethostbyname(const char *);
+struct hostent	*gethostbyname2(const char *, int);
+struct hostent	*gethostent(void);
+struct netent	*getnetbyaddr(in_addr_t, int);
+struct netent	*getnetbyname(const char *);
+struct netent	*getnetent(void);
+struct protoent	*getprotobyname(const char *);
+struct protoent	*getprotobynumber(int);
+struct protoent	*getprotoent(void);
+struct servent	*getservbyname(const char *, const char *);
+struct servent	*getservbyport(int, const char *);
+struct servent	*getservent(void);
+void		herror(const char *);
+const char	*hstrerror(int);
+void		sethostent(int);
+/* void		sethostfile(const char *); */
+void		setnetent(int);
+void		setprotoent(int);
+void		setservent(int);
 
 int		getaddrinfo __P((const char *, const char *,
 		    const struct addrinfo *, struct addrinfo **));
-void		freeaddrinfo __P((struct addrinfo *));
+void		freeaddrinfo(struct addrinfo *);
 int		getnameinfo __P((const struct sockaddr *, socklen_t,
 		    char *, size_t, char *, size_t,
 		    int));
-char		*gai_strerror __P((int));
-int		net_addrcmp __P((struct sockaddr *, struct sockaddr *));
+char		*gai_strerror(int);
+int		net_addrcmp(struct sockaddr *, struct sockaddr *);
 int		getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **);
 void		freerrset(struct rrsetinfo *);
 __END_DECLS
diff --git a/include/netgroup.h b/include/netgroup.h
index 01d5485539f..ac68a0b835a 100644
--- a/include/netgroup.h
+++ b/include/netgroup.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: netgroup.h,v 1.3 1997/09/21 10:45:44 niklas Exp $*/
+/* * $OpenBSD: netgroup.h,v 1.4 2002/02/16 21:27:17 millert Exp $*/
 /*
  * Copyright (c) 1994 Christos Zoulas
  * All rights reserved.
@@ -58,21 +58,21 @@ struct netgroup {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void	setnetgrent	__P((const char *));
-int	getnetgrent	__P((const char **, const char **, const char **));
-void	endnetgrent	__P((void));
+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 *));
 #ifdef _NETGROUP_PRIVATE
 struct stringlist;
 
-struct stringlist *_ng_sl_init __P((void));
-void	_ng_sl_add __P((struct stringlist *, char *));
-void	_ng_sl_free __P((struct stringlist *, int));
-char    *_ng_sl_find __P((struct stringlist *, char *));
-char    *_ng_makekey __P((const char *, const char *, size_t));
-int	_ng_parse __P((char **, char **, struct netgroup **));
-void	_ng_print __P((char *, size_t, const struct netgroup *));
+struct stringlist *_ng_sl_init(void);
+void	_ng_sl_add(struct stringlist *, char *);
+void	_ng_sl_free(struct stringlist *, int);
+char    *_ng_sl_find(struct stringlist *, char *);
+char    *_ng_makekey(const char *, const char *, size_t);
+int	_ng_parse(char **, char **, struct netgroup **);
+void	_ng_print(char *, size_t, const struct netgroup *);
 #endif /* _NETGROUP_PRIVATE */
 
 __END_DECLS
diff --git a/include/nl_types.h b/include/nl_types.h
index 55219d62b97..56179b14899 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nl_types.h,v 1.6 1997/09/21 10:45:45 niklas Exp $	*/
+/*	$OpenBSD: nl_types.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: nl_types.h,v 1.6 1996/05/13 23:11:15 jtc Exp $	*/
 
 /*-
@@ -90,9 +90,9 @@ typedef struct _nl_catd {
 typedef long	nl_item;
 
 __BEGIN_DECLS
-extern nl_catd 	catopen __P((const char *, int));
-extern char    *catgets __P((nl_catd, int, int, const char *));
-extern int	catclose __P((nl_catd));
+extern nl_catd 	catopen(const char *, int);
+extern char    *catgets(nl_catd, int, int, const char *);
+extern int	catclose(nl_catd);
 __END_DECLS
 
 #endif	/* _NL_TYPES_H_ */
diff --git a/include/nlist.h b/include/nlist.h
index e27a647264e..af6ab3cfdc8 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlist.h,v 1.2 1997/09/21 10:45:46 niklas Exp $	*/
+/*	$OpenBSD: nlist.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: nlist.h,v 1.5 1994/10/26 00:56:11 cgd Exp $	*/
 
 /*-
@@ -85,7 +85,7 @@ struct nlist {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int nlist __P((const char *, struct nlist *));
+int nlist(const char *, struct nlist *);
 __END_DECLS
 
 #endif /* !_NLIST_H_ */
diff --git a/include/ohash.h b/include/ohash.h
index 2c6f3aed034..b53121d7c5e 100644
--- a/include/ohash.h
+++ b/include/ohash.h
@@ -1,6 +1,6 @@
 #ifndef OHASH_H
 #define OHASH_H
-/* $OpenBSD: ohash.h,v 1.1 2001/03/02 13:27:05 espie Exp $ */
+/* $OpenBSD: ohash.h,v 1.2 2002/02/16 21:27:17 millert Exp $ */
 /* ex:ts=8 sw=4: 
  */
 
@@ -39,9 +39,9 @@
 struct ohash_info {
 	ptrdiff_t key_offset;
 	void *data;	/* user data */
-	void *(*halloc) __P((size_t, void *));
-	void (*hfree) __P((void *, size_t, void *));
-	void *(*alloc) __P((size_t, void *));
+	void *(*halloc)(size_t, void *);
+	void (*hfree)(void *, size_t, void *);
+	void *(*alloc)(size_t, void *);
 };
 
 struct _ohash_record;
@@ -61,25 +61,25 @@ struct ohash {
  * The keys are stored at a known position in the client data.
  */
 __BEGIN_DECLS
-void ohash_init __P((struct ohash *, unsigned, struct ohash_info *));
-void ohash_delete __P((struct ohash *));
+void ohash_init(struct ohash *, unsigned, struct ohash_info *);
+void ohash_delete(struct ohash *);
 
-unsigned int ohash_lookup_string __P((struct ohash *, const char *, u_int32_t));
+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));
-void *ohash_find __P((struct ohash *, unsigned int));
-void *ohash_remove __P((struct ohash *, unsigned int));
-void *ohash_insert __P((struct ohash *, unsigned int, void *));
-void *ohash_first __P((struct ohash *, unsigned int *));
-void *ohash_next __P((struct ohash *, unsigned int *));
-unsigned int ohash_entries __P((struct ohash *));
+void *ohash_find(struct ohash *, unsigned int);
+void *ohash_remove(struct ohash *, unsigned int);
+void *ohash_insert(struct ohash *, unsigned int, void *);
+void *ohash_first(struct ohash *, unsigned int *);
+void *ohash_next(struct ohash *, unsigned int *);
+unsigned int ohash_entries(struct ohash *);
 
-void *ohash_create_entry __P((struct ohash_info *, const char *, const char **));
-u_int32_t ohash_interval __P((const char *, const char **));
+void *ohash_create_entry(struct ohash_info *, const char *, const char **);
+u_int32_t ohash_interval(const char *, const char **);
 
-unsigned int ohash_qlookupi __P((struct ohash *, const char *, const char **));
-unsigned int ohash_qlookup __P((struct ohash *, const char *));
+unsigned int ohash_qlookupi(struct ohash *, const char *, const char **);
+unsigned int ohash_qlookup(struct ohash *, const char *);
 __END_DECLS
 #endif
diff --git a/include/pwd.h b/include/pwd.h
index 6307980c7fc..41c36179941 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd.h,v 1.12 2001/08/26 03:28:30 millert Exp $	*/
+/*	$OpenBSD: pwd.h,v 1.13 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: pwd.h,v 1.9 1996/05/15 21:36:45 jtc Exp $	*/
 
 /*-
@@ -97,18 +97,18 @@ struct passwd {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct passwd	*getpwuid __P((uid_t));
-struct passwd	*getpwnam __P((const char *));
+struct passwd	*getpwuid(uid_t);
+struct passwd	*getpwnam(const char *);
 #ifndef _POSIX_SOURCE
-struct passwd	*getpwent __P((void));
+struct passwd	*getpwent(void);
 #ifndef _XOPEN_SOURCE
-int		 setpassent __P((int));
-char		*user_from_uid __P((uid_t, int));
-char		*bcrypt_gensalt __P((u_int8_t));
-struct passwd	*pw_dup __P((const struct passwd *));
+int		 setpassent(int);
+char		*user_from_uid(uid_t, int);
+char		*bcrypt_gensalt(u_int8_t);
+struct passwd	*pw_dup(const struct passwd *);
 #endif
-void		 setpwent __P((void));
-void		 endpwent __P((void));
+void		 setpwent(void);
+void		 endpwent(void);
 #endif
 __END_DECLS
 
diff --git a/include/re_comp.h b/include/re_comp.h
index 3864e5b81f8..58b9c3cc8d5 100644
--- a/include/re_comp.h
+++ b/include/re_comp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: re_comp.h,v 1.2 1997/09/21 10:45:47 niklas Exp $	*/
+/*	$OpenBSD: re_comp.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: re_comp.h,v 1.1 1996/02/05 22:34:12 jtc Exp $	*/
 
 /*-
@@ -42,8 +42,8 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-char   *re_comp __P((const char *));
-int	re_exec __P((const char *));
+char   *re_comp(const char *);
+int	re_exec(const char *);
 __END_DECLS
 
 #endif /* _RE_COMP_H_ */
diff --git a/include/readpassphrase.h b/include/readpassphrase.h
index f32c464f75b..8d0b47b97fa 100644
--- a/include/readpassphrase.h
+++ b/include/readpassphrase.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readpassphrase.h,v 1.1 2000/11/21 00:48:38 millert Exp $	*/
+/*	$OpenBSD: readpassphrase.h,v 1.2 2002/02/16 21:27:17 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -40,7 +40,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-char * readpassphrase __P((const char *, char *, size_t, int));
+char * readpassphrase(const char *, char *, size_t, int);
 __END_DECLS
 
 #endif /* !_READPASSPHRASE_H_ */
diff --git a/include/regex.h b/include/regex.h
index 8c4a8f1ca3f..7e70e07d8e1 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regex.h,v 1.3 1997/09/21 10:45:48 niklas Exp $	*/
+/*	$OpenBSD: regex.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: regex.h,v 1.4.6.1 1996/06/10 18:57:07 explorer Exp $	*/
 
 /*-
@@ -100,11 +100,11 @@ typedef struct {
 #define	REG_BACKR	02000	/* force use of backref code */
 
 __BEGIN_DECLS
-int	regcomp __P((regex_t *, const char *, int));
-size_t	regerror __P((int, const regex_t *, char *, size_t));
+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));
-void	regfree __P((regex_t *));
+void	regfree(regex_t *);
 __END_DECLS
 
 #endif /* !_REGEX_H_ */
diff --git a/include/resolv.h b/include/resolv.h
index 70f250128df..2a866edea98 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolv.h,v 1.7 2001/07/31 22:02:18 jakob Exp $	*/
+/*	$OpenBSD: resolv.h,v 1.8 2002/02/16 21:27:17 millert Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -300,56 +300,56 @@ extern const struct res_sym __p_type_syms[];
 #endif
 
 __BEGIN_DECLS
-int		res_hnok __P((const char *));
-int		res_ownok __P((const char *));
-int		res_mailok __P((const char *));
-int		res_dnok __P((const char *));
-int		sym_ston __P((const struct res_sym *, char *, int *));
-const char *	sym_ntos __P((const struct res_sym *, int, int *));
-const char *	sym_ntop __P((const struct res_sym *, int, int *));
-int		b64_ntop __P((u_char const *, size_t, char *, size_t));
-int		b64_pton __P((char const *, u_char *, size_t));
-int		loc_aton __P((const char *, u_char *));
-const char *	loc_ntoa __P((const u_char *, char *));
-int		dn_skipname __P((const u_char *, const u_char *));
-void		fp_resstat __P((struct __res_state *, FILE *));
-void		fp_query __P((const u_char *, FILE *));
-void		fp_nquery __P((const u_char *, int, FILE *));
-const char *	hostalias __P((const char *));
-void		putlong __P((u_int32_t, u_char *));
-void		putshort __P((u_int16_t, u_char *));
-const char *	p_class __P((int));
-const char *	p_time __P((u_int32_t));
-const char *	p_type __P((int));
-void		p_query __P((const u_char *));
-const u_char *	p_cdnname __P((const u_char *, const u_char *, int, FILE *));
-const u_char *	p_cdname __P((const u_char *, const u_char *, FILE *));
+int		res_hnok(const char *);
+int		res_ownok(const char *);
+int		res_mailok(const char *);
+int		res_dnok(const char *);
+int		sym_ston(const struct res_sym *, char *, int *);
+const char *	sym_ntos(const struct res_sym *, int, int *);
+const char *	sym_ntop(const struct res_sym *, int, int *);
+int		b64_ntop(u_char const *, size_t, char *, size_t);
+int		b64_pton(char const *, u_char *, size_t);
+int		loc_aton(const char *, u_char *);
+const char *	loc_ntoa(const u_char *, char *);
+int		dn_skipname(const u_char *, const u_char *);
+void		fp_resstat(struct __res_state *, FILE *);
+void		fp_query(const u_char *, FILE *);
+void		fp_nquery(const u_char *, int, FILE *);
+const char *	hostalias(const char *);
+void		putlong(u_int32_t, u_char *);
+void		putshort(u_int16_t, u_char *);
+const char *	p_class(int);
+const char *	p_time(u_int32_t);
+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_fqname __P((const u_char *, const u_char *, FILE *));
-const u_char *	p_rr __P((const u_char *, const u_char *, FILE *));
-const char *	p_option __P((u_long option));
-char *		p_secstodate __P((u_long));
-int		dn_count_labels __P((char *));
+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		res_init __P((void));
-u_int		res_randomid __P((void));
-int		res_query __P((const char *, int, int, u_char *, int));
-int		res_search __P((const char *, int, int, u_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_send __P((const u_char *, int, u_char *, int));
-int		res_isourserver __P((const struct sockaddr_in *));
+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 *));
-void		res_close __P((void));
+void		res_close(void);
 __END_DECLS
 
 #endif /* !_RESOLV_H_ */
diff --git a/include/rmd160.h b/include/rmd160.h
index 67f6695021d..b950fd7f393 100644
--- a/include/rmd160.h
+++ b/include/rmd160.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmd160.h,v 1.5 2001/10/01 20:36:17 markus Exp $	*/
+/*	$OpenBSD: rmd160.h,v 1.6 2002/02/16 21:27:17 millert Exp $	*/
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -32,12 +32,12 @@ typedef struct RMD160Context {
 	u_char buffer[64];	/* input buffer */
 } RMD160_CTX;
 
-void	 RMD160Init __P((RMD160_CTX *));
-void	 RMD160Transform __P ((u_int32_t [5], const u_char [64]));
-void	 RMD160Update __P((RMD160_CTX *, const u_char *, u_int32_t));
-void	 RMD160Final __P((u_char [20], RMD160_CTX *));
-char	*RMD160End __P((RMD160_CTX *, char *));
-char	*RMD160File __P((char *, char *));
-char	*RMD160Data __P((const u_char *, size_t, char *));
+void	 RMD160Init(RMD160_CTX *);
+void	 RMD160Transform(u_int32_t [5], const u_char [64]);
+void	 RMD160Update(RMD160_CTX *, const u_char *, u_int32_t);
+void	 RMD160Final(u_char [20], RMD160_CTX *);
+char	*RMD160End(RMD160_CTX *, char *);
+char	*RMD160File(char *, char *);
+char	*RMD160Data(const u_char *, size_t, char *);
 
 #endif  /* _RMD160_H */
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index df6ab831ebf..7787659b9d0 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.h,v 1.2 1997/09/21 10:46:09 niklas Exp $	*/
+/*	$OpenBSD: auth.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: auth.h,v 1.7 1995/04/29 05:27:55 cgd Exp $	*/
 
 /*
@@ -81,7 +81,7 @@ union des_block {
 };
 typedef union des_block des_block;
 __BEGIN_DECLS
-extern bool_t xdr_des_block __P((XDR *, des_block *));
+extern bool_t xdr_des_block(XDR *, des_block *);
 __END_DECLS
 
 /*
@@ -102,16 +102,16 @@ typedef struct __rpc_auth {
 	struct	opaque_auth	ah_verf;
 	union	des_block	ah_key;
 	struct auth_ops {
-		void	(*ah_nextverf) __P((struct __rpc_auth *));
+		void	(*ah_nextverf)(struct __rpc_auth *);
 		/* nextverf & serialize */
-		int	(*ah_marshal) __P((struct __rpc_auth *, XDR *));
+		int	(*ah_marshal)(struct __rpc_auth *, XDR *);
 		/* validate varifier */
 		int	(*ah_validate) __P((struct __rpc_auth *,
 			    struct opaque_auth *));
 		/* refresh credentials */
-		int	(*ah_refresh) __P((struct __rpc_auth *));
+		int	(*ah_refresh)(struct __rpc_auth *);
 		/* destroy this structure */
-		void	(*ah_destroy) __P((struct __rpc_auth *));
+		void	(*ah_destroy)(struct __rpc_auth *);
 	} *ah_ops;
 	caddr_t ah_private;
 } AUTH;
@@ -169,9 +169,9 @@ extern struct opaque_auth _null_auth;
  */
 __BEGIN_DECLS
 struct sockaddr_in;
-extern AUTH *authunix_create		__P((char *, int, int, int, int *));
-extern AUTH *authunix_create_default	__P((void));
-extern AUTH *authnone_create		__P((void));
+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 *));
 __END_DECLS
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 8d146d5dee5..e65f224fe62 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth_unix.h,v 1.2 1997/09/21 10:46:09 niklas Exp $	*/
+/*	$OpenBSD: auth_unix.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: auth_unix.h,v 1.4 1994/10/26 00:56:56 cgd Exp $	*/
 
 /*
@@ -69,7 +69,7 @@ struct authunix_parms {
 };
 
 __BEGIN_DECLS
-extern bool_t xdr_authunix_parms __P((XDR *, struct authunix_parms *));
+extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *);
 __END_DECLS
 
 /* 
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 0c28612cb5a..93c9b78350a 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnt.h,v 1.5 2001/09/15 13:51:00 deraadt Exp $	*/
+/*	$OpenBSD: clnt.h,v 1.6 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: clnt.h,v 1.6 1995/04/29 05:27:58 cgd Exp $	*/
 
 /*
@@ -124,7 +124,7 @@ typedef struct __rpc_client {
 				    u_long, xdrproc_t, caddr_t, xdrproc_t,
 				    caddr_t, struct timeval));
 		/* abort a call */
-		void		(*cl_abort) __P((struct __rpc_client *));
+		void		(*cl_abort)(struct __rpc_client *);
 		/* get specific error code */
 		void		(*cl_geterr) __P((struct __rpc_client *,
 				    struct rpc_err *));
@@ -132,7 +132,7 @@ typedef struct __rpc_client {
 		bool_t		(*cl_freeres) __P((struct __rpc_client *,
 				    xdrproc_t, caddr_t));
 		/* destroy this structure */
-		void		(*cl_destroy) __P((struct __rpc_client *));
+		void		(*cl_destroy)(struct __rpc_client *);
 		/* the ioctl() of rpc */
 		bool_t          (*cl_control) __P((struct __rpc_client *, u_int,
 				    void *));
@@ -255,7 +255,7 @@ typedef struct __rpc_client {
  *	u_long vers;
  */
 __BEGIN_DECLS
-extern CLIENT *clntraw_create	__P((u_long, u_long));
+extern CLIENT *clntraw_create(u_long, u_long);
 __END_DECLS
 
 
@@ -269,7 +269,7 @@ __END_DECLS
  *	char *prot;	-- protocol
  */
 __BEGIN_DECLS
-extern CLIENT *clnt_create	__P((char *, u_long, u_long, char *));
+extern CLIENT *clnt_create(char *, u_long, u_long, char *);
 __END_DECLS
 
 
@@ -335,24 +335,24 @@ __END_DECLS
  * Print why creation failed
  */
 __BEGIN_DECLS
-extern void clnt_pcreateerror	__P((char *));			/* stderr */
-extern char *clnt_spcreateerror	__P((char *));			/* string */
+extern void clnt_pcreateerror(char *);		/* stderr */
+extern char *clnt_spcreateerror(char *);	/* string */
 __END_DECLS
 
 /*
  * Like clnt_perror(), but is more verbose in its output
  */ 
 __BEGIN_DECLS
-extern void clnt_perrno		__P((enum clnt_stat));		/* stderr */
-extern char *clnt_sperrno	__P((enum clnt_stat));		/* string */
+extern void clnt_perrno(enum clnt_stat);	/* stderr */
+extern char *clnt_sperrno(enum clnt_stat);	/* string */
 __END_DECLS
 
 /*
  * Print an English error message, given the client error code
  */
 __BEGIN_DECLS
-extern void clnt_perror		__P((CLIENT *, char *)); 	/* stderr */
-extern char *clnt_sperror	__P((CLIENT *, char *));	/* string */
+extern void clnt_perror(CLIENT *, char *); 	/* stderr */
+extern char *clnt_sperror(CLIENT *, char *);	/* string */
 __END_DECLS
 
 
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index d3b5883f690..9e54c50243e 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_clnt.h,v 1.3 1998/08/29 18:57:14 deraadt Exp $	*/
+/*	$OpenBSD: pmap_clnt.h,v 1.4 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: pmap_clnt.h,v 1.5 1994/12/04 01:12:42 cgd Exp $	*/
 
 /*
@@ -67,9 +67,9 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern bool_t		pmap_set	__P((u_long, u_long, u_int, int));
-extern bool_t		pmap_unset	__P((u_long, u_long));
-extern struct pmaplist	*pmap_getmaps	__P((struct sockaddr_in *));
+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,
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 4b96be75714..32e88323b2f 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_prot.h,v 1.3 1998/02/10 06:25:32 deraadt Exp $	*/
+/*	$OpenBSD: pmap_prot.h,v 1.4 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: pmap_prot.h,v 1.4 1994/10/26 00:57:00 cgd Exp $	*/
 
 /*
@@ -99,8 +99,8 @@ struct pmaplist {
 };
 
 __BEGIN_DECLS
-extern bool_t xdr_pmap		__P((XDR *, struct pmap *));
-extern bool_t xdr_pmaplist	__P((XDR *, struct pmaplist **));
+extern bool_t xdr_pmap(XDR *, struct pmap *);
+extern bool_t xdr_pmaplist(XDR *, struct pmaplist **);
 __END_DECLS
 
 #endif /* !_RPC_PMAPPROT_H */
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index ad5021df85e..ca3a4d66457 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_rmt.h,v 1.2 1997/09/21 10:46:13 niklas Exp $	*/
+/*	$OpenBSD: pmap_rmt.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: pmap_rmt.h,v 1.4 1994/10/26 00:57:01 cgd Exp $	*/
 
 /*
@@ -58,8 +58,8 @@ struct rmtcallres {
 };
 
 __BEGIN_DECLS
-extern bool_t xdr_rmtcall_args	__P((XDR *, struct rmtcallargs *));
-extern bool_t xdr_rmtcallres	__P((XDR *, struct rmtcallres *));
+extern bool_t xdr_rmtcall_args(XDR *, struct rmtcallargs *);
+extern bool_t xdr_rmtcallres(XDR *, struct rmtcallres *);
 __END_DECLS
 
 #endif /* !_RPC_PMAPRMT_H */
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 52efff1ddc7..1d929e86a8c 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.h,v 1.8 2000/10/12 09:44:26 deraadt Exp $	*/
+/*	$OpenBSD: rpc.h,v 1.9 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: rpc.h,v 1.5 1994/12/04 01:15:30 cgd Exp $	*/
 
 /*
@@ -86,22 +86,22 @@ struct rpcent {
 };
 
 __BEGIN_DECLS
-extern struct rpcent *getrpcbyname	__P((char *));
-extern struct rpcent *getrpcbynumber	__P((int));
-extern struct rpcent *getrpcent		__P((void));
-extern void setrpcent __P((int));
-extern void endrpcent __P((void));
-
-extern int get_myaddress __P((struct sockaddr_in *));
-extern int registerrpc __P((int, int, int, char *(*) __P((char [UDPMSGSIZE])),
+extern struct rpcent *getrpcbyname(char *);
+extern struct rpcent *getrpcbynumber(int);
+extern struct rpcent *getrpcent(void);
+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 getrpcport __P((char *, int, int, int));
+extern int getrpcport(char *, int, int, int);
 
-extern bool_t xdr_opaque_auth __P((XDR *, struct opaque_auth *));
+extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
 
-extern int _rpc_dtablesize __P((void));
+extern int _rpc_dtablesize(void);
 
 __END_DECLS
 
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index d4e4d89f85a..1305959c8f7 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_msg.h,v 1.2 1997/09/21 10:46:15 niklas Exp $	*/
+/*	$OpenBSD: rpc_msg.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: rpc_msg.h,v 1.5 1995/04/29 05:28:00 cgd Exp $	*/
 
 /*
@@ -167,7 +167,7 @@ __BEGIN_DECLS
  * 	XDR *xdrs;
  * 	struct rpc_msg *cmsg;
  */
-extern bool_t	xdr_callmsg	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_callmsg(XDR *, struct rpc_msg *);
 
 /*
  * XDR routine to pre-serialize the static part of a rpc message.
@@ -175,7 +175,7 @@ extern bool_t	xdr_callmsg	__P((XDR *, struct rpc_msg *));
  * 	XDR *xdrs;
  * 	struct rpc_msg *cmsg;
  */
-extern bool_t	xdr_callhdr	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_callhdr(XDR *, struct rpc_msg *);
 
 /*
  * XDR routine to handle a rpc reply.
@@ -183,7 +183,7 @@ extern bool_t	xdr_callhdr	__P((XDR *, struct rpc_msg *));
  * 	XDR *xdrs;
  * 	struct rpc_msg *rmsg;
  */
-extern bool_t	xdr_replymsg	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_replymsg(XDR *, struct rpc_msg *);
 
 /*
  * Fills in the error part of a reply message.
@@ -191,7 +191,7 @@ extern bool_t	xdr_replymsg	__P((XDR *, struct rpc_msg *));
  * 	struct rpc_msg *msg;
  * 	struct rpc_err *error;
  */
-extern void	_seterr_reply	__P((struct rpc_msg *, struct rpc_err *));
+extern void	_seterr_reply(struct rpc_msg *, struct rpc_err *);
 __END_DECLS
 
 #endif /* !_RPC_RPCMSG_H */
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 0ade6063889..be428e2f4ef 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc.h,v 1.5 2001/09/15 13:51:00 deraadt Exp $	*/
+/*	$OpenBSD: svc.h,v 1.6 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: svc.h,v 1.9 1995/04/29 05:28:01 cgd Exp $	*/
 
 /*
@@ -82,7 +82,7 @@ typedef struct __rpc_svcxprt {
 		bool_t	(*xp_recv) __P((struct __rpc_svcxprt *,
 			    struct rpc_msg *));
 		/* get transport status */
-		enum xprt_stat (*xp_stat) __P((struct __rpc_svcxprt *));
+		enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *);
 		/* get arguments */
 		bool_t	(*xp_getargs) __P((struct __rpc_svcxprt *, xdrproc_t,
 			    caddr_t));
@@ -93,7 +93,7 @@ typedef struct __rpc_svcxprt {
 		bool_t	(*xp_freeargs) __P((struct __rpc_svcxprt *, xdrproc_t,
 			    caddr_t));
 		/* destroy this struct */
-		void	(*xp_destroy) __P((struct __rpc_svcxprt *));
+		void	(*xp_destroy)(struct __rpc_svcxprt *);
 	} *xp_ops;
 	socklen_t	xp_addrlen;	 /* length of remote address */
 	struct sockaddr_in xp_raddr;	 /* remote address */
@@ -171,7 +171,7 @@ struct svc_req {
  */
 __BEGIN_DECLS
 extern bool_t	svc_register __P((SVCXPRT *, u_long, u_long,
-		    void (*) __P((struct svc_req *, SVCXPRT *)), int));
+		    void (*)(struct svc_req *, SVCXPRT *), int));
 __END_DECLS
 
 /*
@@ -182,7 +182,7 @@ __END_DECLS
  *	u_long vers;
  */
 __BEGIN_DECLS
-extern void	svc_unregister __P((u_long, u_long));
+extern void	svc_unregister(u_long, u_long);
 __END_DECLS
 
 /*
@@ -192,8 +192,8 @@ __END_DECLS
  *	SVCXPRT *xprt;
  */
 __BEGIN_DECLS
-extern void	xprt_register	__P((SVCXPRT *));
-extern int	__xprt_register	__P((SVCXPRT *));
+extern void	xprt_register(SVCXPRT *);
+extern int	__xprt_register(SVCXPRT *);
 __END_DECLS
 
 /*
@@ -203,7 +203,7 @@ __END_DECLS
  *	SVCXPRT *xprt;
  */
 __BEGIN_DECLS
-extern void	xprt_unregister	__P((SVCXPRT *));
+extern void	xprt_unregister(SVCXPRT *);
 __END_DECLS
 
 
@@ -236,14 +236,14 @@ __END_DECLS
  */
 
 __BEGIN_DECLS
-extern bool_t	svc_sendreply	__P((SVCXPRT *, xdrproc_t, char *));
-extern void	svcerr_decode	__P((SVCXPRT *));
-extern void	svcerr_weakauth	__P((SVCXPRT *));
-extern void	svcerr_noproc	__P((SVCXPRT *));
-extern void	svcerr_progvers	__P((SVCXPRT *, u_long, u_long));
-extern void	svcerr_auth	__P((SVCXPRT *, enum auth_stat));
-extern void	svcerr_noprog	__P((SVCXPRT *));
-extern void	svcerr_systemerr __P((SVCXPRT *));
+extern bool_t	svc_sendreply(SVCXPRT *, xdrproc_t, char *);
+extern void	svcerr_decode(SVCXPRT *);
+extern void	svcerr_weakauth(SVCXPRT *);
+extern void	svcerr_noproc(SVCXPRT *);
+extern void	svcerr_progvers(SVCXPRT *, u_long, u_long);
+extern void	svcerr_auth(SVCXPRT *, enum auth_stat);
+extern void	svcerr_noprog(SVCXPRT *);
+extern void	svcerr_systemerr(SVCXPRT *);
 __END_DECLS
     
 /*
@@ -276,10 +276,10 @@ extern int svc_fds;
 extern void rpctest_service();				/* XXX relic? */
 
 __BEGIN_DECLS
-extern void	svc_getreq	__P((int));
-extern void	svc_getreqset	__P((fd_set *));
-extern void	svc_getreqset2	__P((fd_set *, int));
-extern void	svc_run		__P((void));
+extern void	svc_getreq(int);
+extern void	svc_getreqset(fd_set *);
+extern void	svc_getreqset2(fd_set *, int);
+extern void	svc_run(void);
 __END_DECLS
 
 /*
@@ -295,7 +295,7 @@ __END_DECLS
  * Memory based rpc for testing and timing.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcraw_create __P((void));
+extern SVCXPRT *svcraw_create(void);
 __END_DECLS
 
 
@@ -303,8 +303,8 @@ __END_DECLS
  * Udp based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcudp_create __P((int));
-extern SVCXPRT *svcudp_bufcreate __P((int, u_int, u_int));
+extern SVCXPRT *svcudp_create(int);
+extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
 __END_DECLS
 
 
@@ -312,14 +312,14 @@ __END_DECLS
  * Tcp based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svctcp_create __P((int, u_int, u_int));
+extern SVCXPRT *svctcp_create(int, u_int, u_int);
 __END_DECLS
 
 /*
  * Fd based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcfd_create __P((int, u_int, u_int));
+extern SVCXPRT *svcfd_create(int, u_int, u_int);
 __END_DECLS
 
 #endif /* !_RPC_SVC_H */
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index d775ae8772a..89f96ce5a8d 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc_auth.h,v 1.2 1997/09/21 10:46:16 niklas Exp $	*/
+/*	$OpenBSD: svc_auth.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: svc_auth.h,v 1.4 1994/10/26 00:57:07 cgd Exp $	*/
 
 /*
@@ -46,7 +46,7 @@
  * Server side authenticator
  */
 __BEGIN_DECLS
-extern enum auth_stat _authenticate __P((struct svc_req *, struct rpc_msg *));
+extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *);
 __END_DECLS
 
 #endif /* !_RPC_SVCAUTH_H */
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index abbfb341a25..3b9076ea4ca 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xdr.h,v 1.2 1997/09/21 10:46:18 niklas Exp $	*/
+/*	$OpenBSD: xdr.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: xdr.h,v 1.7 1995/04/29 05:28:06 cgd Exp $	*/
 
 /*
@@ -101,21 +101,21 @@ typedef struct __rpc_xdr {
 	enum xdr_op	x_op;		/* operation; fast additional param */
 	struct xdr_ops {
 		/* get a long from underlying stream */
-		bool_t	(*x_getlong) __P((struct __rpc_xdr *, long *));
+		bool_t	(*x_getlong)(struct __rpc_xdr *, long *);
 		/* put a long to " */
-		bool_t	(*x_putlong) __P((struct __rpc_xdr *, long *));
+		bool_t	(*x_putlong)(struct __rpc_xdr *, long *);
 		/* get some bytes from " */
-		bool_t	(*x_getbytes) __P((struct __rpc_xdr *, caddr_t, u_int));
+		bool_t	(*x_getbytes)(struct __rpc_xdr *, caddr_t, u_int);
 		/* put some bytes to " */
-		bool_t	(*x_putbytes) __P((struct __rpc_xdr *, caddr_t, u_int));
+		bool_t	(*x_putbytes)(struct __rpc_xdr *, caddr_t, u_int);
 		/* returns bytes off from beginning */
-		u_int	(*x_getpostn) __P((struct __rpc_xdr *));
+		u_int	(*x_getpostn)(struct __rpc_xdr *);
 		/* lets you reposition the stream */
-		bool_t  (*x_setpostn) __P((struct __rpc_xdr *, u_int));
+		bool_t  (*x_setpostn)(struct __rpc_xdr *, u_int);
 		/* buf quick ptr to buffered data */
-		int32_t	*(*x_inline) __P((struct __rpc_xdr *, u_int));
+		int32_t	*(*x_inline)(struct __rpc_xdr *, u_int);
 		/* free privates of this xdr_stream */
-		void	(*x_destroy) __P((struct __rpc_xdr *));
+		void	(*x_destroy)(struct __rpc_xdr *);
 	} *x_ops;
 	caddr_t 	x_public;	/* users' data */
 	caddr_t		x_private;	/* pointer to private data */
@@ -133,7 +133,7 @@ typedef struct __rpc_xdr {
  *
  * XXX can't actually prototype it, because some take three args!!!
  */
-typedef	bool_t (*xdrproc_t) __P((/* XDR *, void *, u_int */));
+typedef	bool_t (*xdrproc_t)(/* XDR *, void *, u_int */);
 
 /*
  * Operations defined on a XDR handle
@@ -236,33 +236,33 @@ struct xdr_discrim {
  * These are the "generic" xdr routines.
  */
 __BEGIN_DECLS
-extern bool_t	xdr_void	__P((void));
-extern bool_t	xdr_int		__P((XDR *, int *));
-extern bool_t	xdr_u_int	__P((XDR *, u_int *));
-extern bool_t	xdr_long	__P((XDR *, long *));
-extern bool_t	xdr_u_long	__P((XDR *, u_long *));
-extern bool_t	xdr_short	__P((XDR *, short *));
-extern bool_t	xdr_u_short	__P((XDR *, u_short *));
-extern bool_t	xdr_int16_t	__P((XDR *, int16_t *));
-extern bool_t	xdr_u_int16_t	__P((XDR *, u_int16_t *));
-extern bool_t	xdr_int32_t	__P((XDR *, int32_t *));
-extern bool_t	xdr_u_int32_t	__P((XDR *, u_int32_t *));
-extern bool_t	xdr_bool	__P((XDR *, bool_t *));
-extern bool_t	xdr_enum	__P((XDR *, enum_t *));
-extern bool_t	xdr_array	__P((XDR *, char **, u_int *, u_int, u_int, xdrproc_t));
-extern bool_t	xdr_bytes	__P((XDR *, char **, u_int *, u_int));
-extern bool_t	xdr_opaque	__P((XDR *, caddr_t, u_int));
-extern bool_t	xdr_string	__P((XDR *, char **, u_int));
-extern bool_t	xdr_union	__P((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t));
-extern bool_t	xdr_char	__P((XDR *, char *));
-extern bool_t	xdr_u_char	__P((XDR *, u_char *));
-extern bool_t	xdr_vector	__P((XDR *, char *, u_int, u_int, xdrproc_t));
-extern bool_t	xdr_float	__P((XDR *, float *));
-extern bool_t	xdr_double	__P((XDR *, double *));
-extern bool_t	xdr_reference	__P((XDR *, caddr_t *, u_int, xdrproc_t));
-extern bool_t	xdr_pointer	__P((XDR *, caddr_t *, u_int, xdrproc_t));
-extern bool_t	xdr_wrapstring	__P((XDR *, char **));
-extern void	xdr_free 	__P((xdrproc_t, char *));
+extern bool_t	xdr_void(void);
+extern bool_t	xdr_int(XDR *, int *);
+extern bool_t	xdr_u_int(XDR *, u_int *);
+extern bool_t	xdr_long(XDR *, long *);
+extern bool_t	xdr_u_long(XDR *, u_long *);
+extern bool_t	xdr_short(XDR *, short *);
+extern bool_t	xdr_u_short(XDR *, u_short *);
+extern bool_t	xdr_int16_t(XDR *, int16_t *);
+extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
+extern bool_t	xdr_int32_t(XDR *, int32_t *);
+extern bool_t	xdr_u_int32_t(XDR *, u_int32_t *);
+extern bool_t	xdr_bool(XDR *, bool_t *);
+extern bool_t	xdr_enum(XDR *, enum_t *);
+extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
+extern bool_t	xdr_bytes(XDR *, char **, u_int *, u_int);
+extern bool_t	xdr_opaque(XDR *, caddr_t, u_int);
+extern bool_t	xdr_string(XDR *, char **, u_int);
+extern bool_t	xdr_union(XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t);
+extern bool_t	xdr_char(XDR *, char *);
+extern bool_t	xdr_u_char(XDR *, u_char *);
+extern bool_t	xdr_vector(XDR *, char *, u_int, u_int, xdrproc_t);
+extern bool_t	xdr_float(XDR *, float *);
+extern bool_t	xdr_double(XDR *, double *);
+extern bool_t	xdr_reference(XDR *, caddr_t *, u_int, xdrproc_t);
+extern bool_t	xdr_pointer(XDR *, caddr_t *, u_int, xdrproc_t);
+extern bool_t	xdr_wrapstring(XDR *, char **);
+extern void	xdr_free(xdrproc_t, char *);
 __END_DECLS
 
 /*
@@ -275,7 +275,7 @@ struct netobj {
 	char	*n_bytes;
 };
 typedef struct netobj netobj;
-extern bool_t   xdr_netobj __P((XDR *, struct netobj *));
+extern bool_t   xdr_netobj(XDR *, struct netobj *);
 
 /*
  * These are the public routines for the various implementations of
@@ -283,26 +283,26 @@ extern bool_t   xdr_netobj __P((XDR *, struct netobj *));
  */
 __BEGIN_DECLS
 /* XDR using memory buffers */
-extern void   xdrmem_create	__P((XDR *, char *, u_int, enum xdr_op));
+extern void   xdrmem_create(XDR *, char *, u_int, enum xdr_op);
 
 #ifdef _STDIO_H_
 /* XDR using stdio library */
-extern void   xdrstdio_create	__P((XDR *, FILE *, enum xdr_op));
+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 (*) __P((caddr_t, caddr_t, int)),
-				    int (*) __P((caddr_t, caddr_t, int))));
+				    int (*)(caddr_t, caddr_t, int),
+				    int (*)(caddr_t, caddr_t, int)));
 
 /* make end of xdr record */
-extern bool_t xdrrec_endofrecord __P((XDR *, int));
+extern bool_t xdrrec_endofrecord(XDR *, int);
 
 /* move to beginning of next record */
-extern bool_t xdrrec_skiprecord	__P((XDR *));
+extern bool_t xdrrec_skiprecord(XDR *);
 
 /* true if no more input */
-extern bool_t xdrrec_eof	__P((XDR *));
+extern bool_t xdrrec_eof(XDR *);
 __END_DECLS
 
 #endif /* !_RPC_XDR_H */
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index 1265927373f..0da57917c6c 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yp_prot.h,v 1.4 2000/03/15 03:56:48 todd Exp $	*/
+/*	$OpenBSD: yp_prot.h,v 1.5 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: yp_prot.h,v 1.6 1995/07/14 21:10:58 christos Exp $	*/
 
 /*
@@ -319,27 +319,27 @@ struct yppushresp_xfr {
 #define YPPUSH_REFUSED	((unsigned long)-14)	/* Transfer request refused by ypserv */
 
 __BEGIN_DECLS
-bool_t xdr_domainname __P((XDR *, char *));
-bool_t xdr_peername __P((XDR *, char *));
-bool_t xdr_datum __P((XDR *, datum *));
-bool_t xdr_mapname __P((XDR *, char *));
-bool_t xdr_ypreq_key __P((XDR *, struct ypreq_key *));
-bool_t xdr_ypreq_nokey __P((XDR *, struct ypreq_nokey *));
-bool_t xdr_yp_inaddr __P((XDR *, struct in_addr *));
-bool_t xdr_ypbind_binding __P((XDR *, struct ypbind_binding *));
-bool_t xdr_ypbind_resptype __P((XDR *, enum ypbind_resptype *));
-bool_t xdr_ypstat __P((XDR *, enum ypbind_resptype *));
-bool_t xdr_ypbind_resp __P((XDR *, struct ypbind_resp *));
-bool_t xdr_ypresp_val __P((XDR *, struct ypresp_val *));
-bool_t xdr_ypbind_setdom __P((XDR *, struct ypbind_setdom *));
-bool_t xdr_ypresp_key_val __P((XDR *, struct ypresp_key_val *));
-bool_t xdr_ypresp_all __P((XDR *, struct ypresp_all *));
-bool_t xdr_ypresp_all_seq __P((XDR *, u_long *));
-bool_t xdr_ypresp_master __P((XDR *, struct ypresp_master *));
-bool_t xdr_ypmaplist_str __P((XDR *, char *));
-bool_t xdr_ypmaplist __P((XDR *, struct ypmaplist *));
-bool_t xdr_ypresp_maplist __P((XDR *, struct ypresp_maplist *));
-bool_t xdr_ypresp_order __P((XDR *, struct ypresp_order *));
+bool_t xdr_domainname(XDR *, char *);
+bool_t xdr_peername(XDR *, char *);
+bool_t xdr_datum(XDR *, datum *);
+bool_t xdr_mapname(XDR *, char *);
+bool_t xdr_ypreq_key(XDR *, struct ypreq_key *);
+bool_t xdr_ypreq_nokey(XDR *, struct ypreq_nokey *);
+bool_t xdr_yp_inaddr(XDR *, struct in_addr *);
+bool_t xdr_ypbind_binding(XDR *, struct ypbind_binding *);
+bool_t xdr_ypbind_resptype(XDR *, enum ypbind_resptype *);
+bool_t xdr_ypstat(XDR *, enum ypbind_resptype *);
+bool_t xdr_ypbind_resp(XDR *, struct ypbind_resp *);
+bool_t xdr_ypresp_val(XDR *, struct ypresp_val *);
+bool_t xdr_ypbind_setdom(XDR *, struct ypbind_setdom *);
+bool_t xdr_ypresp_key_val(XDR *, struct ypresp_key_val *);
+bool_t xdr_ypresp_all(XDR *, struct ypresp_all *);
+bool_t xdr_ypresp_all_seq(XDR *, u_long *);
+bool_t xdr_ypresp_master(XDR *, struct ypresp_master *);
+bool_t xdr_ypmaplist_str(XDR *, char *);
+bool_t xdr_ypmaplist(XDR *, struct ypmaplist *);
+bool_t xdr_ypresp_maplist(XDR *, struct ypresp_maplist *);
+bool_t xdr_ypresp_order(XDR *, struct ypresp_order *);
 __END_DECLS
 
 #endif /* _RPCSVC_YP_PROT_H_ */
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index c132f5bf250..8a4d6cf2594 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypclnt.h,v 1.4 1997/09/21 10:46:20 niklas Exp $	*/
+/*	$OpenBSD: ypclnt.h,v 1.5 2002/02/16 21:27:18 millert Exp $	*/
 /*	$NetBSD: ypclnt.h,v 1.7 1995/07/14 21:11:10 christos Exp $	*/
 
 /*
@@ -62,30 +62,30 @@
  
 struct ypall_callback {
 	/* return non-0 to stop getting called */
-	int (*foreach) __P((u_long, char *, int, char *, int, void *));
+	int (*foreach)(u_long, char *, int, char *, int, void *);
 	char *data;		/* opaque pointer for use of callback fn */
 };
 
 __BEGIN_DECLS
-int	yp_bind		__P((const char *));
+int	yp_bind(const char *);
 struct dom_binding;
-int	_yp_dobind	__P((const char *, struct dom_binding **));
-void	yp_unbind	__P((const char *));
-int	yp_get_default_domain __P((char **));
+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_master	__P((const char *, const char *, char **));
-int	yp_order	__P((const char *, const 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 *));
-char *	yperr_string	__P((int));
-int	ypprot_err	__P((unsigned int));
+char *	yperr_string(int);
+int	ypprot_err(unsigned int);
 struct ypmaplist;
-int	yp_maplist	__P((const char *, struct ypmaplist **));
+int	yp_maplist(const char *, struct ypmaplist **);
 __END_DECLS
 
 #endif /* _RPCSVC_YPCLNT_H_ */
diff --git a/include/search.h b/include/search.h
index 528d6414a40..53efbadba50 100644
--- a/include/search.h
+++ b/include/search.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.h,v 1.3 1997/09/21 10:45:49 niklas Exp $	*/
+/*	$OpenBSD: search.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: search.h,v 1.9 1995/08/08 21:14:45 jtc Exp $	*/
 
 /*
@@ -35,16 +35,16 @@ typedef enum {
 __BEGIN_DECLS
 extern void	*bsearch __P((const void *, const void *, size_t, size_t,
 			      int (*)(const void *, const void *)));
-extern int	 hcreate __P((unsigned int));
-extern void	 hdestroy __P((void));
-extern ENTRY	*hsearch __P((ENTRY, ACTION));
+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	 insque __P((void *, void *));
-extern void	 remque __P((void *));
+extern void	 insque(void *, void *);
+extern void	 remque(void *);
 
 extern void	*tdelete __P((const void *, void **,
 			      int (*)(const void *, const void *)));
diff --git a/include/setjmp.h b/include/setjmp.h
index f13d08ff6c1..a4dfd1a2aac 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.h,v 1.2 1997/09/21 10:45:50 niklas Exp $	*/
+/*	$OpenBSD: setjmp.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: setjmp.h,v 1.11 1994/12/20 10:35:44 cgd Exp $	*/
 
 /*-
@@ -55,18 +55,18 @@ typedef long jmp_buf[_JBLEN];
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	setjmp __P((jmp_buf));
-void	longjmp __P((jmp_buf, int));
+int	setjmp(jmp_buf);
+void	longjmp(jmp_buf, int);
 
 #ifndef _ANSI_SOURCE
-int	sigsetjmp __P((sigjmp_buf, int));
-void	siglongjmp __P((sigjmp_buf, int));
+int	sigsetjmp(sigjmp_buf, int);
+void	siglongjmp(sigjmp_buf, int);
 #endif /* not ANSI */
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int	_setjmp __P((jmp_buf));
-void	_longjmp __P((jmp_buf, int));
-void	longjmperror __P((void));
+int	_setjmp(jmp_buf);
+void	_longjmp(jmp_buf, int);
+void	longjmperror(void);
 #endif /* neither ANSI nor POSIX */
 __END_DECLS
 
diff --git a/include/sgtty.h b/include/sgtty.h
index 3da15f64290..ea27bae383b 100644
--- a/include/sgtty.h
+++ b/include/sgtty.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sgtty.h,v 1.2 1997/09/21 10:45:51 niklas Exp $	*/
+/*	$OpenBSD: sgtty.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: sgtty.h,v 1.4 1995/06/05 19:40:33 pk Exp $	*/
 
 /*
@@ -43,6 +43,6 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int gtty __P((int, struct sgttyb *));
-int stty __P((int, struct sgttyb *));
+int gtty(int, struct sgttyb *);
+int stty(int, struct sgttyb *);
 __END_DECLS
diff --git a/include/sha1.h b/include/sha1.h
index 6da7e22f0f1..58733f1632d 100644
--- a/include/sha1.h
+++ b/include/sha1.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sha1.h,v 1.9 1999/02/03 03:13:18 angelos Exp $	*/
+/*	$OpenBSD: sha1.h,v 1.10 2002/02/16 21:27:17 millert Exp $	*/
 
 /*
  * SHA-1 in C
@@ -15,13 +15,13 @@ typedef struct {
     u_char buffer[64];
 } SHA1_CTX;
   
-void SHA1Transform __P((u_int32_t state[5], const u_char buffer[64]));
-void SHA1Init __P((SHA1_CTX *context));
-void SHA1Update __P((SHA1_CTX *context, const u_char *data, u_int len));
-void SHA1Final __P((u_char digest[20], SHA1_CTX *context));
-char *SHA1End __P((SHA1_CTX *, char *));
-char *SHA1File __P((char *, char *));
-char *SHA1Data __P((const u_char *, size_t, char *));
+void SHA1Transform(u_int32_t state[5], const u_char buffer[64]);
+void SHA1Init(SHA1_CTX *context);
+void SHA1Update(SHA1_CTX *context, const u_char *data, u_int len);
+void SHA1Final(u_char digest[20], SHA1_CTX *context);
+char *SHA1End(SHA1_CTX *, char *);
+char *SHA1File(char *, char *);
+char *SHA1Data(const u_char *, size_t, char *);
 
 #define SHA1_DIGESTSIZE       20
 #define SHA1_BLOCKSIZE        64
diff --git a/include/signal.h b/include/signal.h
index 82f39b14f11..84d20e6280c 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.4 1998/11/20 11:18:26 d Exp $	*/
+/*	$OpenBSD: signal.h,v 1.5 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $	*/
 
 /*-
@@ -51,18 +51,18 @@ extern __const char *__const sys_siglist[_NSIG];
 #endif
 
 __BEGIN_DECLS
-int	raise __P((int));
+int	raise(int);
 #ifndef	_ANSI_SOURCE
-int	kill __P((pid_t, int));
-int	sigaction __P((int, const struct sigaction *, struct sigaction *));
-int	sigaddset __P((sigset_t *, int));
-int	sigdelset __P((sigset_t *, int));
-int	sigemptyset __P((sigset_t *));
-int	sigfillset __P((sigset_t *));
-int	sigismember __P((const sigset_t *, int));
-int	sigpending __P((sigset_t *));
-int	sigprocmask __P((int, const sigset_t *, sigset_t *));
-int	sigsuspend __P((const sigset_t *));
+int	kill(pid_t, int);
+int	sigaction(int, const struct sigaction *, struct sigaction *);
+int	sigaddset(sigset_t *, int);
+int	sigdelset(sigset_t *, int);
+int	sigemptyset(sigset_t *);
+int	sigfillset(sigset_t *);
+int	sigismember(const sigset_t *, int);
+int	sigpending(sigset_t *);
+int	sigprocmask(int, const sigset_t *, sigset_t *);
+int	sigsuspend(const sigset_t *);
 
 #if defined(__GNUC__) && defined(__STDC__)
 extern __inline int sigaddset(sigset_t *set, int signo) {
@@ -103,17 +103,17 @@ extern __inline int sigismember(const sigset_t *set, int signo) {
 #define	sigfillset(set)		(*(set) = ~(sigset_t)0, 0)
 
 #ifndef _POSIX_SOURCE
-int	killpg __P((pid_t, int));
-int	sigblock __P((int));
-int	siginterrupt __P((int, int));
-int	sigpause __P((int));
-int	sigreturn __P((struct sigcontext *));
-int	sigsetmask __P((int));
-int	sigstack __P((const struct sigstack *, struct sigstack *));
-int	sigaltstack __P((const struct sigaltstack *, struct sigaltstack *));
-int	sigvec __P((int, struct sigvec *, struct sigvec *));
-void	psignal __P((unsigned int, const char *));
-int	sigwait __P((const sigset_t *, int *));
+int	killpg(pid_t, int);
+int	sigblock(int);
+int	siginterrupt(int, int);
+int	sigpause(int);
+int	sigreturn(struct sigcontext *);
+int	sigsetmask(int);
+int	sigstack(const struct sigstack *, struct sigstack *);
+int	sigaltstack(const struct sigaltstack *, struct sigaltstack *);
+int	sigvec(int, struct sigvec *, struct sigvec *);
+void	psignal(unsigned int, const char *);
+int	sigwait(const sigset_t *, int *);
 #endif	/* !_POSIX_SOURCE */
 #endif	/* !_ANSI_SOURCE */
 __END_DECLS
diff --git a/include/skipjack.h b/include/skipjack.h
index 37c141d5f49..ae1b0e3ff16 100644
--- a/include/skipjack.h
+++ b/include/skipjack.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skipjack.h,v 1.2 2001/01/28 23:43:15 niklas Exp $	*/
+/*	$OpenBSD: skipjack.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 
 /* 
  * Further optimized test implementation of SKIPJACK algorithm 
@@ -13,6 +13,6 @@
  * 29 May 1998
 */
 
-extern void skipjack_forwards __P((u_int8_t *plain, u_int8_t *cipher, u_int8_t **key));
-extern void skipjack_backwards __P((u_int8_t *cipher, u_int8_t *plain, u_int8_t **key));
-extern void subkey_table_gen __P((u_int8_t *key, u_int8_t **key_tables));
+extern void skipjack_forwards(u_int8_t *plain, u_int8_t *cipher, u_int8_t **key);
+extern void skipjack_backwards(u_int8_t *cipher, u_int8_t *plain, u_int8_t **key);
+extern void subkey_table_gen(u_int8_t *key, u_int8_t **key_tables);
diff --git a/include/stdio.h b/include/stdio.h
index 060a3f810df..4bf6c0242c8 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.19 2001/11/02 00:19:10 espie Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.20 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -118,10 +118,10 @@ typedef	struct __sFILE {
 
 	/* operations */
 	void	*_cookie;	/* cookie passed to io functions */
-	int	(*_close) __P((void *));
-	int	(*_read)  __P((void *, char *, int));
-	fpos_t	(*_seek)  __P((void *, fpos_t, int));
-	int	(*_write) __P((void *, const char *, int));
+	int	(*_close)(void *);
+	int	(*_read)(void *, char *, int);
+	fpos_t	(*_seek)(void *, fpos_t, int);
+	int	(*_write)(void *, const char *, int);
 
 	/* separate buffer for long sequences of ungetc() */
 	struct	__sbuf _ub;	/* ungetc buffer */
@@ -210,55 +210,55 @@ __END_DECLS
  * Functions defined in ANSI C standard.
  */
 __BEGIN_DECLS
-void	 clearerr __P((FILE *));
-int	 fclose __P((FILE *));
-int	 feof __P((FILE *));
-int	 ferror __P((FILE *));
-int	 fflush __P((FILE *));
-int	 fgetc __P((FILE *));
-int	 fgetpos __P((FILE *, fpos_t *));
-char	*fgets __P((char *, int, FILE *));
-FILE	*fopen __P((const char *, const char *));
-int	 fprintf __P((FILE *, const char *, ...));
-int	 fputc __P((int, FILE *));
-int	 fputs __P((const char *, FILE *));
-size_t	 fread __P((void *, size_t, size_t, FILE *));
-FILE	*freopen __P((const char *, const char *, FILE *));
-int	 fscanf __P((FILE *, const char *, ...));
-int	 fseek __P((FILE *, long, int));
-int	 fseeko __P((FILE *, off_t, int));
-int	 fsetpos __P((FILE *, const fpos_t *));
-long	 ftell __P((FILE *));
-off_t	 ftello __P((FILE *));
-size_t	 fwrite __P((const void *, size_t, size_t, FILE *));
-int	 getc __P((FILE *));
-int	 getchar __P((void));
-char	*gets __P((char *));
+void	 clearerr(FILE *);
+int	 fclose(FILE *);
+int	 feof(FILE *);
+int	 ferror(FILE *);
+int	 fflush(FILE *);
+int	 fgetc(FILE *);
+int	 fgetpos(FILE *, fpos_t *);
+char	*fgets(char *, int, FILE *);
+FILE	*fopen(const char *, const char *);
+int	 fprintf(FILE *, const char *, ...);
+int	 fputc(int, FILE *);
+int	 fputs(const char *, FILE *);
+size_t	 fread(void *, size_t, size_t, FILE *);
+FILE	*freopen(const char *, const char *, FILE *);
+int	 fscanf(FILE *, const char *, ...);
+int	 fseek(FILE *, long, int);
+int	 fseeko(FILE *, off_t, int);
+int	 fsetpos(FILE *, const fpos_t *);
+long	 ftell(FILE *);
+off_t	 ftello(FILE *);
+size_t	 fwrite(const void *, size_t, size_t, FILE *);
+int	 getc(FILE *);
+int	 getchar(void);
+char	*gets(char *);
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__SYS_ERRLIST)
 #define __SYS_ERRLIST
 
 extern int sys_nerr;			/* perror(3) external variables */
 extern char *sys_errlist[];
 #endif
-void	 perror __P((const char *));
-int	 printf __P((const char *, ...));
-int	 putc __P((int, FILE *));
-int	 putchar __P((int));
-int	 puts __P((const char *));
-int	 remove __P((const char *));
-int	 rename  __P((const char *, const char *));
-void	 rewind __P((FILE *));
-int	 scanf __P((const char *, ...));
-void	 setbuf __P((FILE *, char *));
-int	 setvbuf __P((FILE *, char *, int, size_t));
-int	 sprintf __P((char *, const char *, ...));
-int	 sscanf __P((const char *, const char *, ...));
-FILE	*tmpfile __P((void));
-char	*tmpnam __P((char *));
-int	 ungetc __P((int, FILE *));
-int	 vfprintf __P((FILE *, const char *, _BSD_VA_LIST_));
-int	 vprintf __P((const char *, _BSD_VA_LIST_));
-int	 vsprintf __P((char *, const char *, _BSD_VA_LIST_));
+void	 perror(const char *);
+int	 printf(const char *, ...);
+int	 putc(int, FILE *);
+int	 putchar(int);
+int	 puts(const char *);
+int	 remove(const char *);
+int	 rename(const char *, const char *);
+void	 rewind(FILE *);
+int	 scanf(const char *, ...);
+void	 setbuf(FILE *, char *);
+int	 setvbuf(FILE *, char *, int, size_t);
+int	 sprintf(char *, const char *, ...);
+int	 sscanf(const char *, const char *, ...);
+FILE	*tmpfile(void);
+char	*tmpnam(char *);
+int	 ungetc(int, FILE *);
+int	 vfprintf(FILE *, const char *, _BSD_VA_LIST_);
+int	 vprintf(const char *, _BSD_VA_LIST_);
+int	 vsprintf(char *, const char *, _BSD_VA_LIST_);
 __END_DECLS
 
 /*
@@ -269,19 +269,19 @@ __END_DECLS
 #define L_cuserid	9	/* size for cuserid(); UT_NAMESIZE + 1 */
 
 __BEGIN_DECLS
-char	*ctermid __P((char *));
-char	*ctermid_r __P((char *));
-char	*cuserid __P((char *));
-FILE	*fdopen __P((int, const char *));
-int	 fileno __P((FILE *));
-void	 flockfile __P((FILE *));
-int	 ftrylockfile __P((FILE *));
-void	 funlockfile __P((FILE *));
-void	 _flockfile_debug __P((FILE *, char *, int));
-int	 getc_unlocked __P((FILE *));
-int	 putc_unlocked __P((int, FILE *));
-int	 getchar_unlocked __P((void));
-int	 putchar_unlocked __P((int));
+char	*ctermid(char *);
+char	*ctermid_r(char *);
+char	*cuserid(char *);
+FILE	*fdopen(int, const char *);
+int	 fileno(FILE *);
+void	 flockfile(FILE *);
+int	 ftrylockfile(FILE *);
+void	 funlockfile(FILE *);
+void	 _flockfile_debug(FILE *, char *, int);
+int	 getc_unlocked(FILE *);
+int	 putc_unlocked(int, FILE *);
+int	 getchar_unlocked(void);
+int	 putchar_unlocked(int);
 __END_DECLS
 
 #ifndef _POSIX_THREADS
@@ -302,31 +302,31 @@ __END_DECLS
  */
 #if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 __BEGIN_DECLS
-int	 asprintf __P((char **, const char *, ...))
+int	 asprintf(char **, const char *, ...)
 		__attribute__((__format__ (printf, 2, 3)))
 		__attribute__((__nonnull__ (2)));
-char	*fgetln __P((FILE *, size_t *));
-int	 fpurge __P((FILE *));
-int	 getw __P((FILE *));
-int	 pclose __P((FILE *));
-FILE	*popen __P((const char *, const char *));
-int	 putw __P((int, FILE *));
-void	 setbuffer __P((FILE *, char *, int));
-int	 setlinebuf __P((FILE *));
-char	*tempnam __P((const char *, const char *));
-int	 snprintf __P((char *, size_t, const char *, ...))
+char	*fgetln(FILE *, size_t *);
+int	 fpurge(FILE *);
+int	 getw(FILE *);
+int	 pclose(FILE *);
+FILE	*popen(const char *, const char *);
+int	 putw(int, FILE *);
+void	 setbuffer(FILE *, char *, int);
+int	 setlinebuf(FILE *);
+char	*tempnam(const char *, const char *);
+int	 snprintf(char *, size_t, const char *, ...)
 		__attribute__((__format__ (printf, 3, 4)))
 		__attribute__((__nonnull__ (3)));
-int	 vasprintf __P((char **, const char *, _BSD_VA_LIST_))
+int	 vasprintf(char **, const char *, _BSD_VA_LIST_)
 		__attribute__((__format__ (printf, 2, 0)))
 		__attribute__((__nonnull__ (2)));
-int	 vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_))
+int	 vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_)
 		__attribute__((__format__ (printf, 3, 0)))
 		__attribute__((__nonnull__ (3)));
-int	 vscanf __P((const char *, _BSD_VA_LIST_))
+int	 vscanf(const char *, _BSD_VA_LIST_)
 		__attribute__((__format__ (scanf, 1, 0)))
 		__attribute__((__nonnull__ (1)));
-int	 vsscanf __P((const char *, const char *, _BSD_VA_LIST_))
+int	 vsscanf(const char *, const char *, _BSD_VA_LIST_)
 		__attribute__((__format__ (scanf, 2, 0)))
 		__attribute__((__nonnull__ (2)));
 __END_DECLS
@@ -356,9 +356,9 @@ __END_DECLS
  * Functions internal to the implementation.
  */
 __BEGIN_DECLS
-int	__srget __P((FILE *));
-int	__svfscanf __P((FILE *, const char *, _BSD_VA_LIST_));
-int	__swbuf __P((int, FILE *));
+int	__srget(FILE *);
+int	__svfscanf(FILE *, const char *, _BSD_VA_LIST_);
+int	__swbuf(int, FILE *);
 __END_DECLS
 
 /*
diff --git a/include/stdlib.h b/include/stdlib.h
index 35cc374813b..32b91157ffb 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdlib.h,v 1.15 2001/11/04 23:27:54 krw Exp $	*/
+/*	$OpenBSD: stdlib.h,v 1.16 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $	*/
 
 /*-
@@ -93,77 +93,77 @@ typedef struct {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-__dead void	 abort __P((void));
-int	 abs __P((int));
+__dead void	 abort(void);
+int	 abs(int);
 int	 atexit __P((void (*)(void)));
-double	 atof __P((const char *));
-int	 atoi __P((const char *));
-long	 atol __P((const char *));
+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	*calloc __P((size_t, size_t));
-div_t	 div __P((int, int));
-__dead void	 exit __P((int));
-void	 free __P((void *));
-char	*getenv __P((const char *));
-long	 labs __P((long));
-ldiv_t	 ldiv __P((long, long));
-void	*malloc __P((size_t));
+void	*calloc(size_t, size_t);
+div_t	 div(int, int);
+__dead void	 exit(int);
+void	 free(void *);
+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 *)));
-int	 rand __P((void));
-int	 rand_r __P((unsigned int *));
-void	*realloc __P((void *, size_t));
-void	 srand __P((unsigned));
-double	 strtod __P((const char *, char **));
-long	 strtol __P((const char *, char **, int));
+int	 rand(void);
+int	 rand_r(unsigned int *);
+void	*realloc(void *, size_t);
+void	 srand(unsigned);
+double	 strtod(const char *, char **);
+long	 strtol(const char *, char **, int);
 unsigned long
-	 strtoul __P((const char *, char **, int));
-int	 system __P((const char *));
+	 strtoul(const char *, char **, int);
+int	 system(const char *);
 
 /* these are currently just stubs */
-int	 mblen __P((const char *, size_t));
-size_t	 mbstowcs __P((wchar_t *, const char *, size_t));
-int	 wctomb __P((char *, wchar_t));
-int	 mbtowc __P((wchar_t *, const char *, size_t));
-size_t	 wcstombs __P((char *, const wchar_t *, size_t));
+int	 mblen(const char *, size_t);
+size_t	 mbstowcs(wchar_t *, const char *, size_t);
+int	 wctomb(char *, wchar_t);
+int	 mbtowc(wchar_t *, const char *, size_t);
+size_t	 wcstombs(char *, const wchar_t *, size_t);
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 #if defined(alloca) && (alloca == __builtin_alloca) && (__GNUC__ < 2)
-void  *alloca __P((int));     /* built-in for gcc */ 
+void  *alloca(int);     /* built-in for gcc */ 
 #else 
-void  *alloca __P((size_t)); 
+void  *alloca(size_t); 
 #endif /* __GNUC__ */ 
 
-char	*getbsize __P((int *, long *));
-char	*cgetcap __P((char *, const char *, int));
-int	 cgetclose __P((void));
-int	 cgetent __P((char **, char **, const char *));
-int	 cgetfirst __P((char **, char **));
-int	 cgetmatch __P((char *, const char *));
-int	 cgetnext __P((char **, char **));
-int	 cgetnum __P((char *, const char *, long *));
-int	 cgetset __P((const char *));
-int	 cgetusedb __P((int));
-int	 cgetstr __P((char *, const char *, char **));
-int	 cgetustr __P((char *, const char *, char **));
-
-int	 daemon __P((int, int));
-char	*devname __P((int, int));
-int	 getloadavg __P((double [], int));
-
-long	 a64l __P((const char *));
-char	*l64a __P((long));
-
-void	 cfree __P((void *));
-
-int	 getopt __P((int, char * const *, const char *));
+char	*getbsize(int *, long *);
+char	*cgetcap(char *, const char *, int);
+int	 cgetclose(void);
+int	 cgetent(char **, char **, const char *);
+int	 cgetfirst(char **, char **);
+int	 cgetmatch(char *, const char *);
+int	 cgetnext(char **, char **);
+int	 cgetnum(char *, const char *, long *);
+int	 cgetset(const char *);
+int	 cgetusedb(int);
+int	 cgetstr(char *, const char *, char **);
+int	 cgetustr(char *, const char *, char **);
+
+int	 daemon(int, int);
+char	*devname(int, int);
+int	 getloadavg(double [], int);
+
+long	 a64l(const char *);
+char	*l64a(long);
+
+void	 cfree(void *);
+
+int	 getopt(int, char * const *, const char *);
 extern	 char *optarg;			/* getopt(3) external variables */
 extern	 int opterr;
 extern	 int optind;
 extern	 int optopt;
 extern	 int optreset;
-int	 getsubopt __P((char **, char * const *, char **));
+int	 getsubopt(char **, char * const *, char **);
 extern	 char *suboptarg;		/* getsubopt(3) external variable */
 
 int	 heapsort __P((void *, size_t, size_t,
@@ -175,37 +175,37 @@ int	 radixsort __P((const unsigned char **, int, const unsigned char *,
 int	 sradixsort __P((const unsigned char **, int, const unsigned char *,
 	    unsigned));
 
-char	*initstate __P((unsigned int, char *, size_t));
-long	 random __P((void));
-char	*realpath __P((const char *, char *));
-char	*setstate __P((const char *));
-void	 srandom __P((unsigned int));
-void	 srandomdev __P((void));
-
-int	 putenv __P((const char *));
-int	 setenv __P((const char *, const char *, int));
-void	 unsetenv __P((const char *));
-void	 setproctitle __P((const char *, ...))
+char	*initstate(unsigned int, char *, size_t);
+long	 random(void);
+char	*realpath(const char *, char *);
+char	*setstate(const char *);
+void	 srandom(unsigned int);
+void	 srandomdev(void);
+
+int	 putenv(const char *);
+int	 setenv(const char *, const char *, int);
+void	 unsetenv(const char *);
+void	 setproctitle(const char *, ...)
 	__attribute__((__format__ (__printf__, 1, 2)));
 
-quad_t	 qabs __P((quad_t));
-qdiv_t	 qdiv __P((quad_t, quad_t));
-quad_t	 strtoq __P((const char *, char **, int));
-u_quad_t strtouq __P((const char *, char **, int));
-
-double	 drand48 __P((void));
-double	 erand48 __P((unsigned short[3]));
-long	 jrand48 __P((unsigned short[3]));
-void	 lcong48 __P((unsigned short[7]));
-long	 lrand48 __P((void));
-long	 mrand48 __P((void));
-long	 nrand48 __P((unsigned short[3]));
-unsigned short *seed48 __P((unsigned short[3]));
-void	 srand48 __P((long));
-
-u_int32_t arc4random __P((void));
-void	arc4random_stir __P((void));
-void	arc4random_addrandom __P((unsigned char *, int));
+quad_t	 qabs(quad_t);
+qdiv_t	 qdiv(quad_t, quad_t);
+quad_t	 strtoq(const char *, char **, int);
+u_quad_t strtouq(const char *, char **, int);
+
+double	 drand48(void);
+double	 erand48(unsigned short[3]);
+long	 jrand48(unsigned short[3]);
+void	 lcong48(unsigned short[7]);
+long	 lrand48(void);
+long	 mrand48(void);
+long	 nrand48(unsigned short[3]);
+unsigned short *seed48(unsigned short[3]);
+void	 srand48(long);
+
+u_int32_t arc4random(void);
+void	arc4random_stir(void);
+void	arc4random_addrandom(unsigned char *, int);
 #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
 
 __END_DECLS
diff --git a/include/string.h b/include/string.h
index 7be111260a7..af469e99d1f 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: string.h,v 1.6 1999/09/17 13:13:46 espie Exp $	*/
+/*	$OpenBSD: string.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $	*/
 
 /*-
@@ -56,47 +56,47 @@ typedef	_BSD_SIZE_T_	size_t;
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void	*memchr __P((const void *, int, size_t));
-int	 memcmp __P((const void *, const void *, size_t));
-void	*memcpy __P((void *, const void *, size_t));
-void	*memmove __P((void *, const void *, size_t));
-void	*memset __P((void *, int, size_t));
-char	*strcat __P((char *, const char *));
-char	*strchr __P((const char *, int));
-int	 strcmp __P((const char *, const char *));
-int	 strcoll __P((const char *, const char *));
-char	*strcpy __P((char *, const char *));
-size_t	 strcspn __P((const char *, const char *));
-char	*strerror __P((int));
-size_t	 strlen __P((const char *));
-char	*strncat __P((char *, const char *, size_t));
-int	 strncmp __P((const char *, const char *, size_t));
-char	*strncpy __P((char *, const char *, size_t));
-char	*strpbrk __P((const char *, const char *));
-char	*strrchr __P((const char *, int));
-size_t	 strspn __P((const char *, const char *));
-char	*strstr __P((const char *, const char *));
-char	*strtok __P((char *, const char *));
-char	*strtok_r __P((char *, const char *, char **));
-size_t	 strxfrm __P((char *, const char *, size_t));
+void	*memchr(const void *, int, size_t);
+int	 memcmp(const void *, const void *, size_t);
+void	*memcpy(void *, const void *, size_t);
+void	*memmove(void *, const void *, size_t);
+void	*memset(void *, int, size_t);
+char	*strcat(char *, const char *);
+char	*strchr(const char *, int);
+int	 strcmp(const char *, const char *);
+int	 strcoll(const char *, const char *);
+char	*strcpy(char *, const char *);
+size_t	 strcspn(const char *, const char *);
+char	*strerror(int);
+size_t	 strlen(const char *);
+char	*strncat(char *, const char *, size_t);
+int	 strncmp(const char *, const char *, size_t);
+char	*strncpy(char *, const char *, size_t);
+char	*strpbrk(const char *, const char *);
+char	*strrchr(const char *, int);
+size_t	 strspn(const char *, const char *);
+char	*strstr(const char *, const char *);
+char	*strtok(char *, const char *);
+char	*strtok_r(char *, const char *, char **);
+size_t	 strxfrm(char *, const char *, size_t);
 
 /* Nonstandard routines */
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int	 bcmp __P((const void *, const void *, size_t));
-void	 bcopy __P((const void *, void *, size_t));
-void	 bzero __P((void *, size_t));
-int	 ffs __P((int));
-char	*index __P((const char *, int));
-void	*memccpy __P((void *, const void *, int, size_t));
-char	*rindex __P((const char *, int));
-int	 strcasecmp __P((const char *, const char *));
-char	*strdup __P((const char *));
-size_t	 strlcat __P((char *, const char *, size_t));
-size_t	 strlcpy __P((char *, const char *, size_t));
-void	 strmode __P((int, char *));
-int	 strncasecmp __P((const char *, const char *, size_t));
-char	*strsep __P((char **, const char *));
-char	*strsignal __P((int));
+int	 bcmp(const void *, const void *, size_t);
+void	 bcopy(const void *, void *, size_t);
+void	 bzero(void *, size_t);
+int	 ffs(int);
+char	*index(const char *, int);
+void	*memccpy(void *, const void *, int, size_t);
+char	*rindex(const char *, int);
+int	 strcasecmp(const char *, const char *);
+char	*strdup(const char *);
+size_t	 strlcat(char *, const char *, size_t);
+size_t	 strlcpy(char *, const char *, size_t);
+void	 strmode(int, char *);
+int	 strncasecmp(const char *, const char *, size_t);
+char	*strsep(char **, const char *);
+char	*strsignal(int);
 #endif 
 __END_DECLS
 
diff --git a/include/time.h b/include/time.h
index 800bc442f4b..9ba1a60de23 100644
--- a/include/time.h
+++ b/include/time.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: time.h,v 1.10 2001/03/09 02:18:00 millert Exp $	*/
+/*	$OpenBSD: time.h,v 1.11 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $	*/
 
 /*
@@ -90,34 +90,34 @@ struct tm {
 
 __BEGIN_DECLS
 struct timespec;
-char *asctime __P((const struct tm *));
-clock_t clock __P((void));
-char *ctime __P((const time_t *));
-double difftime __P((time_t, time_t));
-struct tm *gmtime __P((const time_t *));
-struct tm *localtime __P((const time_t *));
-time_t mktime __P((struct tm *));
-size_t strftime __P((char *, size_t, const char *, const struct tm *));
-char *strptime __P((const char *, const char *, struct tm *));
-time_t time __P((time_t *));
-char *asctime_r __P((const struct tm *, char *));
-char *ctime_r __P((const time_t *, char *));
-struct tm *gmtime_r __P((const time_t *, struct tm *));
-struct tm *localtime_r __P((const time_t *, struct tm *));
-int nanosleep __P((const struct timespec *, struct timespec *));
+char *asctime(const struct tm *);
+clock_t clock(void);
+char *ctime(const time_t *);
+double difftime(time_t, time_t);
+struct tm *gmtime(const time_t *);
+struct tm *localtime(const time_t *);
+time_t mktime(struct tm *);
+size_t strftime(char *, size_t, const char *, const struct tm *);
+char *strptime(const char *, const char *, struct tm *);
+time_t time(time_t *);
+char *asctime_r(const struct tm *, char *);
+char *ctime_r(const time_t *, char *);
+struct tm *gmtime_r(const time_t *, struct tm *);
+struct tm *localtime_r(const time_t *, struct tm *);
+int nanosleep(const struct timespec *, struct timespec *);
 
 #if !defined(_ANSI_SOURCE)
 #define CLK_TCK		100
 extern char *tzname[2];
-void tzset __P((void));
+void tzset(void);
 #endif /* not ANSI */
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-char *timezone __P((int, int));
-void tzsetwall __P((void));
-time_t timelocal __P((struct tm *));
-time_t timegm __P((struct tm *));
-time_t timeoff __P((struct tm *, const long));
+char *timezone(int, int);
+void tzsetwall(void);
+time_t timelocal(struct tm *);
+time_t timegm(struct tm *);
+time_t timeoff(struct tm *, const long);
 #endif /* neither ANSI nor POSIX */
 __END_DECLS
 
diff --git a/include/ttyent.h b/include/ttyent.h
index 032c50065c8..7f3b95dff56 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttyent.h,v 1.2 1997/09/21 10:45:58 niklas Exp $	*/
+/*	$OpenBSD: ttyent.h,v 1.3 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: ttyent.h,v 1.5 1994/10/26 00:56:36 cgd Exp $	*/
 
 /*
@@ -68,10 +68,10 @@ struct ttyent {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct ttyent *getttyent __P((void));
-struct ttyent *getttynam __P((const char *));
-int setttyent __P((void));
-int endttyent __P((void));
+struct ttyent *getttyent(void);
+struct ttyent *getttynam(const char *);
+int setttyent(void);
+int endttyent(void);
 __END_DECLS
 
 #endif /* !_TTYENT_H_ */
diff --git a/include/unistd.h b/include/unistd.h
index 01d71c996fe..bae73c5b05b 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.35 2001/08/07 21:34:42 millert Exp $ */
+/*	$OpenBSD: unistd.h,v 1.36 2002/02/16 21:27:17 millert Exp $ */
 /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
 
 /*-
@@ -56,57 +56,57 @@
 #endif
 
 __BEGIN_DECLS
-__dead void	 _exit __P((int));
-int	 access __P((const char *, int));
-unsigned int alarm __P((unsigned int));
-int	 chdir __P((const char *));
-int	 chown __P((const char *, uid_t, gid_t));
-int	 close __P((int));
-size_t	 confstr __P((int, char *, size_t));
-char	*cuserid __P((char *));
-int	 dup __P((int));
-int	 dup2 __P((int, int));
-int	 execl __P((const char *, const char *, ...));
-int	 execle __P((const char *, const char *, ...));
-int	 execlp __P((const char *, const char *, ...));
-int	 execv __P((const char *, char * const *));
-int	 execve __P((const char *, char * const *, char * const *));
-int	 execvp __P((const char *, char * const *));
-pid_t	 fork __P((void));
-long	 fpathconf __P((int, int));
-char	*getcwd __P((char *, size_t));
-gid_t	 getegid __P((void));
-uid_t	 geteuid __P((void));
-gid_t	 getgid __P((void));
-int	 getgroups __P((int, gid_t *));
-char	*getlogin __P((void));
-int	 getlogin_r __P((char *, size_t));
-pid_t	 getpgrp __P((void));
-pid_t	 getpid __P((void));
-pid_t	 getpgid __P((pid_t));
-pid_t	 getppid __P((void));
-pid_t	 getsid __P((pid_t));
-uid_t	 getuid __P((void));
-int	 isatty __P((int));
-int	 link __P((const char *, const char *));
-off_t	 lseek __P((int, off_t, int));
-long	 pathconf __P((const char *, int));
-int	 pause __P((void));
-int	 pipe __P((int *));
-ssize_t	 read __P((int, void *, size_t));
-int	 rmdir __P((const char *));
-int	 setgid __P((gid_t));
-int	 setpgid __P((pid_t, pid_t));
-pid_t	 setsid __P((void));
-int	 setuid __P((uid_t));
-unsigned int sleep __P((unsigned int));
-long	 sysconf __P((int));
-pid_t	 tcgetpgrp __P((int));
-int	 tcsetpgrp __P((int, pid_t));
-char	*ttyname __P((int));
-int	 ttyname_r __P((int, char *, size_t));
-int	 unlink __P((const char *));
-ssize_t	 write __P((int, const void *, size_t));
+__dead void	 _exit(int);
+int	 access(const char *, int);
+unsigned int alarm(unsigned int);
+int	 chdir(const char *);
+int	 chown(const char *, uid_t, gid_t);
+int	 close(int);
+size_t	 confstr(int, char *, size_t);
+char	*cuserid(char *);
+int	 dup(int);
+int	 dup2(int, int);
+int	 execl(const char *, const char *, ...);
+int	 execle(const char *, const char *, ...);
+int	 execlp(const char *, const char *, ...);
+int	 execv(const char *, char * const *);
+int	 execve(const char *, char * const *, char * const *);
+int	 execvp(const char *, char * const *);
+pid_t	 fork(void);
+long	 fpathconf(int, int);
+char	*getcwd(char *, size_t);
+gid_t	 getegid(void);
+uid_t	 geteuid(void);
+gid_t	 getgid(void);
+int	 getgroups(int, gid_t *);
+char	*getlogin(void);
+int	 getlogin_r(char *, size_t);
+pid_t	 getpgrp(void);
+pid_t	 getpid(void);
+pid_t	 getpgid(pid_t);
+pid_t	 getppid(void);
+pid_t	 getsid(pid_t);
+uid_t	 getuid(void);
+int	 isatty(int);
+int	 link(const char *, const char *);
+off_t	 lseek(int, off_t, int);
+long	 pathconf(const char *, int);
+int	 pause(void);
+int	 pipe(int *);
+ssize_t	 read(int, void *, size_t);
+int	 rmdir(const char *);
+int	 setgid(gid_t);
+int	 setpgid(pid_t, pid_t);
+pid_t	 setsid(void);
+int	 setuid(uid_t);
+unsigned int sleep(unsigned int);
+long	 sysconf(int);
+pid_t	 tcgetpgrp(int);
+int	 tcsetpgrp(int, pid_t);
+char	*ttyname(int);
+int	 ttyname_r(int, char *, size_t);
+int	 unlink(const char *);
+ssize_t	 write(int, const void *, size_t);
 
 #ifndef	_POSIX_SOURCE
 
@@ -118,107 +118,107 @@ ssize_t	 write __P((int, const void *, size_t));
  */
 #if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
     (_XOPEN_VERSION - 0) >= 500
-ssize_t  pread __P((int, void *, size_t, off_t));
-ssize_t  pwrite __P((int, const void *, size_t, off_t));
+ssize_t  pread(int, void *, size_t, off_t);
+ssize_t  pwrite(int, const void *, size_t, off_t);
 #endif
 
-int	 acct __P((const char *));
-char	*brk __P((const char *));
-int	 chroot __P((const char *));
-char	*crypt __P((const char *, const char *));
-int	 des_cipher __P((const char *, char *, long, int));
-int	 des_setkey __P((const char *key));
-int	 encrypt __P((char *, int));
-void	 endusershell __P((void));
-int	 exect __P((const char *, char * const *, char * const *));
-int	 fchdir __P((int));
-int	 fchown __P((int, uid_t, gid_t));
-char	*fflagstostr __P((u_int32_t));
-int	 fsync __P((int));
-int	 ftruncate __P((int, off_t));
-int	 getdomainname __P((char *, size_t));
-int	 getdtablesize __P((void));
-int	 getgrouplist __P((const char *, gid_t, gid_t *, int *));
-long	 gethostid __P((void));
-int	 gethostname __P((char *, size_t));
-mode_t	 getmode __P((const void *, mode_t));
-int	 getpagesize __P((void));
-char	*getpass __P((const char *));
-char	*getusershell __P((void));
-char	*getwd __P((char *));			/* obsoleted by getcwd() */
-int	 initgroups __P((const char *, gid_t));
-int	 iruserok __P((u_int32_t, int, const char *, const char *));
-int	 iruserok_sa __P((const void *, int, int, const char *, const char *));
-int	 lchown __P((const char *, uid_t, gid_t));
-char	*mkdtemp __P((char *));
-int	 mkstemp __P((char *));
-int	 mkstemps __P((char *, int));
-char	*mktemp __P((char *));
-int	 nfssvc __P((int, void *));
-int	 nice __P((int));
-void	 psignal __P((unsigned int, const char *));
+int	 acct(const char *);
+char	*brk(const char *);
+int	 chroot(const char *);
+char	*crypt(const char *, const char *);
+int	 des_cipher(const char *, char *, long, int);
+int	 des_setkey(const char *key);
+int	 encrypt(char *, int);
+void	 endusershell(void);
+int	 exect(const char *, char * const *, char * const *);
+int	 fchdir(int);
+int	 fchown(int, uid_t, gid_t);
+char	*fflagstostr(u_int32_t);
+int	 fsync(int);
+int	 ftruncate(int, off_t);
+int	 getdomainname(char *, size_t);
+int	 getdtablesize(void);
+int	 getgrouplist(const char *, gid_t, gid_t *, int *);
+long	 gethostid(void);
+int	 gethostname(char *, size_t);
+mode_t	 getmode(const void *, mode_t);
+int	 getpagesize(void);
+char	*getpass(const char *);
+char	*getusershell(void);
+char	*getwd(char *);			/* obsoleted by getcwd() */
+int	 initgroups(const char *, gid_t);
+int	 iruserok(u_int32_t, int, const char *, const char *);
+int	 iruserok_sa(const void *, int, int, const char *, const char *);
+int	 lchown(const char *, uid_t, gid_t);
+char	*mkdtemp(char *);
+int	 mkstemp(char *);
+int	 mkstemps(char *, int);
+char	*mktemp(char *);
+int	 nfssvc(int, void *);
+int	 nice(int);
+void	 psignal(unsigned int, const char *);
 extern __const char *__const sys_siglist[];
-int	 profil __P((char *, size_t, unsigned long, unsigned int));
+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 *));
-char	*re_comp __P((const char *));
-int	 re_exec __P((const char *));
-int	 readlink __P((const char *, char *, size_t));
-int	 reboot __P((int));
-int	 revoke __P((const char *));
-int	 rfork __P((int opts));
-int	 rresvport __P((int *));
-int	 rresvport_af __P((int *, int));
-int	 ruserok __P((const char *, int, const char *, const char *));
-int	 quotactl __P((const char *, int, int, char *));
-char	*sbrk __P((int));
+char	*re_comp(const char *);
+int	 re_exec(const char *);
+int	 readlink(const char *, char *, size_t);
+int	 reboot(int);
+int	 revoke(const char *);
+int	 rfork(int opts);
+int	 rresvport(int *);
+int	 rresvport_af(int *, int);
+int	 ruserok(const char *, int, const char *, const char *);
+int	 quotactl(const char *, int, int, char *);
+char	*sbrk(int);
 
 #if !defined(_XOPEN_SOURCE)
-int	 select __P((int, fd_set *, fd_set *, fd_set *, struct timeval *));
+int	 select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
 #endif
 
-int	 setdomainname __P((const char *, size_t));
-int	 setegid __P((gid_t));
-int	 seteuid __P((uid_t));
-int	 setgroups __P((int, const gid_t *));
-int	 sethostid __P((long));
-int	 sethostname __P((const char *, size_t));
-int	 setkey __P((const char *));
-int	 setlogin __P((const char *));
-void	*setmode __P((const char *));
-int	 setpgrp __P((pid_t pid, pid_t pgrp));	/* obsoleted by setpgid() */
-int	 setregid __P((int, int));
-int	 setreuid __P((int, int));
-int	 setrgid __P((gid_t));
-int	 setruid __P((uid_t));
-void	 setusershell __P((void));
-int	 strtofflags __P((char **, u_int32_t *, u_int32_t *));
-void	 swab __P((const void *, void *, size_t));
-int	 swapon __P((const char *));
-int	 swapctl __P((int cmd, const void *arg, int misc));
-int	 symlink __P((const char *, const char *));
-void	 sync __P((void));
-int	 syscall __P((int, ...));
-int	 truncate __P((const char *, off_t));
-int	 ttyslot __P((void));
-unsigned int	 ualarm __P((unsigned int, unsigned int));
-int	 undelete __P((const char *));
-int	 usleep __P((useconds_t));
-void	*valloc __P((size_t));			/* obsoleted by malloc() */
-pid_t	 vfork __P((void));
-int	 issetugid __P((void));
+int	 setdomainname(const char *, size_t);
+int	 setegid(gid_t);
+int	 seteuid(uid_t);
+int	 setgroups(int, const gid_t *);
+int	 sethostid(long);
+int	 sethostname(const char *, size_t);
+int	 setkey(const char *);
+int	 setlogin(const char *);
+void	*setmode(const char *);
+int	 setpgrp(pid_t pid, pid_t pgrp);	/* obsoleted by setpgid() */
+int	 setregid(int, int);
+int	 setreuid(int, int);
+int	 setrgid(gid_t);
+int	 setruid(uid_t);
+void	 setusershell(void);
+int	 strtofflags(char **, u_int32_t *, u_int32_t *);
+void	 swab(const void *, void *, size_t);
+int	 swapon(const char *);
+int	 swapctl(int cmd, const void *arg, int misc);
+int	 symlink(const char *, const char *);
+void	 sync(void);
+int	 syscall(int, ...);
+int	 truncate(const char *, off_t);
+int	 ttyslot(void);
+unsigned int	 ualarm(unsigned int, unsigned int);
+int	 undelete(const char *);
+int	 usleep(useconds_t);
+void	*valloc(size_t);		/* obsoleted by malloc() */
+pid_t	 vfork(void);
+int	 issetugid(void);
 
-int	 getopt __P((int, char * const *, const char *));
+int	 getopt(int, char * const *, const char *);
 extern	 char *optarg;			/* getopt(3) external variables */
 extern	 int opterr;
 extern	 int optind;
 extern	 int optopt;
 extern	 int optreset;
-int	 getsubopt __P((char **, char * const *, char **));
+int	 getsubopt(char **, char * const *, char **);
 extern	 char *suboptarg;		/* getsubopt(3) external variable */
 #endif /* !_POSIX_SOURCE */
 
@@ -229,7 +229,7 @@ extern	 char *suboptarg;		/* getsubopt(3) external variable */
 #define F_LOCK          1
 #define F_TLOCK         2
 #define F_TEST          3
-int     lockf __P((int, int, off_t));
+int     lockf(int, int, off_t);
 #endif /* (!defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)) || ... */
 __END_DECLS
 
diff --git a/include/utime.h b/include/utime.h
index 97591d0466f..785f40ebd00 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utime.h,v 1.3 1998/05/13 08:39:21 deraadt Exp $	*/
+/*	$OpenBSD: utime.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: utime.h,v 1.3 1994/10/26 00:56:39 cgd Exp $	*/
 
 /*-
@@ -54,7 +54,7 @@ struct utimbuf {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int utime __P((const char *, const struct utimbuf *));
+int utime(const char *, const struct utimbuf *);
 __END_DECLS
 
 #endif /* !_UTIME_H_ */
diff --git a/include/vis.h b/include/vis.h
index 3bc7f178ee5..f2fd419b4da 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vis.h,v 1.4 2000/11/21 00:48:49 millert Exp $	*/
+/*	$OpenBSD: vis.h,v 1.5 2002/02/16 21:27:17 millert Exp $	*/
 /*	$NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $	*/
 
 /*-
@@ -77,12 +77,12 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-char	*vis __P((char *, int, int, int));
-int	strvis __P((char *, const char *, int));
-int	strnvis __P((char *, const char *, size_t, int));
-int	strvisx __P((char *, const char *, size_t, int));
-int	strunvis __P((char *, const char *));
-int	unvis __P((char *, char, int *, int));
+char	*vis(char *, int, int, int);
+int	strvis(char *, const char *, int);
+int	strnvis(char *, const char *, size_t, int);
+int	strvisx(char *, const char *, size_t, int);
+int	strunvis(char *, const char *);
+int	unvis(char *, char, int *, int);
 __END_DECLS
 
 #endif /* !_VIS_H_ */
author	millert <millert@openbsd.org>	2002-02-16 21:27:05 +0000
committer	millert <millert@openbsd.org>	2002-02-16 21:27:05 +0000
commit	c72b5b24e14c03dd8b22104fbae0d3921fa2aa37 (patch)
tree	1ac67aab11df5f96856c0e3015d691db7dc9e811 /include
parent	default to rsa keyfile path for non key generation operations where (diff)
download	wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.tar.xz wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.zip